gucharmap r1672 - trunk/gucharmap

[chpe svn gnome org]

Author: chpe
Date: Fri Mar 21 10:53:59 2008
New Revision: 1672
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1672&view=rev

Log:
Namespace ChaptersMode.


Modified:
   trunk/gucharmap/gucharmap-chapters-model.h
   trunk/gucharmap/gucharmap-settings.c
   trunk/gucharmap/gucharmap-settings.h
   trunk/gucharmap/gucharmap-window.c

Modified: trunk/gucharmap/gucharmap-chapters-model.h
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-model.h	(original)
+++ trunk/gucharmap/gucharmap-chapters-model.h	Fri Mar 21 10:53:59 2008
@@ -46,10 +46,9 @@
 
 typedef enum
 {
-  CHAPTERS_SCRIPT = 0,
-  CHAPTERS_BLOCK  = 1
-}
-ChaptersMode;
+  GUCHARMAP_CHAPTERS_SCRIPT = 0,
+  GUCHARMAP_CHAPTERS_BLOCK  = 1
+} GucharmapChaptersMode;
 
 enum {
   CHAPTERS_ID_COL    = 0,

Modified: trunk/gucharmap/gucharmap-settings.c
==============================================================================
--- trunk/gucharmap/gucharmap-settings.c	(original)
+++ trunk/gucharmap/gucharmap-settings.c	Fri Mar 21 10:53:59 2008
@@ -64,12 +64,12 @@
   return get_first_non_underscore_char (_("_File")); /* use a super-common string */
 }
 
-static ChaptersMode
+static GucharmapChaptersMode
 get_default_chapters_mode (void)
 {
   /* XXX: In the future, do something based on chapters mode and locale 
    * or something. */
-  return CHAPTERS_SCRIPT;
+  return GUCHARMAP_CHAPTERS_SCRIPT;
 }
 
 static gchar *
@@ -114,10 +114,10 @@
   return (client != NULL);
 }
 
-ChaptersMode
+GucharmapChaptersMode
 gucharmap_settings_get_chapters_mode (void)
 {
-  ChaptersMode ret;
+  GucharmapChaptersMode ret;
   gchar *mode;
   
   mode = gconf_client_get_string (client, GCONF_PREFIX"/chapters_mode", NULL);
@@ -125,9 +125,9 @@
     return get_default_chapters_mode ();
 
   if (strcmp (mode, "script") == 0)
-    ret = CHAPTERS_SCRIPT;
+    ret = GUCHARMAP_CHAPTERS_SCRIPT;
   else if (strcmp (mode, "block") == 0)
-    ret = CHAPTERS_BLOCK;
+    ret = GUCHARMAP_CHAPTERS_BLOCK;
   else
     ret = get_default_chapters_mode ();
 
@@ -136,15 +136,15 @@
 }
 
 void
-gucharmap_settings_set_chapters_mode (ChaptersMode mode)
+gucharmap_settings_set_chapters_mode (GucharmapChaptersMode mode)
 {
   switch (mode)
     {
-      case CHAPTERS_SCRIPT:
+      case GUCHARMAP_CHAPTERS_SCRIPT:
         gconf_client_set_string (client, GCONF_PREFIX"/chapters_mode", "script", NULL);
       break;
 
-      case CHAPTERS_BLOCK:
+      case GUCHARMAP_CHAPTERS_BLOCK:
         gconf_client_set_string (client, GCONF_PREFIX"/chapters_mode", "block", NULL);
       break;
     }
@@ -265,7 +265,7 @@
 }
 
 void
-gucharmap_settings_set_chapters_mode (ChaptersMode mode)
+gucharmap_settings_set_chapters_mode (GucharmapChaptersMode mode)
 {
   return;
 }

Modified: trunk/gucharmap/gucharmap-settings.h
==============================================================================
--- trunk/gucharmap/gucharmap-settings.h	(original)
+++ trunk/gucharmap/gucharmap-settings.h	Fri Mar 21 10:53:59 2008
@@ -27,8 +27,8 @@
 
 void         gucharmap_settings_initialize           (void);
 void         gucharmap_settings_shutdown             (void);
-ChaptersMode gucharmap_settings_get_chapters_mode    (void);
-void         gucharmap_settings_set_chapters_mode    (ChaptersMode mode);
+GucharmapChaptersMode gucharmap_settings_get_chapters_mode    (void);
+void         gucharmap_settings_set_chapters_mode    (GucharmapChaptersMode mode);
 gchar *      gucharmap_settings_get_font             (void);
 void         gucharmap_settings_set_font             (gchar *font);
 gunichar     gucharmap_settings_get_last_char        (void);

Modified: trunk/gucharmap/gucharmap-window.c
==============================================================================
--- trunk/gucharmap/gucharmap-window.c	(original)
+++ trunk/gucharmap/gucharmap-window.c	Fri Mar 21 10:53:59 2008
@@ -61,7 +61,7 @@
   guint text_to_copy_visible   : 1;
   guint file_menu_visible      : 1;
 
-  ChaptersMode chapters_mode; 
+  GucharmapChaptersMode chapters_mode; 
 };
 
 static void gucharmap_window_class_init (GucharmapWindowClass *klass);
@@ -513,18 +513,18 @@
 
 static void
 set_chapters_model (GucharmapWindow *guw,
-                    ChaptersMode mode)
+                    GucharmapChaptersMode mode)
 {
   GucharmapChaptersModel *model = NULL;
 
   switch (mode)
     {
-      case CHAPTERS_SCRIPT:
+      case GUCHARMAP_CHAPTERS_SCRIPT:
       	model = gucharmap_script_chapters_model_new ();
 	chapters_set_labels (_("Next Script"), _("Previous Script"), guw);
 	break;
       
-      case CHAPTERS_BLOCK:
+      case GUCHARMAP_CHAPTERS_BLOCK:
       	model = gucharmap_block_chapters_model_new ();
 	chapters_set_labels (_("Next Block"), _("Previous Block"), guw);
 	break;
@@ -542,16 +542,16 @@
 	 GtkRadioAction   *radioaction,
          GucharmapWindow  *guw)
 {
-  ChaptersMode mode;
+  GucharmapChaptersMode mode;
 
   switch (gtk_radio_action_get_current_value (radioaction))
     {
       case VIEW_BY_SCRIPT:
-        mode = CHAPTERS_SCRIPT;
+        mode = GUCHARMAP_CHAPTERS_SCRIPT;
 	break;
       
       case VIEW_BY_BLOCK:
-        mode = CHAPTERS_BLOCK;
+        mode = GUCHARMAP_CHAPTERS_BLOCK;
 	break;
       
       default: