aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/.gitignore2
-rw-r--r--src/empathy-call-chandler.c19
-rw-r--r--src/empathy-chat-chandler.c15
3 files changed, 1 insertions, 35 deletions
diff --git a/src/.gitignore b/src/.gitignore
index 54397d04f..75a62869e 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,5 +2,3 @@ empathy
empathy-accounts
empathy-chat-chandler
org.gnome.Empathy.Chat.service
-empathy-call-chandler
-org.gnome.Empathy.Call.service
diff --git a/src/empathy-call-chandler.c b/src/empathy-call-chandler.c
index be9de1175..3a1b51137 100644
--- a/src/empathy-call-chandler.c
+++ b/src/empathy-call-chandler.c
@@ -42,19 +42,6 @@
#define BUS_NAME "org.gnome.Empathy.CallChandler"
#define OBJECT_PATH "/org/gnome/Empathy/CallChandler"
-static guint nb_calls = 0;
-
-static void
-call_chandler_weak_notify (gpointer data,
- GObject *where_the_object_was)
-{
- nb_calls--;
- if (nb_calls == 0) {
- empathy_debug (DEBUG_DOMAIN, "No more calls, leaving...");
- gtk_main_quit ();
- }
-}
-
static void
call_chandler_new_channel_cb (EmpathyChandler *chandler,
TpConn *tp_conn,
@@ -63,17 +50,13 @@ call_chandler_new_channel_cb (EmpathyChandler *chandler,
{
EmpathyTpCall *call;
McAccount *account;
- GtkWidget *window;
account = mission_control_get_account_for_connection (mc, tp_conn, NULL);
call = empathy_tp_call_new (account, tp_chan);
- window = empathy_call_window_show (call);
+ empathy_call_window_show (call);
g_object_unref (account);
g_object_unref (call);
-
- nb_calls++;
- g_object_weak_ref (G_OBJECT (window), call_chandler_weak_notify, NULL);
}
int
diff --git a/src/empathy-chat-chandler.c b/src/empathy-chat-chandler.c
index 79bbe8a35..dc2eb60f7 100644
--- a/src/empathy-chat-chandler.c
+++ b/src/empathy-chat-chandler.c
@@ -48,19 +48,6 @@
#define BUS_NAME "org.gnome.Empathy.ChatChandler"
#define OBJECT_PATH "/org/gnome/Empathy/ChatChandler"
-static guint nb_chats = 0;
-
-static void
-chat_chandler_weak_notify (gpointer data,
- GObject *where_the_object_was)
-{
- nb_chats--;
- if (nb_chats == 0) {
- empathy_debug (DEBUG_DOMAIN, "No more chats, leaving...");
- gtk_main_quit ();
- }
-}
-
static void
chat_chandler_new_channel_cb (EmpathyChandler *chandler,
TpConn *tp_conn,
@@ -112,8 +99,6 @@ chat_chandler_new_channel_cb (EmpathyChandler *chandler,
return;
}
- nb_chats++;
- g_object_weak_ref (G_OBJECT (chat), chat_chandler_weak_notify, NULL);
empathy_chat_present (chat);
g_object_unref (chat);