diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-04 16:45:32 -0800 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-04 16:45:32 -0800 |
| commit | 33edaca78f98d3a4b0f1eccf7076b3c659ec90e4 (patch) | |
| tree | 56db9b794df727e4f7a717e85b9ec49600c69a66 /src/libappindicator/app-indicator.c | |
| parent | f25e2f07b3afbdfbe6088bb913cf091620a4ad16 (diff) | |
| parent | f8ab455538c130ce03132e2557c9363e9a808156 (diff) | |
| download | ayatana-indicator-application-33edaca78f98d3a4b0f1eccf7076b3c659ec90e4.tar.gz ayatana-indicator-application-33edaca78f98d3a4b0f1eccf7076b3c659ec90e4.tar.bz2 ayatana-indicator-application-33edaca78f98d3a4b0f1eccf7076b3c659ec90e4.zip | |
* Upstream release 0.0.11
* Interoperability Fixes
* Adding in XVFB support for tests
* Adding support for icons with the '-panel' suffix
Diffstat (limited to 'src/libappindicator/app-indicator.c')
| -rw-r--r-- | src/libappindicator/app-indicator.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index b0f721e..908684f 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -977,7 +977,7 @@ app_indicator_set_icon (AppIndicator *self, const gchar *icon_name) } static void -activate_menuitem (DbusmenuMenuitem *mi, gpointer user_data) +activate_menuitem (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data) { GtkWidget *widget = (GtkWidget *)user_data; @@ -987,9 +987,9 @@ activate_menuitem (DbusmenuMenuitem *mi, gpointer user_data) static void widget_toggled (GtkWidget *widget, DbusmenuMenuitem *mi) { - dbusmenu_menuitem_property_set (mi, - DBUSMENU_MENUITEM_PROP_TOGGLE_CHECKED, - gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)) ? DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED : DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED); + dbusmenu_menuitem_property_set_int (mi, + DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, + gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)) ? DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED : DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED); } static void @@ -1014,7 +1014,7 @@ update_icon_name (DbusmenuMenuitem *menuitem, return; dbusmenu_menuitem_property_set (menuitem, - DBUSMENU_MENUITEM_PROP_ICON, + DBUSMENU_MENUITEM_PROP_ICON_NAME, image->data.name.icon_name); } @@ -1031,7 +1031,7 @@ update_stock_item (DbusmenuMenuitem *menuitem, gtk_stock_lookup (image->data.stock.stock_id, &stock); dbusmenu_menuitem_property_set (menuitem, - DBUSMENU_MENUITEM_PROP_ICON, + DBUSMENU_MENUITEM_PROP_ICON_NAME, image->data.stock.stock_id); if (stock.label != NULL) @@ -1074,7 +1074,7 @@ widget_notify_cb (GtkWidget *widget, if (pspec->name == g_intern_static_string ("sensitive")) { dbusmenu_menuitem_property_set_bool (child, - DBUSMENU_MENUITEM_PROP_SENSITIVE, + DBUSMENU_MENUITEM_PROP_ENABLED, GTK_WIDGET_IS_SENSITIVE (widget)); } else if (pspec->name == g_intern_static_string ("label")) @@ -1121,9 +1121,9 @@ container_iterate (GtkWidget *widget, label_set = TRUE; - dbusmenu_menuitem_property_set (child, - DBUSMENU_MENUITEM_PROP_TOGGLE_CHECKED, - gtk_check_menu_item_get_active (check) ? DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED : DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED); + dbusmenu_menuitem_property_set_int (child, + DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, + gtk_check_menu_item_get_active (check) ? DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED : DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED); g_signal_connect (widget, "toggled", |