gnome-bluetooth r377 - trunk/applet
- From: hadess svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-bluetooth r377 - trunk/applet
- Date: Thu, 26 Feb 2009 19:19:46 +0000 (UTC)
Author: hadess
Date: Thu Feb 26 19:19:45 2009
New Revision: 377
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=377&view=rev
Log:
Show the same menu on left-click and right-click
Because it makes sense.
Modified:
trunk/applet/main.c
Modified: trunk/applet/main.c
==============================================================================
--- trunk/applet/main.c (original)
+++ trunk/applet/main.c Thu Feb 26 19:19:45 2009
@@ -221,22 +221,13 @@
static void activate_callback(GObject *widget, gpointer user_data)
{
guint32 activate_time = gtk_get_current_event_time();
- GtkWidget *menu;
- GtkWidget *item;
+ GtkWidget *menu = user_data;
if (query_blinking() == TRUE) {
show_agents();
return;
}
- menu = gtk_menu_new();
-
- item = gtk_menu_item_new_with_label(_("Setup new device..."));
- g_signal_connect(item, "activate",
- G_CALLBACK(wizard_callback), NULL);
- gtk_widget_show(item);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
gtk_status_icon_position_menu,
GTK_STATUS_ICON(widget), 1, activate_time);
@@ -476,11 +467,9 @@
update_icon_visibility();
- g_signal_connect(statusicon, "activate",
- G_CALLBACK(activate_callback), NULL);
-
menu = create_popupmenu();
-
+ g_signal_connect(statusicon, "activate",
+ G_CALLBACK(activate_callback), menu);
g_signal_connect(statusicon, "popup-menu",
G_CALLBACK(popup_callback), menu);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]