Ubuntu One Client

Merge lp:~rodrigo-moya/ubuntuone-client/dont-use-dialog-vbox into lp:ubuntuone-client

  1. dont-use-dialog-vbox
  2. Merge into trunk
Proposed by Rodrigo Moya
Status: Merged
Approved by: Natalia Bidart
Approved revision: 732
Merged at revision: 734
Proposed branch: lp:~rodrigo-moya/ubuntuone-client/dont-use-dialog-vbox
Merge into: lp:ubuntuone-client
Diff against target: 24 lines (+2/-2)
2 files modified
libsyncdaemon/Makefile.am (+1/-1)
nautilus/test-contacts-picker.c (+1/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntuone-client/dont-use-dialog-vbox
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Vincenzo Di Somma (community) Approve
dobey (community) Approve
Review via email: mp+37852@code.launchpad.net

Commit message

- Don't use deprecated GTK API in preparation for GTK3 migration
- No need to depend on DBus gir

Description of the change

- Don't use deprecated GTK API in preparation for GTK3 migration
- No need to depend on DBus gir

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Vincenzo Di Somma (vds) :
review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libsyncdaemon/Makefile.am'
--- libsyncdaemon/Makefile.am 2010-10-07 18:28:44 +0000
+++ libsyncdaemon/Makefile.am 2010-10-08 17:09:45 +0000
@@ -88,7 +88,7 @@
88 $(syncdaemoninclude_HEADERS) \88 $(syncdaemoninclude_HEADERS) \
89 $(shell ls syncdaemon*.[ch])89 $(shell ls syncdaemon*.[ch])
90SyncDaemon-1.0.gir: libsyncdaemon-1.0.la Makefile90SyncDaemon-1.0.gir: libsyncdaemon-1.0.la Makefile
91SyncDaemon_1_0_gir_INCLUDES = GObject-2.0 DBus-1.091SyncDaemon_1_0_gir_INCLUDES = GObject-2.0
92SyncDaemon_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)92SyncDaemon_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
93SyncDaemon_1_0_gir_LIBS = libsyncdaemon-1.0.la93SyncDaemon_1_0_gir_LIBS = libsyncdaemon-1.0.la
94SyncDaemon_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))94SyncDaemon_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
9595
=== modified file 'nautilus/test-contacts-picker.c'
--- nautilus/test-contacts-picker.c 2010-02-09 22:03:08 +0000
+++ nautilus/test-contacts-picker.c 2010-10-08 17:09:45 +0000
@@ -85,7 +85,7 @@
8585
86 picker = u1_contacts_picker_new ();86 picker = u1_contacts_picker_new ();
87 gtk_widget_show (picker);87 gtk_widget_show (picker);
88 gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), picker, TRUE, TRUE, 6);88 gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), picker, TRUE, TRUE, 6);
8989
90 g_signal_connect (G_OBJECT (window), "response", G_CALLBACK (dialog_response_cb), picker);90 g_signal_connect (G_OBJECT (window), "response", G_CALLBACK (dialog_response_cb), picker);
91 91

Subscribers

People subscribed via source and target branches