diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-02-03 17:04:28 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-02-03 17:04:28 +0800 |
| commit | e8964c6cfa2d4a29850b995427c69b2fb9bd0d64 (patch) | |
| tree | dc284d0996cdded996cae27034e0ac06882d6ce9 /src | |
| parent | 129080d5c9636179583d656221a70f2bcf6ccffc (diff) | |
| download | gsoc2013-empathy-e8964c6cfa2d4a29850b995427c69b2fb9bd0d64.tar gsoc2013-empathy-e8964c6cfa2d4a29850b995427c69b2fb9bd0d64.tar.gz gsoc2013-empathy-e8964c6cfa2d4a29850b995427c69b2fb9bd0d64.tar.bz2 gsoc2013-empathy-e8964c6cfa2d4a29850b995427c69b2fb9bd0d64.tar.lz gsoc2013-empathy-e8964c6cfa2d4a29850b995427c69b2fb9bd0d64.tar.xz gsoc2013-empathy-e8964c6cfa2d4a29850b995427c69b2fb9bd0d64.tar.zst gsoc2013-empathy-e8964c6cfa2d4a29850b995427c69b2fb9bd0d64.zip | |
Clean up some brokeness after the rebase
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2413
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-event-manager.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 3f9766540..ddab8769d 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -325,6 +325,7 @@ event_update (EmpathyEventManager *manager, EventPriv *event, 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 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat, g_free (header); empathy_sound_play (empathy_main_window_get (), EMPATHY_SOUND_CONVERSATION_NEW); - - g_free (msg); } static void @@ -513,13 +512,11 @@ event_manager_media_channel_got_name_cb (EmpathyContact *contact, 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 @@ event_manager_add_tube_approval (EventManagerApproval *approval, /* FIXME better sound for incoming tubes ? */ empathy_sound_play (empathy_main_window_get (), EMPATHY_SOUND_CONVERSATION_NEW); - - g_free (msg); } static void |