ekiga r7176 - branches/gnome-2-24/src/gui

[sfre svn gnome org]

Author: sfre
Date: Wed Oct  8 18:27:34 2008
New Revision: 7176
URL: http://svn.gnome.org/viewvc/ekiga?rev=7176&view=rev

Log:
Use GTK stock icon for about icon instead of libgnome's

This fallback code is obsolete.

Modified:
   branches/gnome-2-24/src/gui/statusicon.cpp

Modified: branches/gnome-2-24/src/gui/statusicon.cpp
==============================================================================
--- branches/gnome-2-24/src/gui/statusicon.cpp	(original)
+++ branches/gnome-2-24/src/gui/statusicon.cpp	Wed Oct  8 18:27:34 2008
@@ -52,13 +52,6 @@
 #include <sigc++/sigc++.h>
 #include <vector>
 
-#ifdef HAVE_GNOME
-#undef _
-#undef N_
-#include <gnome.h>
-#include <libbonobo.h>
-#endif
-
 #include "services.h"
 #include "gtk-frontend.h"
 #include "personal-details.h"
@@ -398,7 +391,6 @@
 
   static MenuEntry menu [] =
     {
-#ifdef HAVE_GNOME
       GTK_MENU_ENTRY("help", NULL,
                      _("Get help by reading the Ekiga manual"),
                      GTK_STOCK_HELP, GDK_F1,
@@ -406,21 +398,10 @@
 
       GTK_MENU_ENTRY("about", NULL,
 		     _("View information about Ekiga"),
-		     GNOME_STOCK_ABOUT, 'a',
+		     GTK_STOCK_ABOUT, 0,
 		     GTK_SIGNAL_FUNC (about_callback), (gpointer) main_window,
 		     TRUE),
-#else
-      GTK_MENU_ENTRY("help", _("_Contents"),
-                     _("Get help by reading the Ekiga manual"),
-                     GTK_STOCK_HELP, GDK_F1,
-                     NULL, NULL, FALSE),
 
-      GTK_MENU_ENTRY("about", _("_About"),
-		     _("View information about Ekiga"),
-		     NULL, 'a',
-		     GTK_SIGNAL_FUNC (about_callback), (gpointer) main_window,
-		     TRUE),
-#endif
       GTK_MENU_SEPARATOR,
 
       GTK_MENU_ENTRY("quit", NULL, _("Quit"),