ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ken VanDine (ken-vandine)
Related merge proposals:
  https://code.launchpad.net/~ken-vandine/indicator-me/lp_655252/+merge/52893
  proposed by: Ken VanDine (ken-vandine)
  review: Approve - Ted Gould (ted)
------------------------------------------------------------
revno: 135 [merge]
committer: Ken VanDine <ken.vandine@xxxxxxxxxxxxx>
branch nick: indicator-me-trunk
timestamp: Thu 2011-03-10 16:34:32 -0500
message:
  Merged
modified:
  src/indicator-me.c
  src/me-service.c


--
lp:indicator-me
https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk

Your team ayatana-commits is subscribed to branch lp:indicator-me.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk/+edit-subscription

=== modified file 'src/indicator-me.c'
--- src/indicator-me.c	2011-03-02 19:22:20 +0000
+++ src/indicator-me.c	2011-03-10 17:53:09 +0000
@@ -546,12 +546,14 @@
 
   g_debug ("%s", __func__);
 
-  if (! entry_hint_is_shown (GTK_WIDGET (entry)))
-    if (gtk_entry_get_text_length (entry) == 0)
+  if (! entry_hint_is_shown (GTK_WIDGET (entry))) {
+    if (gtk_entry_get_text_length (entry) == 0) {
       /* show the hint unconditionnaly, as the focus change
          may not have propagated already and entry_maybe_show_hint
          could get confused */
       entry_hint_show_hint (entry);
+    }
+  }
 
   return FALSE;
 }
@@ -568,8 +570,7 @@
 	}
 	if (g_strcmp0 (prop, DBUSMENU_ENTRY_MENUITEM_PROP_HINT) == 0) {
     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 */
+        entry_hint_show_hint (entry); /* visual update */
 	}
 }
 
@@ -605,7 +606,7 @@
 	}
 
   g_object_set_data (G_OBJECT (ido),
-                     "dbusmenitem",
+                     "dbusmenuitem",
                      newitem);
 
 	gtk_entry_set_width_chars (entry, 23); /* set some nice aspect ratio for the menu */

=== modified file 'src/me-service.c'
--- src/me-service.c	2011-03-02 21:07:10 +0000
+++ src/me-service.c	2011-03-10 15:16:31 +0000
@@ -191,10 +191,11 @@
     return;
   }
 
-  if (! dbusmenu_menuitem_property_get_bool (broadcast_field, DBUSMENU_MENUITEM_PROP_VISIBLE))
+  dbusmenu_menuitem_property_set (broadcast_field, DBUSMENU_ENTRY_MENUITEM_PROP_HINT, me_gwibber_service_get_accounts_string (instance));
+
+  if (! dbusmenu_menuitem_property_get_bool (broadcast_field, DBUSMENU_MENUITEM_PROP_VISIBLE)) {
     dbusmenu_menuitem_property_set_bool (broadcast_field, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-
-  dbusmenu_menuitem_property_set (broadcast_field, DBUSMENU_ENTRY_MENUITEM_PROP_HINT, me_gwibber_service_get_accounts_string (instance));
+  }
 
   return;
 }