[Xfce4-commits] [apps/mousepad] 19/45: Make the misc- settings window- instead

[noreply at xfce.org]

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

mbrush pushed a commit to branch master
in repository apps/mousepad.

commit f8d2d51a7b4357fc8d3300052d2b0d0a0f2367aa
Author: Matthew Brush <mbrush at codebrainz.ca>
Date:   Sun Jul 6 22:13:11 2014 -0700

    Make the misc- settings window- instead
---
 mousepad/mousepad-window.c             |   14 +++++++-------
 mousepad/org.xfce.Mousepad.gschema.xml |   14 ++++++--------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 3662261..5ce17b9 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -914,7 +914,7 @@ mousepad_window_save_geometry_timer (gpointer user_data)
   GDK_THREADS_ENTER ();
 
   /* check if we should remember the window geometry */
-  remember_geometry = mousepad_settings_get_boolean ("misc-remember-geometry");
+  remember_geometry = mousepad_settings_get_boolean ("window-remember-geometry");
   if (G_LIKELY (remember_geometry))
     {
       /* check if the window is still visible */
@@ -1290,7 +1290,7 @@ mousepad_window_set_title (MousepadWindow *window)
   mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window));
 
   /* whether to show the full path */
-  show_full_path = mousepad_settings_get_boolean ("misc-path-in-title");
+  show_full_path = mousepad_settings_get_boolean ("window-path-in-title");
 
   /* name we display in the title */
   if (G_UNLIKELY (show_full_path && mousepad_document_get_filename (document)))
@@ -1483,7 +1483,7 @@ mousepad_window_notebook_added (GtkNotebook     *notebook,
   npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook));
 
   /* check tabs should always be visible */
-  always_show_tabs = mousepad_settings_get_boolean ("misc-always-show-tabs");
+  always_show_tabs = mousepad_settings_get_boolean ("window-always-show-tabs");
 
   /* change the visibility of the tabs accordingly */
   gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), always_show_tabs || (npages > 1));
@@ -1535,7 +1535,7 @@ mousepad_window_notebook_removed (GtkNotebook     *notebook,
   else
     {
       /* check tabs should always be visible */
-      always_show_tabs = mousepad_settings_get_boolean ("misc-always-show-tabs");
+      always_show_tabs = mousepad_settings_get_boolean ("window-always-show-tabs");
 
       /* change the visibility of the tabs accordingly */
       gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), always_show_tabs || (npages > 1));
@@ -2047,7 +2047,7 @@ mousepad_window_menu_tab_sizes (MousepadWindow *window)
   lock_menu_updates++;
 
   /* get the default tab sizes and active tab size */
-  tmp = mousepad_settings_get_string ("misc-default-tab-sizes");
+  tmp = mousepad_settings_get_string ("window-default-tab-sizes");
 
   /* get sizes array and free the temp string */
   tab_sizes = g_strsplit (tmp, ",", -1);
@@ -2230,7 +2230,7 @@ mousepad_window_update_actions (MousepadWindow *window)
       page_num = gtk_notebook_page_num (notebook, GTK_WIDGET (document));
 
       /* whether we cycle tabs */
-      cycle_tabs = mousepad_settings_get_boolean ("misc-cycle-tabs");
+      cycle_tabs = mousepad_settings_get_boolean ("window-cycle-tabs");
 
       /* set the sensitivity of the back and forward buttons in the go menu */
       action = gtk_action_group_get_action (window->action_group, "back");
@@ -2560,7 +2560,7 @@ mousepad_window_recent_menu_idle (gpointer user_data)
     }
 
   /* get the recent menu limit number */
-  n = mousepad_settings_get_int ("misc-recent-menu-items");
+  n = mousepad_settings_get_int ("window-recent-menu-items");
 
   /* append the items to the menu */
   for (li = filtered, i = 1; n > 0 && li != NULL; li = li->next)
diff --git a/mousepad/org.xfce.Mousepad.gschema.xml b/mousepad/org.xfce.Mousepad.gschema.xml
index d6c3b85..6083d7b 100644
--- a/mousepad/org.xfce.Mousepad.gschema.xml
+++ b/mousepad/org.xfce.Mousepad.gschema.xml
@@ -224,9 +224,7 @@
       </description>
     </key>
 
-    <!-- Other preferences -->
-
-    <key name="misc-always-show-tabs" type="b">
+    <key name="window-always-show-tabs" type="b">
       <default>false</default>
       <summary>Always show tabs</summary>
       <description>
@@ -235,7 +233,7 @@
       </description>
     </key>
 
-    <key name="misc-cycle-tabs" type="b">
+    <key name="window-cycle-tabs" type="b">
       <default>false</default>
       <summary>Cycle tabs</summary>
       <description>
@@ -244,7 +242,7 @@
       </description>
     </key>
 
-    <key name="misc-default-tab-sizes" type="s">
+    <key name="window-default-tab-sizes" type="s">
       <default>'2,3,4,8'</default>
       <summary>Default tab sizes</summary>
       <description>
@@ -253,7 +251,7 @@
       </description>
     </key>
 
-    <key name="misc-path-in-title" type="b">
+    <key name="window-path-in-title" type="b">
       <default>false</default>
       <summary>Show path in window title</summary>
       <description>
@@ -262,7 +260,7 @@
       </description>
     </key>
 
-    <key name="misc-recent-menu-items" type="i">
+    <key name="window-recent-menu-items" type="i">
       <range min="1" max="100"/>
       <default>10</default>
       <summary>Number of recent documents</summary>
@@ -271,7 +269,7 @@
       </description>
     </key>
 
-    <key name="misc-remember-geometry" type="b">
+    <key name="window-remember-geometry" type="b">
       <default>true</default>
       <summary>Remember window geometry</summary>
       <description>

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