diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2010-09-22 07:14:16 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-09-26 18:25:02 +0800 |
| commit | 38e4f668b25cefbdc161f9c17f61a904c67c0c79 (patch) | |
| tree | 441822ef80234918a5148741f51ebce4b518807d /src/empathy-main-window.c | |
| parent | 2eec8e87f01ecdf6a987314d5b6cea35d47f1ae1 (diff) | |
| download | gsoc2013-empathy-38e4f668b25cefbdc161f9c17f61a904c67c0c79.tar gsoc2013-empathy-38e4f668b25cefbdc161f9c17f61a904c67c0c79.tar.gz gsoc2013-empathy-38e4f668b25cefbdc161f9c17f61a904c67c0c79.tar.bz2 gsoc2013-empathy-38e4f668b25cefbdc161f9c17f61a904c67c0c79.tar.lz gsoc2013-empathy-38e4f668b25cefbdc161f9c17f61a904c67c0c79.tar.xz gsoc2013-empathy-38e4f668b25cefbdc161f9c17f61a904c67c0c79.tar.zst gsoc2013-empathy-38e4f668b25cefbdc161f9c17f61a904c67c0c79.zip | |
all: remove butterfly workarounds (bgo#612555)
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'src/empathy-main-window.c')
| -rw-r--r-- | src/empathy-main-window.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 3f87c4f7a..cb135c4fc 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -76,7 +76,6 @@ #include "empathy-chatrooms-window.h" #include "empathy-event-manager.h" #include "empathy-ft-manager.h" -#include "empathy-migrate-butterfly-logs.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include <libempathy/empathy-debug.h> @@ -169,9 +168,6 @@ struct _EmpathyMainWindowPriv { /* Actions that are enabled when there are connected accounts */ GList *actions_connected; - /* The idle event source to migrate butterfly's logs */ - guint butterfly_log_migration_members_changed_id; - gboolean shell_running; }; @@ -2051,27 +2047,6 @@ account_manager_prepared_cb (GObject *source_object, g_list_free (accounts); } -static void -main_window_members_changed_cb (EmpathyContactList *list, - EmpathyContact *contact, - EmpathyContact *actor, - guint reason, - gchar *message, - gboolean is_member, - EmpathyMainWindow *window) -{ - EmpathyMainWindowPriv *priv = GET_PRIV (window); - - if (!is_member) - return; - - if (!empathy_migrate_butterfly_logs (contact)) { - g_signal_handler_disconnect (list, - priv->butterfly_log_migration_members_changed_id); - priv->butterfly_log_migration_members_changed_id = 0; - } -} - void empathy_main_window_set_shell_running (EmpathyMainWindow *window, gboolean shell_running) @@ -2358,10 +2333,6 @@ empathy_main_window_init (EmpathyMainWindow *window) EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL ^ EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP, EMPATHY_INDIVIDUAL_FEATURE_ALL); - priv->butterfly_log_migration_members_changed_id = g_signal_connect ( - priv->contact_manager, "members-changed", - G_CALLBACK (main_window_members_changed_cb), window); - gtk_widget_show (GTK_WIDGET (priv->individual_view)); gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->individual_view)); |