[gnome-commander/gcmd-1-3] Initialize gdk_key_names[] and gdk_modifiers_names[] BEFORE reading XML cfg
- From: Piotr Eljasiak <epiotr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-commander/gcmd-1-3] Initialize gdk_key_names[] and gdk_modifiers_names[] BEFORE reading XML cfg
- Date: Sat, 5 Sep 2009 15:20:36 +0000 (UTC)
commit e33389f904b4ac8480cd38cf6f1068731382b4dc
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Sat Sep 5 17:12:53 2009 +0200
Initialize gdk_key_names[] and gdk_modifiers_names[] BEFORE reading XML cfg
src/gnome-cmd-data.cc | 58 ++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index c1d507d..86a94b8 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -1364,35 +1364,6 @@ void GnomeCmdData::load()
quick_connect = gnome_cmd_con_ftp_new (NULL, quick_connect_uri);
g_free (quick_connect_uri);
- load_cmdline_history();
- //load_dir_history ();
-
- if (!gnome_cmd_xml_config_load (xml_cfg_path, *this))
- {
- load_rename_history();
-
- // add a few default templates here - for new users
-#if GLIB_CHECK_VERSION (2, 14, 0)
- {
- AdvrenameConfig::Profile p;
-
- p.name = _("CamelCase");
- p.template_string = "$N";
- p.regexes.push_back(GnomeCmd::ReplacePattern("\\s*\\b(\\w)(\\w*)\\b", "\\u\\1\\L\\2\\E", FALSE));
- p.regexes.push_back(GnomeCmd::ReplacePattern("\\.(.+)$", ".\\L\\1", FALSE));
-
- advrename_defaults.profiles.push_back(p);
- }
-#endif
-
- load_search_defaults();
- }
-
- load_intviewer_defaults();
- load_auto_load_plugins();
-
- set_vfs_volume_monitor ();
-
static struct
{
guint code;
@@ -1593,6 +1564,35 @@ void GnomeCmdData::load()
load_data (gdk_modifiers_names, gdk_mod_names_data, G_N_ELEMENTS(gdk_mod_names_data));
+ load_cmdline_history();
+ //load_dir_history ();
+
+ if (!gnome_cmd_xml_config_load (xml_cfg_path, *this))
+ {
+ load_rename_history();
+
+ // add a few default templates here - for new users
+#if GLIB_CHECK_VERSION (2, 14, 0)
+ {
+ AdvrenameConfig::Profile p;
+
+ p.name = _("CamelCase");
+ p.template_string = "$N";
+ p.regexes.push_back(GnomeCmd::ReplacePattern("\\s*\\b(\\w)(\\w*)\\b", "\\u\\1\\L\\2\\E", FALSE));
+ p.regexes.push_back(GnomeCmd::ReplacePattern("\\.(.+)$", ".\\L\\1", FALSE));
+
+ advrename_defaults.profiles.push_back(p);
+ }
+#endif
+
+ load_search_defaults();
+ }
+
+ load_intviewer_defaults();
+ load_auto_load_plugins();
+
+ set_vfs_volume_monitor ();
+
g_free (xml_cfg_path);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]