Merge lp:~ken-vandine/indicator-me/dbusmenu-0.4 into lp:indicator-me

[Ken VanDine]

 * ported to dbusmenu-glib-0.4
 * removed check for dbusmenu-gtk, it isn't used

[Ted Gould (ted)]

You need to get the callback in indicator-me.c "entry_prop_change_cb" which still is based on a GValue.

review: Needs Fixing

[Ted Gould (ted)]

Oh, there is a "about_me_prop_change_cb" as well.

[Ken VanDine (ken-vandine)]

Ok, updated those as well

review: Needs Resubmitting

[lp:~ken-vandine/indicator-me/dbusmenu-0.4]

116. By Ken VanDine on 2011-01-10

Ported about_me_prop_change_cb and entry_prop_change_cb to dbusmenu-glib-0.4

[Ted Gould (ted)]

Cool!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-09-22 12:07:52 +0000
+++ configure.ac	2011-01-10 21:19:09 +0000
@@ -30,8 +30,7 @@
 GTK_REQUIRED_VERSION=2.12
 INDICATOR_REQUIRED_VERSION=0.3.0
 GWIBBER_REQUIRED_VERSION=0.0.4
-DBUSMENUGTK_REQUIRED_VERSION=0.2.2
-DBUSMENUGLIB_REQUIRED_VERSION=0.2.2
+DBUSMENUGLIB_REQUIRED_VERSION=0.3.90
 TELEPATHYGLIB_REQUIRED_VERSION=0.9.0
 GCONF_REQUIRED_VERSION=2.0.0
 INDICATOR_DISPLAY_OBJECTS=0.1
@@ -39,8 +38,9 @@
 PKG_CHECK_MODULES(APPLET,        gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                  indicator >= $INDICATOR_REQUIRED_VERSION
 				 libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-				 dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
-PKG_CHECK_MODULES(MESERVICE,     dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                 dbus-glib-1
+                                 dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION)
+PKG_CHECK_MODULES(MESERVICE,     dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
 				 gconf-2.0 >= $GCONF_REQUIRED_VERSION
                                  indicator >= $INDICATOR_REQUIRED_VERSION
                                  gwibber >= $GWIBBER_REQUIRED_VERSION

=== modified file 'src/entry-menu-item.c'
--- src/entry-menu-item.c	2010-08-14 04:40:14 +0000
+++ src/entry-menu-item.c	2011-01-10 21:19:09 +0000
@@ -55,8 +55,7 @@
 static void entry_menu_item_init       (EntryMenuItem *self);
 static void entry_menu_item_dispose    (GObject *object);
 static void entry_menu_item_finalize   (GObject *object);
-static void handle_event               (DbusmenuMenuitem *mi, const gchar *name,
-										const GValue *value, guint timestamp);
+static void handle_event               (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
 
 G_DEFINE_TYPE (EntryMenuItem, entry_menu_item, DBUSMENU_TYPE_MENUITEM);
 
@@ -122,14 +121,14 @@
    for the corresponding bottom-half service to act upon */
 static void
 handle_event (DbusmenuMenuitem *mi, const gchar *name,
-			  const GValue *value, guint timestamp)
+			  GVariant *value, guint timestamp)
 {
 	/* EntryMenuItemPrivate * priv = ENTRY_MENU_ITEM_GET_PRIVATE(self); */
 
 	g_debug ("handle_event");
 	if (g_strcmp0 (name, "send") == 0) {
 		MeGwibberService *me_gwibber_service = me_gwibber_service_get ();
-		me_gwibber_service_send (me_gwibber_service, g_value_get_string (value));
+		me_gwibber_service_send (me_gwibber_service, g_variant_get_string (value, NULL));
 		dbusmenu_menuitem_property_set (mi, ENTRY_MENUITEM_PROP_TEXT, "");
 	}
 

=== modified file 'src/indicator-me.c'
--- src/indicator-me.c	2010-10-05 16:53:21 +0000
+++ src/indicator-me.c	2011-01-10 21:19:09 +0000
@@ -91,7 +91,7 @@
                                 DbusmenuMenuitem * parent,
                                 DbusmenuClient   * client);
 static void     entry_activate_cb (GtkEntry *entry, DbusmenuMenuitem *mi);
-static void     entry_prop_change_cb (DbusmenuMenuitem *mi, gchar *prop, GValue *value, GtkEntry *entry);
+static void     entry_prop_change_cb (DbusmenuMenuitem *mi, gchar *prop, GVariant *value, GtkEntry *entry);
 static gboolean entry_hint_is_shown (GtkWidget *widget);
 
 G_DEFINE_TYPE (IndicatorMe, indicator_me, INDICATOR_OBJECT_TYPE);
@@ -403,17 +403,17 @@
 }
 
 static void
-entry_prop_change_cb (DbusmenuMenuitem *mi, gchar *prop, GValue *value, GtkEntry *entry)
+entry_prop_change_cb (DbusmenuMenuitem *mi, gchar *prop, GVariant *value, GtkEntry *entry)
 {
   g_return_if_fail (GTK_IS_ENTRY (entry));
 
 	if (g_strcmp0 (prop, DBUSMENU_ENTRY_MENUITEM_PROP_TEXT) == 0) {
-		gtk_entry_set_text (entry, g_value_get_string (value));
+		gtk_entry_set_text (entry, g_variant_get_string (value, NULL));
     if (gtk_entry_get_text_length (entry) == 0)
       entry_maybe_show_hint (entry);
 	}
 	if (g_strcmp0 (prop, DBUSMENU_ENTRY_MENUITEM_PROP_HINT) == 0) {
-    entry_set_hint (entry, g_value_get_string (value));
+    entry_set_hint (entry, g_variant_get_string (value, NULL));
     if (entry_hint_is_shown (GTK_WIDGET (entry)))
         entry_maybe_show_hint (entry); /* visual update */
 	}
@@ -425,13 +425,11 @@
   g_return_if_fail (GTK_IS_ENTRY (entry));
   g_return_if_fail (DBUSMENU_IS_MENUITEM (mi));
 
-	GValue value = { 0 };
-	g_value_init (&value, G_TYPE_STRING);
-	g_value_set_static_string (&value, gtk_entry_get_text (entry));
-
-	g_debug ("user typed: %s", g_value_get_string (&value));
-
-	dbusmenu_menuitem_handle_event (mi, "send", &value, gtk_get_current_event_time());
+	GVariant * value = g_variant_new_string (gtk_entry_get_text (entry));
+	
+	g_debug ("user typed: %s", g_variant_get_string (value, NULL));
+
+	dbusmenu_menuitem_handle_event (mi, "send", value, gtk_get_current_event_time());
 }
 
 static gboolean
@@ -504,13 +502,13 @@
 /* Whenever we have a property change on a DbusmenuMenuitem
    we need to be responsive to that. */
 static void
-about_me_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, AboutMeMenuItem *item)
+about_me_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, AboutMeMenuItem *item)
 {
   g_return_if_fail (ABOUT_IS_ME_MENU_ITEM (item));
 
 	if (!g_strcmp0(prop, DBUSMENU_ABOUT_ME_MENUITEM_PROP_ICON)) {
     /* reload the avatar icon */
-    about_me_menu_item_load_avatar (item, g_value_get_string(value));
+    about_me_menu_item_load_avatar (item, g_variant_get_string(value, NULL));
   } else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_VISIBLE)) {
     /* normal, ignore */
 	} else {