diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-24 22:00:49 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-24 22:00:49 +0800 |
| commit | 9d408bd199a0b577eaec9826df060397578f3a37 (patch) | |
| tree | 9f4aebf460948f1196a20893a790fa4c58efde1b /src | |
| parent | 138123c86b9e6a6bf67a188d1e67bd0444c7ebff (diff) | |
| parent | ec619f9805258aa9d623e2651fb604b80d49f795 (diff) | |
| download | gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.gz gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.bz2 gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.lz gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.xz gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.zst gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.zip | |
Merge branch 'gnome-3-8'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-debug-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 6cc60098f..5aaf75ff7 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -2045,7 +2045,7 @@ am_prepared_cb (GObject *am, G_CALLBACK (debug_window_button_press_event_cb), object); renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "yalign", 0, NULL); + g_object_set (renderer, "yalign", (gfloat) 0, NULL); gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view), -1, _("Time"), renderer, diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index f0b6ec641..6ff365ce9 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -504,12 +504,12 @@ new_room_list_cb (GObject *source, return; } - g_signal_connect (self->priv->room_list, "got-room", - G_CALLBACK (new_chatroom_dialog_got_room_cb), self); - g_signal_connect (self->priv->room_list, "failed", - G_CALLBACK (listing_failed_cb), self); - g_signal_connect (self->priv->room_list, "notify::listing", - G_CALLBACK (new_chatroom_dialog_listing_cb), self); + tp_g_signal_connect_object (self->priv->room_list, "got-room", + G_CALLBACK (new_chatroom_dialog_got_room_cb), self, 0); + tp_g_signal_connect_object (self->priv->room_list, "failed", + G_CALLBACK (listing_failed_cb), self, 0); + tp_g_signal_connect_object (self->priv->room_list, "notify::listing", + G_CALLBACK (new_chatroom_dialog_listing_cb), self, 0); if (gtk_expander_get_expanded (GTK_EXPANDER (self->priv->expander_browse))) { |