gedit r6708 - branches/win32/gedit
- From: pborelli svn gnome org
- To: svn-commits-list gnome org
- Subject: gedit r6708 - branches/win32/gedit
- Date: Wed, 24 Dec 2008 10:22:16 +0000 (UTC)
Author: pborelli
Date: Wed Dec 24 10:22:15 2008
New Revision: 6708
URL: http://svn.gnome.org/viewvc/gedit?rev=6708&view=rev
Log:
cleanup dirname functions some more
Modified:
branches/win32/gedit/gedit-app.c
branches/win32/gedit/gedit-dirs.c
branches/win32/gedit/gedit-dirs.h
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
Modified: branches/win32/gedit/gedit-app.c
==============================================================================
--- branches/win32/gedit/gedit-app.c (original)
+++ branches/win32/gedit/gedit-app.c Wed Dec 24 10:22:15 2008
@@ -132,7 +132,7 @@
{
gchar *filename;
- filename = gedit_dirs_get_accels_file ();
+ filename = gedit_dirs_get_user_accels_file ();
if (filename != NULL)
{
gedit_debug_message (DEBUG_APP, "Loading keybindings from %s\n", filename);
@@ -146,7 +146,7 @@
{
gchar *filename;
- filename = gedit_dirs_get_accels_file ();
+ filename = gedit_dirs_get_user_accels_file ();
if (filename != NULL)
{
gedit_debug_message (DEBUG_APP, "Saving keybindings in %s\n", filename);
@@ -160,13 +160,12 @@
{
gchar *config_dir;
gchar *setup = NULL;
-
- config_dir = gedit_dirs_get_config_dir ();
+
+ config_dir = gedit_dirs_get_user_config_dir ();
if (config_dir != NULL)
{
setup = g_build_filename (config_dir,
- "gedit",
GEDIT_PAGE_SETUP_FILE,
NULL);
g_free (config_dir);
@@ -234,13 +233,12 @@
{
gchar *config_dir;
gchar *settings = NULL;
-
- config_dir = gedit_dirs_get_config_dir ();
-
+
+ config_dir = gedit_dirs_get_user_config_dir ();
+
if (config_dir != NULL)
{
settings = g_build_filename (config_dir,
- "gedit",
GEDIT_PRINT_SETTINGS_FILE,
NULL);
g_free (config_dir);
Modified: branches/win32/gedit/gedit-dirs.c
==============================================================================
--- branches/win32/gedit/gedit-dirs.c (original)
+++ branches/win32/gedit/gedit-dirs.c Wed Dec 24 10:22:15 2008
@@ -23,7 +23,7 @@
#include "gedit-dirs.h"
gchar *
-gedit_dirs_get_config_dir ()
+gedit_dirs_get_user_config_dir ()
{
gchar *config_dir = NULL;
@@ -31,22 +31,25 @@
const gchar *home;
home = g_get_home_dir ();
-
+
if (home != NULL)
{
config_dir = g_build_filename (home,
".gnome2",
+ "gedit",
NULL);
}
#else
- config_dir = g_strdup (g_get_user_config_dir ());
+ config_dir = g_build_filename (g_get_user_config_dir (),
+ "gedit",
+ NULL);
#endif
return config_dir;
}
gchar *
-gedit_dirs_get_cache_dir ()
+gedit_dirs_get_user_cache_dir ()
{
const gchar *cache_dir;
@@ -58,7 +61,7 @@
}
gchar *
-gedit_dirs_get_accels_file ()
+gedit_dirs_get_user_accels_file ()
{
gchar *accels = NULL;
@@ -171,7 +174,7 @@
}
gchar *
-gedit_dirs_get_gedit_plugin_dir (void)
+gedit_dirs_get_gedit_plugins_dir (void)
{
gchar *lib_dir;
gchar *plugin_dir;
@@ -187,7 +190,7 @@
}
gchar *
-gedit_dirs_get_gedit_loader_dir (void)
+gedit_dirs_get_gedit_plugin_loaders_dir (void)
{
gchar *lib_dir;
gchar *loader_dir;
Modified: branches/win32/gedit/gedit-dirs.h
==============================================================================
--- branches/win32/gedit/gedit-dirs.h (original)
+++ branches/win32/gedit/gedit-dirs.h Wed Dec 24 10:22:15 2008
@@ -28,11 +28,11 @@
G_BEGIN_DECLS
-gchar *gedit_dirs_get_config_dir (void);
+gchar *gedit_dirs_get_user_config_dir (void);
-gchar *gedit_dirs_get_cache_dir (void);
+gchar *gedit_dirs_get_user_cache_dir (void);
-gchar *gedit_dirs_get_accels_file (void);
+gchar *gedit_dirs_get_user_accels_file (void);
gchar *gedit_dirs_get_gedit_data_dir (void);
@@ -40,9 +40,10 @@
gchar *gedit_dirs_get_gedit_lib_dir (void);
-gchar *gedit_dirs_get_gedit_plugin_dir (void);
+gchar *gedit_dirs_get_gedit_plugins_dir (void);
-gchar *gedit_dirs_get_gedit_loader_dir (void);
+gchar *gedit_dirs_get_gedit_plugin_loaders_dir
+ (void);
gchar *gedit_dirs_get_ui_file (const gchar *file);
Modified: branches/win32/gedit/gedit-metadata-manager.c
==============================================================================
--- branches/win32/gedit/gedit-metadata-manager.c (original)
+++ branches/win32/gedit/gedit-metadata-manager.c Wed Dec 24 10:22:15 2008
@@ -224,7 +224,7 @@
gchar *cache_dir;
gchar *metadata;
- cache_dir = gedit_dirs_get_cache_dir ();
+ cache_dir = gedit_dirs_get_user_cache_dir ();
metadata = g_build_filename (cache_dir,
METADATA_FILE,
@@ -543,8 +543,8 @@
int res;
/* make sure the cache dir exists */
- cache_dir = gedit_dirs_get_cache_dir ();
- res = g_mkdir_with_parents (cache_dir, 0777);
+ cache_dir = gedit_dirs_get_user_cache_dir ();
+ res = g_mkdir_with_parents (cache_dir, 0755);
if (res != -1)
{
xmlSaveFormatFile (file_name, doc, 1);
Modified: branches/win32/gedit/gedit-plugins-engine.c
==============================================================================
--- branches/win32/gedit/gedit-plugins-engine.c (original)
+++ branches/win32/gedit/gedit-plugins-engine.c Wed Dec 24 10:22:15 2008
@@ -183,7 +183,7 @@
int i;
/* load user's plugins */
- config_dir = gedit_dirs_get_config_dir ();
+ config_dir = gedit_dirs_get_user_config_dir ();
if (config_dir != NULL)
{
@@ -191,7 +191,6 @@
gboolean ret = TRUE;
pdir = g_build_filename (config_dir,
- "gedit",
dir,
NULL);
g_free (config_dir);
@@ -228,7 +227,7 @@
{
gchar *plugin_dir;
- plugin_dir = gedit_dirs_get_gedit_plugin_dir ();
+ plugin_dir = gedit_dirs_get_gedit_plugins_dir ();
load_all_real (engine,
"plugins",
@@ -488,9 +487,9 @@
if (loader_info == NULL)
{
gchar *loader_dir;
-
- loader_dir = gedit_dirs_get_gedit_loader_dir ();
-
+
+ loader_dir = gedit_dirs_get_gedit_plugin_loaders_dir ();
+
/* loader could not be found in the hash, try to find it by
scanning */
load_all_real (engine,
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 Wed Dec 24 10:22:15 2008
@@ -163,6 +163,26 @@
static gint bottom_panel_active_page = 0;
static gint active_file_filter = -1;
+
+static gchar *
+get_state_filename (void)
+{
+ gchar *config_dir;
+ gchar *filename = NULL;
+
+ config_dir = gedit_dirs_get_user_config_dir ();
+
+ if (config_dir != NULL)
+ {
+ filename = g_build_filename (config_dir,
+ GEDIT_STATE_FILE_LOCATION,
+ NULL);
+ g_free (config_dir);
+ }
+
+ return filename;
+}
+
static GKeyFile *
get_gedit_state_file ()
{
@@ -170,27 +190,15 @@
if (state_file == NULL)
{
- gchar *config_dir;
- gchar *path;
+ gchar *filename;
GError *err = NULL;
state_file = g_key_file_new ();
-
- config_dir = gedit_dirs_get_config_dir ();
-
- if (config_dir == NULL)
- {
- g_warning ("Could not get CONFIG directory\n");
- goto out;
- }
-
- path = g_build_filename (config_dir,
- GEDIT_STATE_FILE_LOCATION,
- NULL);
- g_free (config_dir);
+
+ filename = get_state_filename ();
if (!g_key_file_load_from_file (state_file,
- path,
+ filename,
G_KEY_FILE_NONE,
&err))
{
@@ -204,11 +212,9 @@
g_error_free (err);
}
- g_free (path);
+ g_free (filename);
}
- out:
- g_return_val_if_fail (state_file != NULL, NULL);
return state_file;
}
@@ -270,27 +276,29 @@
{
GKeyFile *state_file;
gchar *config_dir;
- gchar *path;
- gchar *content;
+ gchar *filename = NULL;
+ gchar *content = NULL;
gsize length;
+ gint res;
GError *err = NULL;
gboolean ret = FALSE;
state_file = get_gedit_state_file ();
g_return_val_if_fail (state_file != NULL, FALSE);
- config_dir = gedit_dirs_get_config_dir ();
-
+ config_dir = gedit_dirs_get_user_config_dir ();
if (config_dir == NULL)
{
- g_warning ("Could not get CONFIG directory\n");
+ g_warning ("Could not get config directory\n");
return ret;
}
-
- path = g_build_filename (config_dir,
- GEDIT_STATE_FILE_LOCATION,
- NULL);
- g_free (config_dir);
+
+ res = g_mkdir_with_parents (config_dir, 0755);
+ if (res < 0)
+ {
+ g_warning ("Could not create config directory\n");
+ goto out;
+ }
content = g_key_file_to_data (state_file,
&length,
@@ -303,15 +311,18 @@
goto out;
}
- if ((content != NULL) &&
- (!g_file_set_contents (path,
- content,
- length,
- &err)))
+ if (content != NULL)
{
- g_warning ("Could not write gedit state file: %s\n",
- err->message);
- goto out;
+ filename = get_state_filename ();
+ if (!g_file_set_contents (filename,
+ content,
+ length,
+ &err))
+ {
+ g_warning ("Could not write gedit state file: %s\n",
+ err->message);
+ goto out;
+ }
}
ret = TRUE;
@@ -320,10 +331,11 @@
if (err != NULL)
g_error_free (err);
+ g_free (config_dir);
+ g_free (filename);
g_free (content);
- g_free (path);
- return TRUE;
+ return ret;
}
/* Window state */
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 Wed Dec 24 10:22:15 2008
@@ -45,13 +45,12 @@
{
gchar *config_dir;
gchar *dir = NULL;
-
- config_dir = gedit_dirs_get_config_dir ();
-
+
+ config_dir = gedit_dirs_get_user_config_dir ();
+
if (config_dir != NULL)
{
dir = g_build_filename (config_dir,
- "gedit",
"styles",
NULL);
g_free (config_dir);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]