[empathy] nautilus-sendto: don't dup the account manager; it's not needed (closes bug #600961)
- From: Jonny Lamb <jonnylamb src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy] nautilus-sendto: don't dup the account manager; it's not needed (closes bug #600961)
- Date: Fri, 6 Nov 2009 13:40:01 +0000 (UTC)
commit 087e9a69efcec032b6ba181a3f03f1d9bd03cf28
Author: Jonny Lamb <jonnylamb gnome org>
Date: Fri Nov 6 13:35:31 2009 +0000
nautilus-sendto: don't dup the account manager; it's not needed (closes bug #600961)
Signed-off-by: Jonny Lamb <jonnylamb gnome org>
nautilus-sendto-plugin/empathy-nautilus-sendto.c | 36 ----------------------
1 files changed, 0 insertions(+), 36 deletions(-)
---
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 8560ac7..aae29d5 100644
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -35,42 +35,17 @@
#include <libempathy/empathy-ft-factory.h>
#include <libempathy/empathy-ft-handler.h>
#include <libempathy/empathy-tp-file.h>
-#include <libempathy/empathy-account-manager.h>
#include <libempathy-gtk/empathy-contact-selector.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include "nautilus-sendto-plugin.h"
-static EmpathyAccountManager *acc_manager = NULL;
static EmpathyFTFactory *factory = NULL;
static guint transfers = 0;
static gboolean destroy (NstPlugin *plugin);
-static void
-handle_account_manager_ready ()
-{
- TpConnectionPresenceType presence;
-
- presence = empathy_account_manager_get_global_presence (acc_manager,
- NULL, NULL);
-
- if (presence < TP_CONNECTION_PRESENCE_TYPE_AVAILABLE)
- return;
-}
-
-static void
-acc_manager_ready_cb (EmpathyAccountManager *am,
- GParamSpec *pspec,
- gpointer _user_data)
-{
- if (!empathy_account_manager_is_ready (am))
- return;
-
- handle_account_manager_ready ();
-}
-
static gboolean
init (NstPlugin *plugin)
{
@@ -78,14 +53,6 @@ init (NstPlugin *plugin)
empathy_gtk_init ();
- acc_manager = empathy_account_manager_dup_singleton ();
-
- if (empathy_account_manager_is_ready (acc_manager))
- handle_account_manager_ready ();
- else
- g_signal_connect (acc_manager, "notify::ready",
- G_CALLBACK (acc_manager_ready_cb), NULL);
-
return TRUE;
}
@@ -262,9 +229,6 @@ send_files (NstPlugin *plugin,
static gboolean
destroy (NstPlugin *plugin)
{
- if (acc_manager)
- g_object_unref (acc_manager);
-
if (factory)
g_object_unref (factory);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]