aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-04 14:15:15 -0800
committerTed Gould <ted@gould.cx>2010-02-04 14:15:15 -0800
commit4f81ab9821d2a40e008f8dc2937ce1ea59960bef (patch)
tree5805f9950ead78929002309a105a34387493a02e
parent901d87fc3adff5025d773be3e515772f9a39c065 (diff)
parentb6cda589075357914a0d48eed7b927c0a589a835 (diff)
downloadlibayatana-appindicator-4f81ab9821d2a40e008f8dc2937ce1ea59960bef.tar.gz
libayatana-appindicator-4f81ab9821d2a40e008f8dc2937ce1ea59960bef.tar.bz2
libayatana-appindicator-4f81ab9821d2a40e008f8dc2937ce1ea59960bef.zip
Migrating to the new dbusmenu
-rw-r--r--configure.ac2
-rw-r--r--src/libappindicator/app-indicator.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 61be6f8..5aa7a58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AC_CONFIG_MACRO_DIR(m4)
GTK_REQUIRED_VERSION=2.12
INDICATOR_REQUIRED_VERSION=0.3.1
-DBUSMENUGTK_REQUIRED_VERSION=0.1.1
+DBUSMENUGTK_REQUIRED_VERSION=0.2.2
JSON_GLIB_REQUIRED_VERSION=0.7.6
PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index b0f721e..1d8148c 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,8 +987,8 @@ 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,
+ 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);
}
@@ -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,8 +1121,8 @@ container_iterate (GtkWidget *widget,
label_set = TRUE;
- dbusmenu_menuitem_property_set (child,
- DBUSMENU_MENUITEM_PROP_TOGGLE_CHECKED,
+ 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,