GNOME.org
 

[ekiga] Remove code dealing with obsolete gnome libraries

commit e89d1caf74e5735b6c34c9106b86fcc5e08f2ca2
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Dec 27 22:27:24 2010 +0100

    Remove code dealing with obsolete gnome libraries
    
    Ekiga depends on gtk >=2.20 anyway, where these libraries (libgnome,
    libgnomeui) are deprecated.

 configure.ac                                       |   26 ---
 lib/Makefile.am                                    |   21 +--
 .../gnome-session/gnome-session-main.cpp           |  181 --------------------
 .../components/gnome-session/gnome-session-main.h  |   45 -----
 lib/engine/engine.cpp                              |    9 -
 lib/toolbox/toolbox-gnome.c                        |   50 ------
 src/Makefile.am                                    |    4 +-
 src/ekiga.cpp                                      |    5 -
 src/gui/callbacks.cpp                              |   33 ++---
 9 files changed, 15 insertions(+), 359 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6d39647..64bde61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,31 +184,6 @@ AC_SUBST(XML_LIBS)
 
 
 dnl ###############################
-dnl   GNOME support
-dnl ###############################
-GNOME="unneeded"
-
-if test "x${gm_platform}" != "xmingw" ; then
-  if $PKG_CONFIG --max-version 2.13.1 gtk+-2.0; then
-    GNOME="disabled"
-    AC_ARG_ENABLE(gnome, AS_HELP_STRING([--enable-gnome],[enable GNOME support (default is to enable if needed)]),
-[if test "x$enableval" = "xyes"; then
-  enable_gnome=yes
-fi],enable_gnome=yes)
-
-    if test "x$enable_gnome" = "xyes"; then
-      PKG_CHECK_MODULES([GNOME], [libgnome-2.0 >= 2.14.0 libgnomeui-2.0 >= 2.14.0], [found_gnome=yes])
-      AC_SUBST(GNOME_CFLAGS)
-      AC_SUBST(GNOME_LIBS)
-      GNOME="enabled"
-      AC_DEFINE(HAVE_GNOME,1,[GNOME support])
-    fi
-  fi
-fi
-AM_CONDITIONAL(HAVE_GNOME, test "x$found_gnome" = "xyes")
-
-
-dnl ###############################
 dnl   GConf support
 dnl ###############################
 GCONF="disabled"
@@ -895,7 +870,6 @@ echo "================ Final configuration ==================="
 echo "          Installing into prefix  :  $prefix"
 echo ""
 if test "x${gm_platform}" != "xmingw" ; then
-echo "                   GNOME support  :  $GNOME"
 echo "                   GConf support  :  $GCONF"
 echo "   Evolution-Data-Server support  :  $EDS"
 echo "                  NOTIFY support  :  $NOTIFY"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ededfac..9f9c5c9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -42,7 +42,6 @@ INCLUDES = \
 	-I$(top_srcdir)/lib/engine/components/dx-videooutput \
 	-I$(top_srcdir)/lib/engine/components/echo \
 	-I$(top_srcdir)/lib/engine/components/gmconf-personal-details \
-	-I$(top_srcdir)/lib/engine/components/gnome-session \
 	-I$(top_srcdir)/lib/engine/components/hal-dbus \
 	-I$(top_srcdir)/lib/engine/components/libnotify \
 	-I$(top_srcdir)/lib/engine/components/local-roster \
@@ -54,12 +53,11 @@ INCLUDES = \
 	-I$(top_srcdir)/lib/engine/components/x-videooutput
 
 AM_CFLAGS = \
-	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) \
-	$(DBUS_CFLAGS) $(GNOME_CFLAGS)
+	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) $(DBUS_CFLAGS)
 
 AM_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(GTK_CFLAGS) \
-	$(DBUS_CFLAGS) $(GNOME_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS)
+	$(DBUS_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS)
 AM_LIBS = \
 	$(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
 
@@ -97,12 +95,8 @@ libekiga_la_SOURCES += \
 if WIN32
 libekiga_la_SOURCES += $(top_srcdir)/lib/toolbox/toolbox-win32.c
 else
-if HAVE_GNOME
-libekiga_la_SOURCES += $(top_srcdir)/lib/toolbox/toolbox-gnome.c
-else
 libekiga_la_SOURCES += $(top_srcdir)/lib/toolbox/toolbox-gtk.c
 endif
-endif
 
 ##
 # Sources out of the platform directory
@@ -661,17 +655,6 @@ $(builddir)/hal-marshal.c: $(components_dir)/hal-dbus/hal-marshal.list
 endif
 
 ##
-# Sources of the gnome session component
-##
-if HAVE_GNOME
-
-libekiga_la_SOURCES += \
-	$(components_dir)/gnome-session/gnome-session-main.h \
-	$(components_dir)/gnome-session/gnome-session-main.cpp
-
-endif
-
-##
 # Support for shared memory
 ##
 if HAVE_SHM
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index bf0975f..d228ff2 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -80,9 +80,6 @@
 
 #ifdef HAVE_DBUS
 #include "hal-main-dbus.h"
-#ifdef HAVE_GNOME
-#include "gnome-session-main.h"
-#endif
 #endif
 
 #include "opal-main.h"
@@ -187,12 +184,6 @@ engine_init (Ekiga::ServiceCorePtr service_core,
   avahi_publisher_init (kickstart);
 #endif
 
-#ifdef HAVE_GNOME
-#ifdef HAVE_DBUS
-  gnomesession_init (kickstart);
-#endif
-#endif
-
   history_init (kickstart);
 
   /* FIXME: this one should go away -- but if I don't put it here, the GUI
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e64b54..868d7d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -151,8 +151,8 @@ src/revision.h:
           fi \
         fi
 
-AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(BOOST_CPPFLAGS) $(XML_CFLAGS) $(NOTIFY_CFLAGS)
-AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(BONOBO_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOOST_LDFLAGS) $(BOOST_LIBS) $(XML_LIBS) $(NOTIFY_LIBS)
+AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(BOOST_CPPFLAGS) $(XML_CFLAGS) $(NOTIFY_CFLAGS)
+AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(BONOBO_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOOST_LDFLAGS) $(BOOST_LIBS) $(XML_LIBS) $(NOTIFY_LIBS)
 
 ekiga_LDADD = \
 	$(top_builddir)/lib/libekiga.la $(AM_LIBS)
diff --git a/src/ekiga.cpp b/src/ekiga.cpp
index 726787a..b0dbefb 100644
--- a/src/ekiga.cpp
+++ b/src/ekiga.cpp
@@ -178,11 +178,6 @@ void GnomeMeeting::BuildGUI (Ekiga::ServiceCorePtr services)
 	  << MAJOR_VERSION << "." << MINOR_VERSION << "." << BUILD_NUMBER);
   PTRACE (1, "OPAL version " << OPAL_VERSION);
   PTRACE (1, "PTLIB version " << PTLIB_VERSION);
-#ifdef HAVE_GNOME
-  PTRACE (1, "GNOME support enabled");
-#else
-  PTRACE (1, "GNOME support disabled");
-#endif
 #if defined HAVE_XV || defined HAVE_DX
   PTRACE (1, "Accelerated rendering support enabled");
 #else
diff --git a/src/gui/callbacks.cpp b/src/gui/callbacks.cpp
index 51ad7e6..2304122 100644
--- a/src/gui/callbacks.cpp
+++ b/src/gui/callbacks.cpp
@@ -59,16 +59,11 @@
 
 #include <glib/gi18n.h>
 
-#undef GTK_DISABLE_DEPRECATED
-#ifdef HAVE_GNOME
-#include <libgnome/gnome-help.h>
-#endif
-
 
 /* The callbacks */
 
 void
-about_callback (G_GNUC_UNUSED GtkWidget *widget, 
+about_callback (G_GNUC_UNUSED GtkWidget *widget,
 		gpointer parent_window)
 {
   const gchar *authors [] = {
@@ -79,7 +74,7 @@ about_callback (G_GNUC_UNUSED GtkWidget *widget,
       "Eugen Dedu <eugen dedu pu-pm univ-fcomte fr>",
       "Yannick Defais <sevmek free fr>",
       "Steve Fr\303\251cinaux <code istique net>",
-      "Kilian Krause <kk verfaction de>", 
+      "Kilian Krause <kk verfaction de>",
       "Vincent Luba <luba novacom be>",
       "Julien Puydt <julien puydt laposte net>",
       "Luc Saillard <luc saillard org>",
@@ -98,11 +93,11 @@ about_callback (G_GNUC_UNUSED GtkWidget *widget,
       N_("See AUTHORS file for full credits"),
       NULL
   };
-	
+
   authors [2] = gettext (authors [2]);
   authors [12] = gettext (authors [12]);
   authors [20] = gettext (authors [20]);
-  
+
   const gchar *documenters [] = {
     "Damien Sandras <dsandras seconix com>",
     "Christopher Warner <zanee kernelcode com>",
@@ -138,9 +133,9 @@ GNU GPL for all the rest of the software thus combined.")
   if (strcmp (translator_credits, "translator-credits") == 0)
     translator_credits = "No translators, English by\n"
         "Damien Sandras <dsandras seconix com>";
- 
+
   const gchar *comments =  _("Ekiga is full-featured SIP and H.323 compatible VoIP, IP-Telephony and Videoconferencing application that allows you to make audio and video calls to remote users with SIP and H.323 hardware or software.");
- 
+
   license_trans = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n",
                                _(license[2]), "\n\n", NULL);
 
@@ -205,17 +200,13 @@ help_callback (G_GNUC_UNUSED GtkWidget *widget,
   GError *err = NULL;
   gboolean success = FALSE;
 
-#ifdef HAVE_GNOME
-  success = gnome_help_display (PACKAGE_NAME ".xml", NULL, &err);
-#else
   success = gtk_show_uri (NULL, "ghelp:" PACKAGE_NAME, GDK_CURRENT_TIME, &err);
-#endif
 
   if (!success) {
     GtkWidget *d;
-    d = gtk_message_dialog_new (GTK_WINDOW (GnomeMeeting::Process ()->GetMainWindow ()), 
+    d = gtk_message_dialog_new (GTK_WINDOW (GnomeMeeting::Process ()->GetMainWindow ()),
                                 (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
-                                GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, 
+                                GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
                                 "%s", _("Unable to open help file."));
     gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (d),
                                               "%s", err->message);
@@ -228,7 +219,7 @@ help_callback (G_GNUC_UNUSED GtkWidget *widget,
 
 
 void
-quit_callback (G_GNUC_UNUSED GtkWidget *widget, 
+quit_callback (G_GNUC_UNUSED GtkWidget *widget,
 	       G_GNUC_UNUSED gpointer data)
 {
   GtkWidget *main_window = NULL;
@@ -240,7 +231,7 @@ quit_callback (G_GNUC_UNUSED GtkWidget *widget,
   assistant_window = GnomeMeeting::Process ()->GetAssistantWindow ();
   prefs_window = GnomeMeeting::Process ()->GetPrefsWindow ();
   accounts_window = GnomeMeeting::Process ()->GetAccountsWindow ();
-  
+
   gtk_widget_hide (main_window);
   if (assistant_window)
     gm_window_hide (assistant_window);
@@ -252,6 +243,4 @@ quit_callback (G_GNUC_UNUSED GtkWidget *widget,
     gtk_main_iteration ();
 
   gtk_main_quit ();
-}  
-
-
+}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]