Merge lp:~charlesk/indicator-sync/lp-1059483 into lp:indicator-sync/12.10

[Charles Kerr]

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=amd64/22/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=i386/22/console

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Ha, I was going to complain about that ;)

Looks good, thanks.

review: Approve

=== modified file 'src/indicator/indicator-sync.c'
--- src/indicator/indicator-sync.c	2012-09-24 19:43:12 +0000
+++ src/indicator/indicator-sync.c	2012-10-02 23:00:27 +0000
@@ -436,8 +436,12 @@
       GObject * o = G_OBJECT(gmi);
       if (g_object_get_qdata (o, tweak_quark) == NULL)
         {
-          g_object_set_qdata (o, tweak_quark, GINT_TO_POINTER(TRUE));
-          gtk_widget_set_margin_left (GTK_WIDGET(o), aligned_left_margin);
+          GtkWidget * child;
+          if ((child = gtk_bin_get_child (GTK_BIN(gmi))))
+            {
+              gtk_widget_set_margin_left (child, aligned_left_margin);
+              g_object_set_qdata (o, tweak_quark, GINT_TO_POINTER(TRUE));
+            }
         }
     }
 }