Changeset 3281

Timestamp:

Oct 3, 2007, 9:02:30 PM (15 years ago)

Author:

charles

Message:

minor little futzing

Location:

trunk/gtk

Files:

• conf.c (modified) (6 diffs)
• conf.h (modified) (1 diff)
• util.c (modified) (1 diff)

trunk/gtk/conf.c

@@ -47 +47 @@
 #define FILE_LOCK               "lock"
 #define FILE_SOCKET             "socket"
-#define FILE_PREFS              "prefs"
-#define FILE_PREFS_TMP          "prefs.tmp"
 #define FILE_STATE              "state"
 #define FILE_STATE_TMP          "state.tmp"
 #define OLD_FILE_LOCK           "gtk_lock" /* remove this after next release */
-#define OLD_FILE_PREFS          "gtk_prefs"
 #define OLD_FILE_STATE          "gtk_state"
-#define PREF_SEP_KEYVAL         '\t'
 #define PREF_SEP_LINE           '\n'
-#define STATE_SEP               '\n'
 
 static int
@@ -213 +208 @@
  done:
   g_free (path);
-  if(NULL != err)
-    g_error_free(err);
+  g_clear_error( &err );
   if(NULL != io)  
     g_io_channel_unref(io);
@@ -224 +218 @@
 **/
 
-#define DEFAULT_GROUP "general"
+#define GROUP "general"
 
 static char*
@@ -252 +246 @@
 pref_int_get( const char * key )
 {
-    return g_key_file_get_integer( getPrefsKeyFile( ), DEFAULT_GROUP, key, NULL );
+    return g_key_file_get_integer( getPrefsKeyFile( ), GROUP, key, NULL );
 }
 void
 pref_int_set( const char * key, int value )
 {
-    g_key_file_set_integer( getPrefsKeyFile( ), DEFAULT_GROUP, key, value );
+    g_key_file_set_integer( getPrefsKeyFile( ), GROUP, key, value );
 }
 void
 pref_int_set_default( const char * key, int value )
 {
-    if( !g_key_file_has_key( getPrefsKeyFile( ), DEFAULT_GROUP, key, NULL ) )
+    if( !g_key_file_has_key( getPrefsKeyFile( ), GROUP, key, NULL ) )
         pref_int_set( key, value );
 }
@@ -269 +263 @@
 pref_flag_get ( const char * key )
 {
-    return g_key_file_get_boolean( getPrefsKeyFile( ), DEFAULT_GROUP, key, NULL );
+    return g_key_file_get_boolean( getPrefsKeyFile( ), GROUP, key, NULL );
 }
 void
 pref_flag_set( const char * key, gboolean value )
 {
-    g_key_file_set_boolean( getPrefsKeyFile( ), DEFAULT_GROUP, key, value );
+    g_key_file_set_boolean( getPrefsKeyFile( ), GROUP, key, value );
 }
 void
 pref_flag_set_default( const char * key, gboolean value )
 {
-    if( !g_key_file_has_key( getPrefsKeyFile( ), DEFAULT_GROUP, key, NULL ) )
+    if( !g_key_file_has_key( getPrefsKeyFile( ), GROUP, key, NULL ) )
         pref_flag_set( key, value );
 }
@@ -286 +280 @@
 pref_string_get( const char * key )
 {
-    return g_key_file_get_string( getPrefsKeyFile( ), DEFAULT_GROUP, key, NULL );
+    return g_key_file_get_string( getPrefsKeyFile( ), GROUP, key, NULL );
 }
 void
 pref_string_set( const char * key, const char * value )
 {
-    g_key_file_set_string( getPrefsKeyFile( ), DEFAULT_GROUP, key, value );
+    g_key_file_set_string( getPrefsKeyFile( ), GROUP, key, value );
 }
 void
 pref_string_set_default( const char * key, const char * value )
 {
-    if( !g_key_file_has_key( getPrefsKeyFile( ), DEFAULT_GROUP, key, NULL ) )
+    if( !g_key_file_has_key( getPrefsKeyFile( ), GROUP, key, NULL ) )
         pref_string_set( key, value );
 }

trunk/gtk/conf.h

@@ -32 +32 @@
 int       pref_int_get            ( const char * key );
 void      pref_int_set            ( const char * key, int value );
-void      pref_int_set_default    ( const char * key, int default_value );
+void      pref_int_set_default    ( const char * key, int value );
 
-gboolean  pref_flag_get            ( const char * key );
-void      pref_flag_set            ( const char * key, gboolean value );
-void      pref_flag_set_default    ( const char * key, gboolean default_value );
+gboolean  pref_flag_get           ( const char * key );
+void      pref_flag_set           ( const char * key, gboolean value );
+void      pref_flag_set_default   ( const char * key, gboolean value );
 
-char*     pref_string_get          ( const char * key );
-void      pref_string_set          ( const char * key, const char * value );
-void      pref_string_set_default  ( const char * key, const char * default_value );
+char*     pref_string_get         ( const char * key );
+void      pref_string_set         ( const char * key, const char * value );
+void      pref_string_set_default ( const char * key, const char * value );
 
-void      pref_save                ( char **errstr );
+void      pref_save               ( char **errstr );
 
 /**

trunk/gtk/util.c

@@ -136 +136 @@
 
 gboolean
-mkdir_p(const char *name, mode_t mode) {
-  struct stat sb;
-  char *parent;
-  gboolean ret;
-  int oerrno;
-
-  if(0 != stat(name, &sb)) {
-    if(ENOENT != errno)
+mkdir_p(const char *name, mode_t mode)
+{
+#if GLIB_CHECK_VERSION(2,8,0)
+    return !g_mkdir_with_parents( name, mode );
+#else
+    struct stat sb;
+    char *parent;
+    gboolean ret;
+    int oerrno;
+
+    if(0 != stat(name, &sb)) {
+      if(ENOENT != errno)
+        return FALSE;
+      parent = g_path_get_dirname(name);
+      ret = mkdir_p(parent, mode);
+      oerrno = errno;
+      g_free(parent);
+      errno = oerrno;
+      return (ret ? (0 == mkdir(name, mode)) : FALSE);
+    }
+
+    if(!S_ISDIR(sb.st_mode)) {
+      errno = ENOTDIR;
       return FALSE;
-    parent = g_path_get_dirname(name);
-    ret = mkdir_p(parent, mode);
-    oerrno = errno;
-    g_free(parent);
-    errno = oerrno;
-    return (ret ? (0 == mkdir(name, mode)) : FALSE);
-  }
-
-  if(!S_ISDIR(sb.st_mode)) {
-    errno = ENOTDIR;
-    return FALSE;
-  }
-
-  return TRUE;
+    }
+
+    return TRUE;
+#endif
 }