ekiga r7705 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Mon Mar  2 20:53:20 2009
New Revision: 7705
URL: http://svn.gnome.org/viewvc/ekiga?rev=7705&view=rev

Log:
Fixed possible crash on incoming calls when compiled without lib notify
support due to the use of a direct pointer instead of gmref_ptr.


Modified:
   trunk/ChangeLog
   trunk/src/gui/main.cpp

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Mon Mar  2 20:53:20 2009
@@ -1400,22 +1400,22 @@
 static void
 incoming_call_response_cb (GtkDialog *incoming_call_popup,
                            gint response,
-                           gpointer data)
+                           gpointer main_window)
 {
-  Ekiga::Call *call = (Ekiga::Call *) data;
+  EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (main_window);
 
   gtk_widget_hide (GTK_WIDGET (incoming_call_popup));
 
-  if (call) {
+  if (mw->priv->current_call) {
 
     switch (response) {
     case 2:
-      call->answer ();
+      mw->priv->current_call->answer ();
       break;
 
     default:
     case 0:
-      call->hangup ();
+      mw->priv->current_call->hangup ();
       break;
     }
   }
@@ -2719,7 +2719,7 @@
   g_signal_connect (G_OBJECT (incoming_call_popup), "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete), NULL);
   g_signal_connect (G_OBJECT (incoming_call_popup), "response",
-                    G_CALLBACK (incoming_call_response_cb), &call);
+                    G_CALLBACK (incoming_call_response_cb), mw);
 
   call->cleared.connect (sigc::bind (sigc::ptr_fun (on_cleared_incoming_call_cb),
                                     (gpointer) incoming_call_popup));