diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
| commit | 1d153c1cf91edce537bc64efb01b5a496b35518e (patch) | |
| tree | de8ba4359a0341bd0c8c6e1a7495f4f39fb565f1 /megaphone | |
| parent | b50b7039d3b52f33df94e5a3526d9f43a51401ad (diff) | |
| parent | 6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6 (diff) | |
| download | gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.gz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.bz2 gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.lz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.xz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.zst gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.zip | |
Merge commit 'upstream/master' into mc5
Conflicts:
libempathy-gtk/empathy-account-widget.c
src/empathy.c
Diffstat (limited to 'megaphone')
| -rw-r--r-- | megaphone/src/megaphone-applet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c index 7350c1873..8d70d6241 100644 --- a/megaphone/src/megaphone-applet.c +++ b/megaphone/src/megaphone-applet.c @@ -280,7 +280,7 @@ megaphone_applet_show_preferences (MegaphoneApplet *applet) gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 500); scroll = gtk_scrolled_window_new (NULL, NULL); gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (contact_list)); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scroll); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll); gtk_widget_show (scroll); g_object_set_data (G_OBJECT (dialog), "contact-list", contact_list); |