[ekiga] Made the core actions menu compiled out by default



commit 5ed12d8e8d5358fdcf3032f452bf364db397893a
Author: Snark <jpuydt gnome org>
Date:   Mon Mar 7 19:20:14 2011 +0100

    Made the core actions menu compiled out by default

 src/gui/main_window.cpp |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 0214170..8f36847 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -101,6 +101,9 @@
 
 #include <algorithm>
 
+// this is a bad way to do things,but still
+#undef CORE_ACTIONS_MENU
+
 enum CallingState {Standby, Calling, Connected, Called};
 
 enum DeviceType {AudioInput, AudioOutput, Ringer, VideoInput};
@@ -722,6 +725,11 @@ static
 void on_some_core_updated (EkigaMainWindow* self)
 {
   GtkWidget* menu = gtk_menu_get_widget (self->priv->main_menu, "core-actions");
+
+  // this can happen if the menu is compiled out
+  if (menu == NULL)
+    return;
+
   MenuBuilderGtk builder;
   Ekiga::TemporaryMenuBuilder tmp_builder;
 
@@ -3533,6 +3541,7 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
 
       GTK_MENU_SEPARATOR,
 
+#ifdef CORE_ACTIONS_MENU
       // FIXME: that isn't a very good way to do things
       GTK_MENU_ENTRY ("core-actions", _("Other"),
 		      _("Other possible actions"),
@@ -3540,6 +3549,7 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
 		      NULL, NULL, FALSE),
 
       GTK_MENU_SEPARATOR,
+#endif
 
       GTK_MENU_ENTRY("close", NULL, _("Close the Ekiga window"),
 		     GTK_STOCK_CLOSE, 'W', 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]