aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAurelien Gateau <aurelien.gateau@canonical.com>2010-02-02 16:59:18 -0800
committerAurelien Gateau <aurelien.gateau@canonical.com>2010-02-02 16:59:18 -0800
commit770470f8307a9d9ad6ffa63560a7454eaa7f95ac (patch)
treec6ca42db8df24ce1c59ed77f1cb1d0118106de59 /src
parent3a8354fd3a0b41a302f41e9901d47c0fbb4131f8 (diff)
downloadayatana-indicator-application-770470f8307a9d9ad6ffa63560a7454eaa7f95ac.tar.gz
ayatana-indicator-application-770470f8307a9d9ad6ffa63560a7454eaa7f95ac.tar.bz2
ayatana-indicator-application-770470f8307a9d9ad6ffa63560a7454eaa7f95ac.zip
icon -> icon-name
sensitive -> enabled toggle-checked -> toggle-state toggle-state type is now an int
Diffstat (limited to 'src')
-rw-r--r--src/libappindicator/app-indicator.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index b0f721e..8c1fa4c 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -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",