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 on 2010-10-07
Status: Merged
Approved by: Natalia Bidart on 2010-10-11
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 Approve on 2010-10-11
Vincenzo Di Somma (community) Approve on 2010-10-11
dobey (community) 2010-10-07 Approve on 2010-10-08
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.
dobey (dobey) :
review: Approve
Vincenzo Di Somma (vds) :
review: Approve
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libsyncdaemon/Makefile.am'
2--- libsyncdaemon/Makefile.am 2010-10-07 18:28:44 +0000
3+++ libsyncdaemon/Makefile.am 2010-10-08 17:09:45 +0000
4@@ -88,7 +88,7 @@
5 $(syncdaemoninclude_HEADERS) \
6 $(shell ls syncdaemon*.[ch])
7 SyncDaemon-1.0.gir: libsyncdaemon-1.0.la Makefile
8-SyncDaemon_1_0_gir_INCLUDES = GObject-2.0 DBus-1.0
9+SyncDaemon_1_0_gir_INCLUDES = GObject-2.0
10 SyncDaemon_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
11 SyncDaemon_1_0_gir_LIBS = libsyncdaemon-1.0.la
12 SyncDaemon_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
13
14=== modified file 'nautilus/test-contacts-picker.c'
15--- nautilus/test-contacts-picker.c 2010-02-09 22:03:08 +0000
16+++ nautilus/test-contacts-picker.c 2010-10-08 17:09:45 +0000
17@@ -85,7 +85,7 @@
18
19 picker = u1_contacts_picker_new ();
20 gtk_widget_show (picker);
21- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), picker, TRUE, TRUE, 6);
22+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), picker, TRUE, TRUE, 6);
23
24 g_signal_connect (G_OBJECT (window), "response", G_CALLBACK (dialog_response_cb), picker);
25

Subscribers

People subscribed via source and target branches