Merge lp:~ballogy/gloobus-preview/drop-gconf into lp:gloobus-preview

[Balló György]

Update locations of GNOME configuration

In GNOME 3, these settings were moved from GConf to GSettings. Remove GConf dependency.

[lp:~ballogy/gloobus-preview/drop-gconf]

293. By Balló György on 2014-12-23

Small fix

=== modified file 'configure.ac'
--- configure.ac	2014-12-23 10:30:25 +0000
+++ configure.ac	2014-12-23 10:46:51 +0000
@@ -42,7 +42,6 @@
 PKG_CHECK_MODULES(ATK, atk)
 PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
 PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-3.0)
-PKG_CHECK_MODULES(GCONF2, gconf-2.0)
 PKG_CHECK_MODULES(CAIRO, cairo)
 PKG_CHECK_MODULES(GSTREAMER, gstreamer-1.0)
 PKG_CHECK_MODULES(GSTREAMER_PLUGINS, gstreamer-plugins-base-1.0)

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-12-22 06:30:44 +0000
+++ src/Makefile.am	2014-12-23 10:46:51 +0000
@@ -21,7 +21,6 @@
 AM_CPPFLAGS += \
 	$(CAIRO_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(GCONF2_CFLAGS) \
 	$(PTHREAD_CFLAGS) \
 	$(GTKSOURCEVIEW_CFLAGS) \
 	$(GLIB_CFLAGS) \
@@ -33,7 +32,6 @@
 	$(PTHREAD_LIBS) \
 	$(CAIRO_LIBS) \
 	$(GTK_LIBS) \
-	$(GCONF2_LIBS) \
 	$(GTKSOURCEVIEW_LIBS) \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \

=== modified file 'src/gloobus-preview-config.cpp'
--- src/gloobus-preview-config.cpp	2010-08-29 14:37:10 +0000
+++ src/gloobus-preview-config.cpp	2014-12-23 10:46:51 +0000
@@ -1,7 +1,7 @@
 #include <string>
 #include <glib.h>
+#include <gio/gio.h>
 #include "gloobus-preview-config.h"
-#include <gconf/gconf-client.h>
 #include "config.h"
 
 GloobusConfig::GloobusConfig( void )
@@ -21,20 +21,22 @@
 
 GloobusConfig::~GloobusConfig( void ){}
 
-bool GloobusConfig::get_gconf_win_layout()
+bool GloobusConfig::get_gsettings_win_layout()
 {
-	GConfClient* client_;
-	GError* error = NULL;
-	client_ = gconf_client_get_default();
-	if (!client_) {
-		g_debug("Unable to create a gconf client");
-		return false;
-	}
-	gchar* gconf_value = gconf_client_get_string(client_, "/apps/metacity/general/button_layout", &error);
-	if (!gconf_value) {
-		return false;
-	}
-	if (int(string(gconf_value).find("close")) - int(string(gconf_value).find(":")) > 0)
+	gchar* button_layout;
+	GSettingsSchemaSource *schema_source = g_settings_schema_source_get_default ();
+	GSettingsSchema *wm_schema = g_settings_schema_source_lookup (schema_source, "org.gnome.desktop.wm.preferences", FALSE);
+	if (wm_schema) {
+		GSettings *wm_settings = g_settings_new ("org.gnome.desktop.wm.preferences");
+		button_layout = g_settings_get_string (wm_settings, "button-layout");
+		g_object_unref (wm_settings);
+		g_settings_schema_unref (wm_schema);
+	}
+
+	if (!button_layout) {
+		return false;
+	}
+	if (int(string(button_layout).find("close")) - int(string(button_layout).find(":")) > 0)
 		m_winbar_layout = false;
 	else
 		m_winbar_layout = true;
@@ -42,16 +44,6 @@
 	return true;
 }
 
-char* GloobusConfig::get_gconf_value_string( const char* key) {
-	GConfClient* client_;
-	client_ = gconf_client_get_default();
-	if (!client_) {
-		g_debug("Unable to create a gconf client");
-		return 0;
-	}
-	return gconf_client_get_string(client_, key, NULL);
-}
-
 //============== LOAD CONFIG ==============//
 bool GloobusConfig::load_config()
 {
@@ -67,7 +59,7 @@
 		m_focus 	= g_key_file_get_boolean( keyFile,"Main","focus",	NULL );
 		theme_gtk	= g_key_file_get_boolean( keyFile,"Theme","gtk",	NULL );
 		
-		if (!get_gconf_win_layout())
+		if (!get_gsettings_win_layout())
 			m_winbar_layout = (bool)g_key_file_get_integer 	( keyFile,"Main","winbar_layout",	NULL );
 		g_key_file_free										( keyFile );
 

=== modified file 'src/gloobus-preview-config.h'
--- src/gloobus-preview-config.h	2010-05-01 14:34:16 +0000
+++ src/gloobus-preview-config.h	2014-12-23 10:46:51 +0000
@@ -45,7 +45,7 @@
 		bool		load_config			(void);
 
 		
-		bool		get_gconf_win_layout(void);
+		bool		get_gsettings_win_layout(void);
 
 		/* Returns if show gloobus-preview in taskbar
 		 * */
@@ -78,10 +78,6 @@
 		 * */
 		gp_action	get_cli_action		(void);
 
-		/* get a gconf value
-		 * */
-		char*		get_gconf_value_string( const char*);
-
 		char*		get_theme			( void );
 
 		bool		get_theme_gtk		( void );

=== modified file 'src/gloobus-preview-configuration'
--- src/gloobus-preview-configuration	2014-12-20 21:18:38 +0000
+++ src/gloobus-preview-configuration	2014-12-23 10:46:51 +0000
@@ -6,52 +6,52 @@
 import os
 import sys
 import glob
-from gi.repository import Gtk, GConf
+from gi.repository import Gtk, GConf, Gio
 import signal
 import gettext
 #import config
 
 #=========================== CLASS COLORS =======================================================#
-class colors:
-
-	colors_code = ["\033[1;37m","\033[1;36m","\033[1;33m","\033[1;31m","\033[1;m"]
-	colors_name = ["white","blue","yellow","red", "reset"]
-	levels_name = ["info","debug","warning","error","reset"]
-	debugMode = False
-
-
-	#=================== GET CODE BY COLOR ===================#
-	def color(self,color):
-		self.debug = debug
-
-		for i in range(len(self.colors_name)):
-			if color == self.colors_name[i]:
-				return self.colors_code[i]
-		return ""
-
-	#=================== GET CODE BY LEVEL ===================#
-	def level(self,level):
-		for i in range(len(self.colors_name)):
-			if level == self.levels_name[i]:
-				return self.colors_code[i]
-		return ""
-
-	#====================== SET DEBUG =======================#
-	def set_debug(self,debug):
-		self.debugMode = debug
-
-	#================= PREDEFINED MACROS =======================#
-	def debug(self,string):
-		if self.debugMode:
-			print self.level('debug') + "[DEBUG] " + self.level('reset') + string
-
-	def info(self,string):
-		print self.level('info') + "[INFO] " + self.level('reset') + string
-	
-	def warning(self,string):
-		print self.level('warning') + "[WARNING] " + self.level('reset') + string
-	
-	def error(self,string):
+class colors:
+
+	colors_code = ["\033[1;37m","\033[1;36m","\033[1;33m","\033[1;31m","\033[1;m"]
+	colors_name = ["white","blue","yellow","red", "reset"]
+	levels_name = ["info","debug","warning","error","reset"]
+	debugMode = False
+
+
+	#=================== GET CODE BY COLOR ===================#
+	def color(self,color):
+		self.debug = debug
+
+		for i in range(len(self.colors_name)):
+			if color == self.colors_name[i]:
+				return self.colors_code[i]
+		return ""
+
+	#=================== GET CODE BY LEVEL ===================#
+	def level(self,level):
+		for i in range(len(self.colors_name)):
+			if level == self.levels_name[i]:
+				return self.colors_code[i]
+		return ""
+
+	#====================== SET DEBUG =======================#
+	def set_debug(self,debug):
+		self.debugMode = debug
+
+	#================= PREDEFINED MACROS =======================#
+	def debug(self,string):
+		if self.debugMode:
+			print self.level('debug') + "[DEBUG] " + self.level('reset') + string
+
+	def info(self,string):
+		print self.level('info') + "[INFO] " + self.level('reset') + string
+	
+	def warning(self,string):
+		print self.level('warning') + "[WARNING] " + self.level('reset') + string
+	
+	def error(self,string):
 		print self.level('error') + "[ERROR] " + self.level('reset') + string	
 
 
@@ -62,14 +62,17 @@
 	entry2 = None			#Allways on top
 	entry3 = None			#Quit on lose focus
 	entry4 = None			#Win bar layout
-	gconf_win_layout = None
+	gsettings_win_layout = None
 	config = None
 
 	def __init__(self):
 		self.config = config_load()
 		
-		self.client = GConf.Client.get_default()
-		self.gconf_win_layout = self.client.get_string('/apps/metacity/general/button_layout')
+		schema_source = Gio.SettingsSchemaSource.get_default()
+		wm_schema =Gio.SettingsSchemaSource.lookup(schema_source, "org.gnome.desktop.wm.preferences", False)
+        	if wm_schema:
+                	wm_settings = Gio.Settings.new("org.gnome.desktop.wm.preferences")
+                	self.gsettings_win_layout = wm_settings.get_string("button-layout")
 
 		#================= Show In Taskbar ================= #
 		self.entry1 = Gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False)  
@@ -124,7 +127,7 @@
 		general_container.add(self.entry2)	#Always on top
 		general_container.add(self.entry3)	#Always on top
 		general_container.add(self.theme_gtk_entry)
-		if self.gconf_win_layout == None:
+		if self.gsettings_win_layout == None:
 			general_container.add(self.entry4)	#Always on top
 
 		general_container.add(Gtk.HSeparator())

=== modified file 'src/plugin-pixbuf/plugin-pixbuf.cpp'
--- src/plugin-pixbuf/plugin-pixbuf.cpp	2010-08-29 14:37:10 +0000
+++ src/plugin-pixbuf/plugin-pixbuf.cpp	2014-12-23 10:46:51 +0000
@@ -121,9 +121,15 @@
 
 void iPixbuf::set_as_background_cb()
 {
-        //gconftool-2 --type string --set /desktop/gnome/background/picture_filename /path/to/image.jpg
-        g_debug("Set as background current image %s",    Gloobus::instance()->get_filename().c_str());
+        const gchar *uri = g_file_get_uri (Gloobus::instance()->get_file());
+        g_debug("Set as background current image %s", uri);
 
-        string cmd = "gconftool-2 --type string --set /desktop/gnome/background/picture_filename "+ Gloobus::instance()->get_filename();
-        g_spawn_command_line_async(cmd.c_str(), NULL);
+        GSettingsSchemaSource *schema_source = g_settings_schema_source_get_default ();
+        GSettingsSchema *background_schema = g_settings_schema_source_lookup (schema_source, "org.gnome.desktop.background", FALSE);
+        if (background_schema) {
+                GSettings *background_settings = g_settings_new ("org.gnome.desktop.background");
+                g_settings_set_string (background_settings, "picture-uri", uri);
+                g_object_unref (background_settings);
+                g_settings_schema_unref (background_schema);
+	}
 }

=== modified file 'src/plugin-text/plugin-text.cpp'
--- src/plugin-text/plugin-text.cpp	2010-03-27 15:55:08 +0000
+++ src/plugin-text/plugin-text.cpp	2014-12-23 10:46:51 +0000
@@ -29,8 +29,16 @@
 		return 0;
 	}
 
-	GloobusConfig * config = Gloobus::instance()->get_config();
-	char* theme = config->get_gconf_value_string("/apps/gedit-2/preferences/editor/colors/scheme");
+	char* theme;
+	GSettingsSchemaSource *schema_source = g_settings_schema_source_get_default ();
+	GSettingsSchema *gedit_schema = g_settings_schema_source_lookup (schema_source, "org.gnome.gedit.preferences.editor", FALSE);
+	if (gedit_schema) {
+		GSettings *gedit_settings = g_settings_new ("org.gnome.gedit.preferences.editor");
+		theme = g_settings_get_string (gedit_settings, "scheme");
+		g_object_unref (gedit_settings);
+		g_settings_schema_unref (gedit_schema);
+	}
+
 	if(theme) {
 		GtkSourceStyleSchemeManager * sc_manager;
 		sc_manager = gtk_source_style_scheme_manager_get_default();