ekiga r6772 - in trunk: . src/gui

[jschamp svn gnome org]

Author: jschamp
Date: Mon Sep  1 17:09:45 2008
New Revision: 6772
URL: http://svn.gnome.org/viewvc/ekiga?rev=6772&view=rev

Log:
Code and include changes (heading for GTK 2.12)

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

Modified: trunk/src/gui/callbacks.cpp
==============================================================================
--- trunk/src/gui/callbacks.cpp	(original)
+++ trunk/src/gui/callbacks.cpp	Mon Sep  1 17:09:45 2008
@@ -62,6 +62,7 @@
 #undef _
 #undef N_
 #include <gnome.h>
+#include <libbonobo.h>
 #endif
 
 

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Mon Sep  1 17:09:45 2008
@@ -81,6 +81,7 @@
 #undef _
 #undef N_
 #include <gnome.h>
+#include <libbonobo.h>
 #endif
 
 #if defined(P_FREEBSD) || defined (P_MACOSX)
@@ -2540,7 +2541,7 @@
   } else {
 
     gtk_widget_set_sensitive (menu, FALSE);
-    gtk_menu_item_remove_submenu (GTK_MENU_ITEM (menu));
+    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), NULL);
   }
 }
 

Modified: trunk/src/gui/statusicon.cpp
==============================================================================
--- trunk/src/gui/statusicon.cpp	(original)
+++ trunk/src/gui/statusicon.cpp	Mon Sep  1 17:09:45 2008
@@ -56,6 +56,7 @@
 #undef _
 #undef N_
 #include <gnome.h>
+#include <libbonobo.h>
 #endif
 
 #include "services.h"