empathy r2413 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Feb  3 09:04:28 2009
New Revision: 2413
URL: http://svn.gnome.org/viewvc/empathy?rev=2413&view=rev

Log:
Clean up some brokeness after the rebase

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/src/empathy-event-manager.c

Modified: trunk/src/empathy-event-manager.c
==============================================================================
--- trunk/src/empathy-event-manager.c	(original)
+++ trunk/src/empathy-event-manager.c	Tue Feb  3 09:04:28 2009
@@ -325,6 +325,7 @@
   g_signal_emit (manager, signals[EVENT_UPDATED], 0, event);
 }
 
+static void
 event_manager_call_window_confirmation_dialog_response_cb (GtkDialog *dialog,
   gint response, gpointer user_data)
 {
@@ -435,8 +436,6 @@
   g_free (header);
   empathy_sound_play (empathy_main_window_get (),
     EMPATHY_SOUND_CONVERSATION_NEW);
-
-  g_free (msg);
 }
 
 static void
@@ -513,13 +512,11 @@
     empathy_contact_get_name (contact));
 
   event_manager_add (approval->manager,
-    approval->contact, EMPATHY_IMAGE_VOIP, msg,
+    approval->contact, EMPATHY_IMAGE_VOIP, header, NULL,
     approval, event_channel_process_voip_func, NULL);
 
   g_free (header);
   event_manager_start_ringing (approval->manager);
-
-  g_free (msg);
 }
 
 static void
@@ -581,8 +578,6 @@
   /* FIXME better sound for incoming tubes ? */
   empathy_sound_play (empathy_main_window_get (),
     EMPATHY_SOUND_CONVERSATION_NEW);
-
-  g_free (msg);
 }
 
 static void