rpms/referencer/devel referencer-gconf-changes.patch, NONE, 1.1 referencer.spec, 1.20, 1.21

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/referencer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16664

Modified Files:
	referencer.spec 
Added Files:
	referencer-gconf-changes.patch 
Log Message:
* Sun Jun 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.5-7
- Fix gconf key lookup if GConf disabledplugin key is not set (Denis Leroy, Fedora bug #508011)


referencer-gconf-changes.patch:

--- NEW FILE referencer-gconf-changes.patch ---
--- src/Preferences.C	2008-09-08 17:19:37.000000000 -0400
+++ src/Preferences.C.new	2009-06-28 20:17:00.672774503 -0400
@@ -127,7 +127,7 @@
 	 */
 	disabledPlugins_ = confclient_->get_entry (CONF_PATH "/disabledplugins");
 	Gnome::Conf::SListHandle_ValueString disable =
-		confclient_->get_string_list (disabledPlugins_.get_key ());
+		confclient_->get_string_list (CONF_PATH "/disabledplugins");
 
 	configureButton_ = (Gtk::Button*) xml_->get_widget ("PluginConfigure");
 	configureButton_->signal_clicked().connect (
@@ -536,7 +536,7 @@
 	}
 
 	std::vector<Glib::ustring> disable =
-		confclient_->get_string_list (disabledPlugins_.get_key ());
+		confclient_->get_string_list (CONF_PATH "/disabledplugins");
 	std::vector<Glib::ustring>::iterator dit = disable.begin();
 	std::vector<Glib::ustring>::iterator const dend = disable.end();
 	if (plugin->isEnabled() == true) {
@@ -557,7 +557,7 @@
 			disable.push_back(plugin->getShortName());
 
 	}
-	confclient_->set_string_list (disabledPlugins_.get_key(), disable);
+	confclient_->set_string_list (CONF_PATH "/disabledplugins", disable);
 }
 
 
@@ -575,7 +575,7 @@
 	plugin->setEnabled (false);
 
 	std::vector<Glib::ustring> disable =
-		confclient_->get_string_list (disabledPlugins_.get_key ());
+		confclient_->get_string_list (CONF_PATH "/disabledplugins");
 	std::vector<Glib::ustring>::iterator dit = disable.begin();
 	std::vector<Glib::ustring>::iterator const dend = disable.end();
 
@@ -587,7 +587,7 @@
 	if (!found)
 		disable.push_back(plugin->getShortName());
 
-	confclient_->set_string_list (disabledPlugins_.get_key(), disable);
+	confclient_->set_string_list (CONF_PATH "/disabledplugins", disable);
 }
 
 


Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- referencer.spec	25 Feb 2009 19:33:59 -0000	1.20
+++ referencer.spec	29 Jun 2009 01:43:08 -0000	1.21
@@ -3,13 +3,14 @@
 Name:		referencer
 Summary:	A document organiser and bibliography manager for Gnome
 Version:	1.1.5
-Release:	6%{?dist}
+Release:	7%{?dist}
 Group:		Applications/System
 License:	GPLv2
 URL:		http://icculus.org/referencer
 Source0:	http://icculus.org/referencer/downloads/%{name}-%{version}.tar.gz
 Patch0:		referencer-pythondir.patch
 Patch1:		referencer-gcc44.patch
+Patch2:		referencer-gconf-changes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	poppler-glib-devel libgnomeuimm26-devel
 BuildRequires:	boost-devel gcc-c++ python-devel
@@ -26,6 +27,7 @@ import from BibTeX, Reference Manager an
 %setup -q
 %patch0 -p0 -b .pyt
 %patch1 -p0 -b .gcc44
+%patch2 -p0 -b .gconf
 
 %build
 %configure --disable-update-mime-database
@@ -79,6 +81,9 @@ update-mime-database %{_datadir}/mime &>
 %{python_sitelib}/referencer/
 
 %changelog
+* Sun Jun 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.5-7
+- Fix gconf key lookup if GConf disabledplugin key is not set (Denis Leroy, Fedora bug #508011)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild