GNOME.org
 

[ekiga/ds-gsettings3] GSettings: Removed remaining GConf/GmConf bits.

commit 122bb690195c8af41e002008be56490ceaa511ca
Author: Damien Sandras <dsandras beip be>
Date:   Sun Nov 17 17:53:43 2013 +0100

    GSettings: Removed remaining GConf/GmConf bits.
    
    The port is now complete.

 Makefile.am                                  |   23 -
 configure.ac                                 |   29 -
 ekiga.schemas.in.in                          | 1006 ------------------
 lib/Makefile.am                              |   21 -
 lib/ekiga-settings.h                         |    2 +-
 lib/engine/components/opal/h323-endpoint.cpp |    1 -
 lib/engine/components/opal/opal-main.cpp     |    4 -
 lib/engine/components/opal/sip-endpoint.cpp  |    1 -
 lib/engine/framework/gmconf-bridge.cpp       |   74 --
 lib/engine/framework/gmconf-bridge.h         |  104 --
 lib/gmconf/gmconf-ekiga-keys.h               |   65 --
 lib/gmconf/gmconf-gconf.c                    |  398 -------
 lib/gmconf/gmconf-glib.c                     | 1421 --------------------------
 lib/gmconf/gmconf-upgrade.c                  |  183 ----
 lib/gmconf/gmconf-upgrade.h                  |   60 --
 lib/gmconf/gmconf.h                          |  126 ---
 lib/gui/gmmenuaddon.c                        |    2 -
 src/gui/main.cpp                             |    3 +-
 18 files changed, 2 insertions(+), 3521 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e28dd76..240859d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,6 @@ endif
 DESKTOP_IN_FILE= PACKAGE_NAME@.desktop.in.in
 DESKTOP_FILE= PACKAGE_NAME@.desktop
 
-SCHEMAS_IN_IN_FILE = @PACKAGE_NAME  schemas in in
-SCHEMAS_FILE = @PACKAGE_NAME  schemas
-
 gsettings_SCHEMAS = org.gnome.ekiga.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 
@@ -79,23 +76,3 @@ MAINTAINERCLEANFILES= \
        depcomp install-sh ltmain.sh missing config.h.in configure \
        m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \
        m4/lt~obsolete.m4 m4/gnome-doc-utils.m4
-
-### Install the schemas file in /etc if GCONF support is not compiled in,
-### and do not install the schemas at all
-if HAVE_GCONF
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_DATA = $(SCHEMAS_FILE)
-else
-schemasdir = $(sysconfdir)/@PACKAGE_NAME@
-schemas_DATA = $(SCHEMAS_FILE)
-endif
-
-install-schemas: @PACKAGE_NAME  schemas
-       GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(SCHEMAS_FILE) 

/dev/null 2>&1

-       gconftool-2 --shutdown
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local: install-schemas 
-else
-install-data-local:
-endif
diff --git a/configure.ac b/configure.ac
index 45ba66e..6d7810b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,33 +199,6 @@ dnl ###############################
 
 GLIB_GSETTINGS
 
-dnl ###############################
-dnl   GConf support
-dnl ###############################
-GCONF="disabled"
-
-if test "x${gm_platform}" != "xmingw" ; then
-  AC_ARG_ENABLE(gconf, AS_HELP_STRING([--enable-gconf],[enable GConf support (default is enabled)]),
-[if test "x$enableval" = "xyes"; then
-  enable_gconf = yes
-fi],enable_gconf=yes)
-
-  if test "x$enable_gconf" = "xyes"; then
-    PKG_CHECK_MODULES([GCONF], [gconf-2.0 >= 2.6.0], [found_gconf=yes])
-    AM_GCONF_SOURCE_2
-    AC_SUBST(GCONF_CFLAGS)
-    AC_SUBST(GCONF_LIBS)
-    GCONF="enabled"
-    AC_DEFINE(HAVE_GCONF,1,[GConf support])
-  else
-    AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
-  fi
-else
-  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
-fi
-
-AM_CONDITIONAL(HAVE_GCONF, test "x$found_gconf" = "xyes")
-
 
 dnl ###############################
 dnl   Evolution-data-server support
@@ -883,7 +856,6 @@ AC_CONFIG_FILES([Makefile
 Doxyfile
 src/ekiga-config-tool
 org.gnome.ekiga.gschema.xml.in
-ekiga.schemas.in
 ekiga.desktop.in
 lib/Makefile
 po/Makefile.in
@@ -916,7 +888,6 @@ echo "          Installing into prefix  :  $prefix"
 echo ""
 if test "x${gm_platform}" != "xmingw" ; then
 echo "                     GDU support  :  $GDU"
-echo "                   GConf support  :  $GCONF"
 echo "   Evolution-Data-Server support  :  $EDS"
 echo "                  NOTIFY support  :  $NOTIFY"
 fi
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ea90719..3d5d17f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,7 +16,6 @@ AM_CPPFLAGS = \
        -DEKIGA_PLUGIN_DIR=\"$(PLUGIN_DIR)\" \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
-       -I$(top_srcdir)/lib/gmconf \
        -I$(top_srcdir)/lib/gui \
        -I$(top_srcdir)/lib/platform \
        -I$(top_srcdir)/lib/engine \
@@ -102,22 +101,6 @@ endif
 endif
 
 ##
-# Sources out of the gmconf directory
-##
-libekiga_la_SOURCES += \
-       gmconf/gmconf.h \
-       gmconf/gmconf-ekiga-keys.h \
-       gmconf/gmconf-upgrade.h \
-       gmconf/gmconf-upgrade.c
-
-if HAVE_GCONF
-libekiga_la_SOURCES += gmconf/gmconf-gconf.c
-libekiga_la_LDFLAGS += $(GCONF_LIBS)
-else
-libekiga_la_SOURCES += gmconf/gmconf-glib.c
-endif
-
-##
 # Sources out of the gui directory
 # (those should probably be moved elsewhere like engine/gui/gtk-core/ )
 ##
@@ -207,8 +190,6 @@ libekiga_la_SOURCES += \
        engine/framework/robust-xml.h \
        engine/framework/robust-xml.cpp \
        engine/framework/form-visitor.h \
-       engine/framework/gmconf-bridge.h \
-       engine/framework/gmconf-bridge.cpp \
        engine/framework/runtime.h \
        engine/framework/menu-builder.h \
        engine/framework/menu-builder.cpp \
@@ -480,8 +461,6 @@ libekiga_la_SOURCES += \
        engine/components/opal/opal-call.cpp \
        engine/components/opal/opal-codec-description.h \
        engine/components/opal/opal-codec-description.cpp \
-       engine/components/opal/opal-gmconf-bridge.h \
-       engine/components/opal/opal-gmconf-bridge.cpp \
        engine/components/opal/opal-main.h \
        engine/components/opal/opal-main.cpp \
        engine/components/opal/opal-audio.h \
diff --git a/lib/ekiga-settings.h b/lib/ekiga-settings.h
index 44a8372..4cc3472 100644
--- a/lib/ekiga-settings.h
+++ b/lib/ekiga-settings.h
@@ -55,7 +55,7 @@
 #define VIDEO_DISPLAY_SCHEMA USER_INTERFACE ".video-display"
 
 #define PROTOCOLS_SCHEMA "org.gnome." PACKAGE_NAME ".protocols"
-#define PORTS_SCHEMA PROTOCOLS_SCHEMA ".sip"
+#define PORTS_SCHEMA PROTOCOLS_SCHEMA ".ports"
 #define SIP_SCHEMA PROTOCOLS_SCHEMA ".sip"
 #define H323_SCHEMA PROTOCOLS_SCHEMA ".h323"
 #define CALL_FORWARDING_SCHEMA PROTOCOLS_SCHEMA ".call-forwarding"
diff --git a/lib/engine/components/opal/h323-endpoint.cpp b/lib/engine/components/opal/h323-endpoint.cpp
index 18bc9d1..0113428 100644
--- a/lib/engine/components/opal/h323-endpoint.cpp
+++ b/lib/engine/components/opal/h323-endpoint.cpp
@@ -40,7 +40,6 @@
 
 #include "h323-endpoint.h"
 
-#include "gmconf.h"
 #include "account-core.h"
 
 namespace Opal {
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index e145e75..dbee7c1 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -45,7 +45,6 @@
 #include "videoinput-core.h"
 #include "videooutput-core.h"
 
-#include "opal-gmconf-bridge.h"
 #include "opal-plugins-hook.h"
 
 #include "sip-endpoint.h"
@@ -128,9 +127,6 @@ struct OPALSpark: public Ekiga::Spark
 
       call_core->add_manager (call_manager);
 
-      boost::shared_ptr<ConfBridge> bridge(new ConfBridge (*call_manager));
-      core.add (bridge);
-
       presence_core->add_supported_uri (&is_supported_address); //FIXME
 
       result = true;
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index 952ad86..2e3d010 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -38,7 +38,6 @@
 
 #include <glib/gi18n.h>
 #include "config.h"
-#include "gmconf.h"
 #include "sip-endpoint.h"
 #include "chat-core.h"
 
diff --git a/lib/gui/gmmenuaddon.c b/lib/gui/gmmenuaddon.c
index 6556cea..e212a6b 100644
--- a/lib/gui/gmmenuaddon.c
+++ b/lib/gui/gmmenuaddon.c
@@ -41,8 +41,6 @@
 #include <libintl.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gmconf.h"
-
 
 /* Notice, this implementation sets the menu item name as data of the menu
  * widget, the statusbar and also the given structure.
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 222c56a..5cd714b 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -215,8 +215,7 @@ main (int argc,
 
   boost::shared_ptr<GtkFrontend> gtk_frontend
     = service_core->get<GtkFrontend>("gtk-frontend");
-  boost::shared_ptr<Ekiga::Settings> general_settings;
-    boost::shared_ptr<Ekiga::Settings> (new Ekiga::Settings (GENERAL_SCHEMA));
+  boost::shared_ptr<Ekiga::Settings> general_settings (new Ekiga::Settings (GENERAL_SCHEMA));
 
   GtkWidget *main_window = GTK_WIDGET (gtk_frontend->get_main_window ());
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]