[Xfce4-commits] [apps/xfdashboard] 01/01: Fixed settings application to set xfconf property '/switch-to-view-on-resume' instead of '/switch-view-on-resume'.

[noreply at xfce.org]

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

nomad pushed a commit to branch master
in repository apps/xfdashboard.

commit f4fce063f612f905652b86cfa969d5e2e870be2d
Author: Stephan Haller <nomad at froevel.de>
Date:   Fri Aug 21 11:18:54 2015 +0200

    Fixed settings application to set xfconf property '/switch-to-view-on-resume' instead of '/switch-view-on-resume'.
    
    '/switch-to-view-on-resume' was always the only settings existing in xfdashboard.
---
 data/data/preferences.ui |    2 +-
 settings/settings.c      |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/data/preferences.ui b/data/data/preferences.ui
index f9a6bf5..b41d010 100644
--- a/data/data/preferences.ui
+++ b/data/data/preferences.ui
@@ -137,7 +137,7 @@ Configure xfdashboard</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="switch-view-on-resume">
+                      <object class="GtkComboBox" id="switch-to-view-on-resume">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_markup" translatable="yes">When xfdashboard resumes the selected view will be activated.
diff --git a/settings/settings.c b/settings/settings.c
index 84f4e67..abf36b8 100644
--- a/settings/settings.c
+++ b/settings/settings.c
@@ -127,7 +127,7 @@ enum
 	COLUMN_THEME_LAST
 };
 
-/* Setting '/switch-view-on-resume' changed either at widget or at xfconf property */
+/* Setting '/switch-to-view-on-resume' changed either at widget or at xfconf property */
 static void _xfdashboard_settings_widget_changed_switch_view_on_resume(XfdashboardSettings *self, GtkComboBox *inComboBox)
 {
 	XfdashboardSettingsPrivate		*priv;
@@ -146,7 +146,7 @@ static void _xfdashboard_settings_widget_changed_switch_view_on_resume(Xfdashboa
 	gtk_tree_model_get(model, &iter, 1, &value, -1);
 
 	/* Set value at xfconf property */
-	xfconf_channel_set_string(priv->xfconfChannel, "/switch-view-on-resume", value);
+	xfconf_channel_set_string(priv->xfconfChannel, "/switch-to-view-on-resume", value);
 
 	/* Release allocated resources */
 	if(value) g_free(value);
@@ -1081,7 +1081,7 @@ static gboolean _xfdashboard_settings_create_builder(XfdashboardSettings *self)
 							priv->widgetResetSearchOnResume,
 							"active");
 
-	priv->widgetSwitchViewOnResume=GTK_WIDGET(gtk_builder_get_object(priv->builder, "switch-view-on-resume"));
+	priv->widgetSwitchViewOnResume=GTK_WIDGET(gtk_builder_get_object(priv->builder, "switch-to-view-on-resume"));
 	if(priv->widgetSwitchViewOnResume)
 	{
 		GtkCellRenderer						*renderer;
@@ -1092,7 +1092,7 @@ static gboolean _xfdashboard_settings_create_builder(XfdashboardSettings *self)
 		gchar								*defaultValue;
 
 		/* Get default value from settings */
-		defaultValue=xfconf_channel_get_string(priv->xfconfChannel, "/switch-view-on-resume", DEFAULT_SWITCH_VIEW_ON_RESUME);
+		defaultValue=xfconf_channel_get_string(priv->xfconfChannel, "/switch-to-view-on-resume", DEFAULT_SWITCH_VIEW_ON_RESUME);
 		if(!defaultValue) defaultValue=g_strdup("");
 
 		/* Clear combo box */
@@ -1132,7 +1132,7 @@ static gboolean _xfdashboard_settings_create_builder(XfdashboardSettings *self)
 									G_CALLBACK(_xfdashboard_settings_widget_changed_switch_view_on_resume),
 									self);
 		g_signal_connect_swapped(priv->xfconfChannel,
-									"property-changed::/switch-view-on-resume",
+									"property-changed::/switch-to-view-on-resume",
 									G_CALLBACK(_xfdashboard_settings_xfconf_changed_switch_view_on_resume),
 									self);
 

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