diff options
author | Travis Reitter <treitter@gmail.com> | 2010-07-27 18:54:06 +0800 |
---|---|---|
committer | Travis Reitter <treitter@gmail.com> | 2010-07-27 18:54:06 +0800 |
commit | 34e8fc1344c5433be1a9d8f8614cdb84933a84fb (patch) | |
tree | 81cacf070d6f80ad2a1418bf37f753d40f7ae599 /libempathy-gtk | |
parent | 4ca3b29b70ca4f624153783c26f0d746f58003a8 (diff) | |
parent | a976f8193404e5c89d0a9a9051f629057e200f9b (diff) | |
download | gsoc2013-empathy-34e8fc1344c5433be1a9d8f8614cdb84933a84fb.tar gsoc2013-empathy-34e8fc1344c5433be1a9d8f8614cdb84933a84fb.tar.gz gsoc2013-empathy-34e8fc1344c5433be1a9d8f8614cdb84933a84fb.tar.bz2 gsoc2013-empathy-34e8fc1344c5433be1a9d8f8614cdb84933a84fb.tar.lz gsoc2013-empathy-34e8fc1344c5433be1a9d8f8614cdb84933a84fb.tar.xz gsoc2013-empathy-34e8fc1344c5433be1a9d8f8614cdb84933a84fb.tar.zst gsoc2013-empathy-34e8fc1344c5433be1a9d8f8614cdb84933a84fb.zip |
Merge branch 'folks-async-and-prepare'
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index ef4f938f3..7083b238b 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -320,6 +320,22 @@ OUT: } static void +groups_change_group_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + FolksGroups *groups = FOLKS_GROUPS (source); + GError *error = NULL; + + folks_groups_change_group_finish (groups, result, &error); + if (error != NULL) + { + g_warning ("failed to change group: %s", error->message); + g_clear_error (&error); + } +} + +static void individual_view_handle_drag (EmpathyIndividualView *self, FolksIndividual *individual, const gchar *old_group, @@ -349,10 +365,12 @@ individual_view_handle_drag (EmpathyIndividualView *self, } if (new_group != NULL) - folks_groups_change_group (FOLKS_GROUPS (individual), new_group, TRUE); + folks_groups_change_group (FOLKS_GROUPS (individual), new_group, TRUE, + groups_change_group_cb, NULL); if (old_group != NULL && action == GDK_ACTION_MOVE) - folks_groups_change_group (FOLKS_GROUPS (individual), old_group, FALSE); + folks_groups_change_group (FOLKS_GROUPS (individual), old_group, FALSE, + groups_change_group_cb, NULL); } static gboolean |