gedit r6681 - in branches/win32: . gedit
- From: icq svn gnome org
- To: svn-commits-list gnome org
- Subject: gedit r6681 - in branches/win32: . gedit
- Date: Mon, 22 Dec 2008 11:54:53 +0000 (UTC)
Author: icq
Date: Mon Dec 22 11:54:53 2008
New Revision: 6681
URL: http://svn.gnome.org/viewvc/gedit?rev=6681&view=rev
Log:
2008-12-22 Ignacio Casal Quinteiro <nacho resa gmail com>
* gedit/gedit-metadata-manager.c:
* gedit/gedit-utils.c:
* gedit/gedit-utils.h:
* gedit/gedit-app.c:
* gedit/gedit-prefs-manager-app.c:
* gedit/gedit-style-scheme-manager.c:
* gedit/gedit-plugins-engine.c:
Use gedit_utils_get_config_dir instead of hardcoding to .gnome2.
Modified:
branches/win32/ChangeLog
branches/win32/gedit/gedit-app.c
branches/win32/gedit/gedit-metadata-manager.c
branches/win32/gedit/gedit-plugins-engine.c
branches/win32/gedit/gedit-prefs-manager-app.c
branches/win32/gedit/gedit-style-scheme-manager.c
branches/win32/gedit/gedit-utils.c
branches/win32/gedit/gedit-utils.h
Modified: branches/win32/gedit/gedit-app.c
==============================================================================
--- branches/win32/gedit/gedit-app.c (original)
+++ branches/win32/gedit/gedit-app.c Mon Dec 22 11:54:53 2008
@@ -129,20 +129,21 @@
static gchar *
get_accel_file (void)
{
- const gchar *home;
-
- home = g_get_home_dir();
-
- if (home != NULL)
+ gchar *config_dir;
+ gchar *accel_file = NULL;
+
+ config_dir = gedit_utils_get_config_dir ();
+
+ if (config_dir != NULL)
{
- return g_build_filename (home,
- ".gnome2",
- "accels"
- "gedit",
- NULL);
+ accel_file = g_build_filename (config_dir,
+ "accels",
+ "gedit",
+ NULL);
+ g_free (config_dir);
}
- return NULL;
+ return accel_file;
}
static void
@@ -176,19 +177,21 @@
static gchar *
get_page_setup_file (void)
{
- const gchar *home;
-
- home = g_get_home_dir ();
- if (home != NULL)
+ gchar *config_dir;
+ gchar *setup = NULL;
+
+ config_dir = gedit_utils_get_config_dir ();
+
+ if (config_dir != NULL)
{
- return g_build_filename (home,
- ".gnome2",
- "gedit",
- GEDIT_PAGE_SETUP_FILE,
- NULL);
+ setup = g_build_filename (config_dir,
+ "gedit",
+ GEDIT_PAGE_SETUP_FILE,
+ NULL);
+ g_free (config_dir);
}
- return NULL;
+ return setup;
}
static void
@@ -248,19 +251,21 @@
static gchar *
get_print_settings_file (void)
{
- const gchar *home;
-
- home = g_get_home_dir ();
- if (home != NULL)
+ gchar *config_dir;
+ gchar *settings = NULL;
+
+ config_dir = gedit_utils_get_config_dir ();
+
+ if (config_dir != NULL)
{
- return g_build_filename (home,
- ".gnome2",
- "gedit",
- GEDIT_PRINT_SETTINGS_FILE,
- NULL);
+ settings = g_build_filename (config_dir,
+ "gedit",
+ GEDIT_PRINT_SETTINGS_FILE,
+ NULL);
+ g_free (config_dir);
}
- return NULL;
+ return settings;
}
static void
@@ -441,7 +446,7 @@
g_get_current_time (&result);
- return g_strdup_printf ("gedit-window-%ld-%ld-%d %s",
+ return g_strdup_printf ("gedit-window-%ld-%ld-%d-%s",
result.tv_sec,
result.tv_usec,
serial++,
Modified: branches/win32/gedit/gedit-metadata-manager.c
==============================================================================
--- branches/win32/gedit/gedit-metadata-manager.c (original)
+++ branches/win32/gedit/gedit-metadata-manager.c Mon Dec 22 11:54:53 2008
@@ -36,6 +36,7 @@
#include <libxml/xmlreader.h>
#include "gedit-metadata-manager.h"
#include "gedit-debug.h"
+#include "gedit-utils.h"
/*
#define GEDIT_METADATA_VERBOSE_DEBUG 1
@@ -220,16 +221,21 @@
static gchar *
get_metadata_filename (void)
{
- const gchar *home;
-
- home = g_get_home_dir ();
- if (home == NULL)
+ gchar *config_dir;
+ gchar *metadata = NULL;
+
+ config_dir = gedit_utils_get_config_dir ();
+
+ if (config_dir != NULL)
{
- g_warning ("Could not get home directory\n");
- return NULL;
+ metadata = g_build_filename (config_dir,
+ "gedit",
+ METADATA_FILE,
+ NULL);
+ g_free (config_dir);
}
- return g_build_filename (home, ".gnome2", METADATA_FILE, NULL);
+ return metadata;
}
static gboolean
Modified: branches/win32/gedit/gedit-plugins-engine.c
==============================================================================
--- branches/win32/gedit/gedit-plugins-engine.c (original)
+++ branches/win32/gedit/gedit-plugins-engine.c Mon Dec 22 11:54:53 2008
@@ -45,8 +45,6 @@
#include "gedit-plugin-loader.h"
#include "gedit-object-module.h"
-#define USER_GEDIT_LOCATION ".gnome2/gedit/"
-
#define GEDIT_PLUGINS_ENGINE_BASE_KEY "/apps/gedit-2/plugins"
#define GEDIT_PLUGINS_ENGINE_KEY GEDIT_PLUGINS_ENGINE_BASE_KEY "/active-plugins"
@@ -178,27 +176,24 @@
LoadDirCallback callback,
gpointer userdata)
{
- const gchar *home;
+ gchar *config_dir;
const gchar *pdirs_env = NULL;
gchar **pdirs;
int i;
/* load user's plugins */
- home = g_get_home_dir ();
-
- if (home == NULL)
- {
- g_warning ("Could not get HOME directory\n");
- }
- else
+ config_dir = gedit_utils_get_config_dir ();
+
+ if (config_dir != NULL)
{
gchar *pdir;
gboolean ret = TRUE;
- pdir = g_build_filename (home,
- USER_GEDIT_LOCATION,
+ pdir = g_build_filename (config_dir,
+ "gedit",
dir,
NULL);
+ g_free (config_dir);
if (g_file_test (pdir, G_FILE_TEST_IS_DIR))
ret = load_dir_real (engine, pdir, suffix, callback, userdata);
Modified: branches/win32/gedit/gedit-prefs-manager-app.c
==============================================================================
--- branches/win32/gedit/gedit-prefs-manager-app.c (original)
+++ branches/win32/gedit/gedit-prefs-manager-app.c Mon Dec 22 11:54:53 2008
@@ -44,6 +44,7 @@
#include "gedit-window.h"
#include "gedit-window-private.h"
#include "gedit-style-scheme-manager.h"
+#include "gedit-utils.h"
static void gedit_prefs_manager_editor_font_changed (GConfClient *client,
guint cnxn_id,
@@ -139,7 +140,7 @@
#define GEDIT_STATE_DEFAULT_SIDE_PANEL_SIZE 200
#define GEDIT_STATE_DEFAULT_BOTTOM_PANEL_SIZE 140
-#define GEDIT_STATE_FILE_LOCATION ".gnome2/gedit-2"
+#define GEDIT_STATE_FILE_LOCATION "gedit-2"
#define GEDIT_STATE_WINDOW_GROUP "window"
#define GEDIT_STATE_WINDOW_STATE "state"
@@ -169,22 +170,24 @@
if (state_file == NULL)
{
- const gchar *home;
+ gchar *config_dir;
gchar *path;
GError *err = NULL;
state_file = g_key_file_new ();
-
- home = g_get_home_dir ();
- if (home == NULL)
+
+ config_dir = gedit_utils_get_config_dir ();
+
+ if (config_dir == NULL)
{
- g_warning ("Could not get HOME directory\n");
+ g_warning ("Could not get CONFIG directory\n");
goto out;
}
-
- path = g_build_filename (home,
+
+ path = g_build_filename (config_dir,
GEDIT_STATE_FILE_LOCATION,
NULL);
+ g_free (config_dir);
if (!g_key_file_load_from_file (state_file,
path,
@@ -266,7 +269,7 @@
gedit_state_file_sync ()
{
GKeyFile *state_file;
- const gchar *home;
+ gchar *config_dir;
gchar *path;
gchar *content;
gsize length;
@@ -276,16 +279,18 @@
state_file = get_gedit_state_file ();
g_return_val_if_fail (state_file != NULL, FALSE);
- home = g_get_home_dir ();
- if (home == NULL)
+ config_dir = gedit_utils_get_config_dir ();
+
+ if (config_dir == NULL)
{
- g_warning ("Could not get HOME directory\n");
+ g_warning ("Could not get CONFIG directory\n");
return ret;
}
-
- path = g_build_filename (home,
+
+ path = g_build_filename (config_dir,
GEDIT_STATE_FILE_LOCATION,
NULL);
+ g_free (config_dir);
content = g_key_file_to_data (state_file,
&length,
Modified: branches/win32/gedit/gedit-style-scheme-manager.c
==============================================================================
--- branches/win32/gedit/gedit-style-scheme-manager.c (original)
+++ branches/win32/gedit/gedit-style-scheme-manager.c Mon Dec 22 11:54:53 2008
@@ -36,27 +36,28 @@
#include "gedit-style-scheme-manager.h"
#include "gedit-prefs-manager.h"
+#include "gedit-utils.h"
static GtkSourceStyleSchemeManager *style_scheme_manager = NULL;
-#define GEDIT_STYLES_DIR ".gnome2/gedit/styles"
-
static gchar *
get_gedit_styles_path (void)
{
- const gchar *home;
-
- home = g_get_home_dir ();
- if (home != NULL)
+ gchar *config_dir;
+ gchar *dir = NULL;
+
+ config_dir = gedit_utils_get_config_dir ();
+
+ if (config_dir != NULL)
{
- gchar *dir;
-
- dir = g_build_filename (home, GEDIT_STYLES_DIR, NULL);
-
- return dir;
+ dir = g_build_filename (config_dir,
+ "gedit",
+ "styles",
+ NULL);
+ g_free (config_dir);
}
- return NULL;
+ return dir;
}
static void
@@ -143,13 +144,7 @@
if (filename == NULL)
return FALSE;
- home = g_get_home_dir ();
- if (home == NULL)
- return FALSE;
-
- dir = g_strdup_printf ("%s/%s",
- home,
- GEDIT_STYLES_DIR);
+ dir = get_gedit_styles_path ();
res = g_str_has_prefix (filename, dir);
Modified: branches/win32/gedit/gedit-utils.c
==============================================================================
--- branches/win32/gedit/gedit-utils.c (original)
+++ branches/win32/gedit/gedit-utils.c Mon Dec 22 11:54:53 2008
@@ -1428,3 +1428,23 @@
return TRUE;
}
+
+gchar *
+gedit_utils_get_config_dir ()
+{
+#ifndef G_OS_WIN32
+ const gchar *home;
+
+ home = g_get_home_dir ();
+
+ if (home != NULL)
+ {
+ return g_build_filename (home,
+ ".gnome2",
+ NULL);
+ }
+#else
+ return g_strdup (g_get_user_config_dir ());
+#endif
+ return NULL;
+}
Modified: branches/win32/gedit/gedit-utils.h
==============================================================================
--- branches/win32/gedit/gedit-utils.h (original)
+++ branches/win32/gedit/gedit-utils.h Mon Dec 22 11:54:53 2008
@@ -152,6 +152,8 @@
/* Turns data from a drop into a list of well formatted uris */
gchar **gedit_utils_drop_get_uris (GtkSelectionData *selection_data);
+gchar *gedit_utils_get_config_dir (void);
+
G_END_DECLS
#endif /* __GEDIT_UTILS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]