Merge lp:~larsu/libindicator/always-create-widgets into lp:libindicator/14.04

[Lars Karlitski]

indicator-ng: always create entry.label and entry.image

They used to be created lazily when the root menu item changed to include and image or a label. However, there is no way to notify a panel that this happened.

Panels connect to notify signals on these widgets when an entry gets added. If the widgets don't exist from the very beginning, the panel won't update when they change.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/libindicator-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-saucy-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-saucy-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/libindicator-saucy-armhf-ci/32/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/libindicator-ci/46/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'libindicator/indicator-ng.c'
--- libindicator/indicator-ng.c	2013-10-16 23:16:08 +0000
+++ libindicator/indicator-ng.c	2013-10-17 19:16:11 +0000
@@ -240,9 +240,6 @@
       return;
     }
 
-  if (!self->entry.image)
-    self->entry.image = g_object_ref_sink (gtk_image_new ());
-
   gtk_widget_show (GTK_WIDGET (self->entry.image));
 
   icon = g_icon_deserialize (variant);
@@ -271,9 +268,6 @@
       return;
     }
 
-  if (!self->entry.label)
-    self->entry.label = g_object_ref_sink (gtk_label_new (NULL));
-
   gtk_label_set_label (GTK_LABEL (self->entry.label), label);
   gtk_widget_show (GTK_WIDGET (self->entry.label));
 }
@@ -655,6 +649,9 @@
 static void
 indicator_ng_init (IndicatorNg *self)
 {
+  self->entry.label = g_object_ref_sink (gtk_label_new (NULL));
+  self->entry.image = g_object_ref_sink (gtk_image_new ());
+
   self->entry.menu = g_object_ref_sink (gtk_menu_new ());
 
   /* work around IndicatorObject's warning that the accessible