[Xfce4-commits] [xfce/xfce4-settings] 41/57: color: Drop xfconf (not needed)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-settings.

commit 35a7a8d3fa01a00ae003d85729f38b209a4fa557
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sat Feb 16 20:35:18 2019 +0100

    color: Drop xfconf (not needed)
    
    Everything is saved to and restored from colord's database anyway.
---
 dialogs/color-settings/Makefile.am |  4 +---
 dialogs/color-settings/main.c      | 22 ----------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/dialogs/color-settings/Makefile.am b/dialogs/color-settings/Makefile.am
index 8e72ff5..e570d22 100644
--- a/dialogs/color-settings/Makefile.am
+++ b/dialogs/color-settings/Makefile.am
@@ -19,7 +19,6 @@ xfce4_color_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(COLORD_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
-	$(XFCONF_CFLAGS) \
 	$(PLATFORM_CFLAGS) \
     -DGTK_DISABLE_SINGLE_INCLUDES \
     -DGDK_DISABLE_DEPRECATED \
@@ -35,8 +34,7 @@ xfce4_color_settings_LDFLAGS = \
 xfce4_color_settings_LDADD = \
 	$(GTK_LIBS) \
 	$(COLORD_LIBS) \
-	$(LIBXFCE4UI_LIBS) \
-	$(XFCONF_LIBS)
+	$(LIBXFCE4UI_LIBS)
 
 if MAINTAINER_MODE
 
diff --git a/dialogs/color-settings/main.c b/dialogs/color-settings/main.c
index 32a2e5b..dc1a985 100644
--- a/dialogs/color-settings/main.c
+++ b/dialogs/color-settings/main.c
@@ -34,7 +34,6 @@
 
 #include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4util/libxfce4util.h>
-#include <xfconf/xfconf.h>
 
 #include "color-device.h"
 #include "color-profile.h"
@@ -53,9 +52,6 @@ static GOptionEntry entries[] =
 
 
 
-/* global xfconf channel */
-static XfconfChannel *color_channel = NULL;
-
 typedef
 struct _ColorSettings
 {
@@ -1198,18 +1194,6 @@ main (gint argc, gchar **argv)
         return EXIT_SUCCESS;
     }
 
-    /* initialize xfconf */
-    if (!xfconf_init (&error)) {
-        /* print error and exit */
-        g_error ("Failed to connect to xfconf daemon: %s.", error->message);
-        g_error_free (error);
-
-        return EXIT_FAILURE;
-    }
-
-    /* open the channels */
-    color_channel = xfconf_channel_new ("color");
-
     /* hook to make sure the libxfce4ui library is linked */
     if (xfce_titled_dialog_get_type () == 0)
         return EXIT_FAILURE;
@@ -1264,11 +1248,5 @@ main (gint argc, gchar **argv)
     /* Release Builder */
     g_object_unref (G_OBJECT (builder));
 
-    /* release the channels */
-    g_object_unref (G_OBJECT (color_channel));
-
-    /* shutdown xfconf */
-    xfconf_shutdown();
-
     return EXIT_SUCCESS;
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.