[frogr] Renamed 'enable-tooltips' to 'mainview-enable-tooltips' in FrogrConfig



commit b16c5bb7a3f18d1341ed7153814f147e1f242ea7
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Mon Apr 25 08:20:03 2011 -0700

    Renamed 'enable-tooltips' to 'mainview-enable-tooltips' in FrogrConfig

 src/frogr-config.c    |   18 +++++++++---------
 src/frogr-config.h    |    4 ++--
 src/frogr-main-view.c |    6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/frogr-config.c b/src/frogr-config.c
index 414d61b..255496b 100644
--- a/src/frogr-config.c
+++ b/src/frogr-config.c
@@ -60,7 +60,7 @@ struct _FrogrConfigPrivate
 
   gboolean tags_autocompletion;
   gboolean remove_file_extensions;
-  gboolean enable_tooltips;
+  gboolean mainview_enable_tooltips;
 
   gboolean use_proxy;
   gchar *proxy_host;
@@ -227,12 +227,12 @@ _load_settings (FrogrConfig *self, const gchar *config_dir)
               xmlFree (content);
             }
 
-          if (!xmlStrcmp (node->name, (const xmlChar*) "enable-tooltips"))
+          if (!xmlStrcmp (node->name, (const xmlChar*) "mainview-enable-tooltips"))
             {
               xmlChar *content = NULL;
 
               content = xmlNodeGetContent (node);
-              priv->enable_tooltips = !xmlStrcmp (content, (const xmlChar*) "1");
+              priv->mainview_enable_tooltips = !xmlStrcmp (content, (const xmlChar*) "1");
 
               xmlFree (content);
             }
@@ -559,7 +559,7 @@ _save_settings (FrogrConfig *self)
   /* Other stuff */
   _xml_add_string_child (root, "tags-autocompletion", priv->tags_autocompletion ? "1" : "0");
   _xml_add_string_child (root, "remove-file-extensions", priv->remove_file_extensions ? "1" : "0");
-  _xml_add_string_child (root, "enable-tooltips", priv->enable_tooltips ? "1" : "0");
+  _xml_add_string_child (root, "mainview-enable-tooltips", priv->mainview_enable_tooltips ? "1" : "0");
 
   /* Use proxy */
   node = xmlNewNode (NULL, (const xmlChar*) "http-proxy");
@@ -785,7 +785,7 @@ frogr_config_init (FrogrConfig *self)
   priv->content_type = FSP_CONTENT_TYPE_PHOTO;
   priv->tags_autocompletion = TRUE;
   priv->remove_file_extensions = TRUE;
-  priv->enable_tooltips = TRUE;
+  priv->mainview_enable_tooltips = TRUE;
   priv->use_proxy = FALSE;
   priv->proxy_host = NULL;
   priv->proxy_port = NULL;
@@ -1085,21 +1085,21 @@ frogr_config_get_remove_file_extensions (FrogrConfig *self)
 }
 
 void
-frogr_config_set_enable_tooltips (FrogrConfig *self, gboolean value)
+frogr_config_set_mainview_enable_tooltips (FrogrConfig *self, gboolean value)
 {
   g_return_if_fail (FROGR_IS_CONFIG (self));
 
   FrogrConfigPrivate * priv = FROGR_CONFIG_GET_PRIVATE (self);
-  priv->enable_tooltips = value;
+  priv->mainview_enable_tooltips = value;
 }
 
 gboolean
-frogr_config_get_enable_tooltips (FrogrConfig *self)
+frogr_config_get_mainview_enable_tooltips (FrogrConfig *self)
 {
   g_return_val_if_fail (FROGR_IS_CONFIG (self), FALSE);
 
   FrogrConfigPrivate *priv = FROGR_CONFIG_GET_PRIVATE (self);
-  return priv->enable_tooltips;
+  return priv->mainview_enable_tooltips;
 }
 
 void
diff --git a/src/frogr-config.h b/src/frogr-config.h
index 14d8ad3..c3cc691 100644
--- a/src/frogr-config.h
+++ b/src/frogr-config.h
@@ -110,9 +110,9 @@ void frogr_config_set_remove_file_extensions (FrogrConfig *self, gboolean value)
 
 gboolean frogr_config_get_remove_file_extensions (FrogrConfig *self);
 
-void frogr_config_set_enable_tooltips (FrogrConfig *self, gboolean value);
+void frogr_config_set_mainview_enable_tooltips (FrogrConfig *self, gboolean value);
 
-gboolean frogr_config_get_enable_tooltips (FrogrConfig *self);
+gboolean frogr_config_get_mainview_enable_tooltips (FrogrConfig *self);
 
 void frogr_config_set_use_proxy (FrogrConfig *self, gboolean value);
 
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index 372136b..7e99352 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -861,7 +861,7 @@ _on_check_menu_item_toggled (GtkCheckMenuItem *item, gpointer self)
   checked = gtk_check_menu_item_get_active (item);
   if (GTK_WIDGET (item) == priv->enable_tooltips_menu_item)
     {
-      frogr_config_set_enable_tooltips (priv->config, checked);
+      frogr_config_set_mainview_enable_tooltips (priv->config, checked);
       priv->tooltips_enabled = checked;
     }
   else if (GTK_WIDGET (item) == priv->sort_reversed_menu_item)
@@ -916,7 +916,7 @@ _on_icon_view_query_tooltip (GtkWidget *icon_view,
   priv = FROGR_MAIN_VIEW_GET_PRIVATE (self);
 
   /* Disabled by configuration */
-  if (!frogr_config_get_enable_tooltips (priv->config))
+  if (!frogr_config_get_mainview_enable_tooltips (priv->config))
     return FALSE;
 
   /* Check whether we're asking for a tooltip over a picture */
@@ -1795,7 +1795,7 @@ frogr_main_view_init (FrogrMainView *self)
   priv->sorting_direction = SORT_ASCENDING;
 
   /* Read value for 'tooltips enabled' */
-  priv->tooltips_enabled = frogr_config_get_enable_tooltips (priv->config);
+  priv->tooltips_enabled = frogr_config_get_mainview_enable_tooltips (priv->config);
 
   /* initialize extra widgets */
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]