From b3f174dd80b59340cabe7cc0ae698489c013d8e7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 4 Feb 2010 14:13:47 -0800
Subject: Changing the #defines

---
 src/libappindicator/app-indicator.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index b0f721e..390cab0 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -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,
-- 
cgit v1.2.3