[gtranslator/gtk3: 8/11] Use new constant dirs.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit a622d7a029c46edd133520610b65ded4f9e7367f
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Nov 3 15:24:26 2010 +0100

    Use new constant dirs.

 src/gtr-actions-help.c               |    5 ++---
 src/gtr-application.c                |   33 +++++++++++++++------------------
 src/gtr-profile-manager.c            |    6 ++----
 src/gtr-utils.c                      |    3 +--
 src/gtr-view.c                       |    4 ++--
 src/gtr-window.c                     |   12 ++++--------
 src/main.c                           |    3 +++
 src/translation-memory/gda/gtr-gda.c |    3 +--
 8 files changed, 30 insertions(+), 39 deletions(-)
---
diff --git a/src/gtr-actions-help.c b/src/gtr-actions-help.c
index abe1788..e6ab0ae 100644
--- a/src/gtr-actions-help.c
+++ b/src/gtr-actions-help.c
@@ -99,12 +99,11 @@ gtr_about_dialog (GtkAction * action, GtrWindow * window)
   };
 
   GdkPixbuf *logo;
-  gchar *pixmaps_dir;
+  const gchar *pixmaps_dir;
   gchar *logo_file;
 
-  pixmaps_dir = gtr_dirs_get_pixmaps_dir ();
+  pixmaps_dir = gtr_dirs_get_gtr_pixmaps_dir ();
   logo_file = g_build_filename (pixmaps_dir, "gtranslator-logo.png", NULL);
-  g_free (pixmaps_dir);
   logo = gdk_pixbuf_new_from_file (logo_file, NULL);
   g_free (logo_file);
 
diff --git a/src/gtr-application.c b/src/gtr-application.c
index 44b9db4..2d49052 100644
--- a/src/gtr-application.c
+++ b/src/gtr-application.c
@@ -90,7 +90,7 @@ static const GOptionEntry options[] = {
 static gboolean
 ensure_user_config_dir (void)
 {
-  gchar *config_dir;
+  const gchar *config_dir;
   gboolean ret = TRUE;
   gint res;
 
@@ -108,8 +108,6 @@ ensure_user_config_dir (void)
       ret = FALSE;
     }
 
-  g_free (config_dir);
-
   return ret;
 }
 
@@ -118,7 +116,9 @@ load_accels (void)
 {
   gchar *filename;
 
-  filename = gtr_dirs_get_user_accels_file ();
+  filename = g_build_filename (gtr_dirs_get_user_config_dir (),
+                               "accels",
+                               NULL);
   if (filename != NULL)
     {
       gtk_accel_map_load (filename);
@@ -131,7 +131,9 @@ save_accels (void)
 {
   gchar *filename;
 
-  filename = gtr_dirs_get_user_accels_file ();
+  filename = g_build_filename (gtr_dirs_get_user_config_dir (),
+                               "accels",
+                               NULL);
   if (filename != NULL)
     {
       gtk_accel_map_save (filename);
@@ -182,11 +184,11 @@ static void
 gtr_application_init (GtrApplication *application)
 {
   GtrApplicationPrivate *priv;
-  gchar *gtr_folder;
+  const gchar *gtr_folder;
+  const gchar *pixmaps_dir;
+  const gchar *data_dir;
   gchar *path_default_gtr_toolbar;
   gchar *profiles_file;
-  gchar *dir;
-  gchar *pixmaps_dir;
 
   application->priv = GTR_APPLICATION_GET_PRIVATE (application);
   priv = application->priv;
@@ -199,10 +201,9 @@ gtr_application_init (GtrApplication *application)
   gtk_window_set_default_icon_name ("gtranslator");
 
   /* We set the default icon dir */
-  pixmaps_dir = gtr_dirs_get_pixmaps_dir ();
+  pixmaps_dir = gtr_dirs_get_gtr_pixmaps_dir ();
   gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
                                      pixmaps_dir);
-  g_free (pixmaps_dir);
 
   /* Creating config folder */
   ensure_user_config_dir (); /* FIXME: is this really needed ? */
@@ -224,11 +225,8 @@ gtr_application_init (GtrApplication *application)
   priv->toolbars_file = g_build_filename (gtr_folder,
                                           "gtr-toolbar.xml", NULL);
 
-  g_free (gtr_folder);
-
-  dir = gtr_dirs_get_gtr_data_dir ();
-  path_default_gtr_toolbar = g_build_filename (dir, "gtr-toolbar.xml", NULL);
-  g_free (dir);
+  data_dir = gtr_dirs_get_gtr_data_dir ();
+  path_default_gtr_toolbar = g_build_filename (data_dir, "gtr-toolbar.xml", NULL);
 
   egg_toolbars_model_load_names (priv->toolbars_model,
                                  path_default_gtr_toolbar);
@@ -592,7 +590,7 @@ gtr_application_register_icon (GtrApplication *app,
 {
   GtkIconSet *icon_set;
   GtkIconSource *icon_source;
-  gchar *pixmaps_dir;
+  const gchar *pixmaps_dir;
   gchar *path;
   GdkPixbuf *pixbuf;
 
@@ -600,9 +598,8 @@ gtr_application_register_icon (GtrApplication *app,
   g_return_if_fail (icon != NULL && stock_id != NULL);
 
   icon_source = gtk_icon_source_new ();
-  pixmaps_dir = gtr_dirs_get_pixmaps_dir ();
+  pixmaps_dir = gtr_dirs_get_gtr_pixmaps_dir ();
   path = g_build_filename (pixmaps_dir, icon, NULL);
-  g_free (pixmaps_dir);
 
   pixbuf = gdk_pixbuf_new_from_file (path, NULL);
   if (pixbuf)
diff --git a/src/gtr-profile-manager.c b/src/gtr-profile-manager.c
index 5ba1e6c..f0a55d4 100644
--- a/src/gtr-profile-manager.c
+++ b/src/gtr-profile-manager.c
@@ -52,12 +52,11 @@ static guint signals[LAST_SIGNAL];
 static gchar *
 get_profile_filename ()
 {
-  gchar *user_dir;
+  const gchar *user_dir;
   gchar *file_name;
 
   user_dir = gtr_dirs_get_user_config_dir ();
   file_name = g_build_filename (user_dir, "profiles.xml", NULL);
-  g_free (user_dir);
 
   return file_name;
 }
@@ -314,7 +313,7 @@ save_profiles (GtrProfileManager *manager)
   file_name = get_profile_filename ();
   if (file_name != NULL)
     {
-      gchar *config_dir;
+      const gchar *config_dir;
       int res;
 
       /* make sure the config dir exists */
@@ -323,7 +322,6 @@ save_profiles (GtrProfileManager *manager)
       if (res != -1)
         xmlSaveFormatFile (file_name, doc, 1);
 
-      g_free (config_dir);
       g_free (file_name);
     }
 
diff --git a/src/gtr-utils.c b/src/gtr-utils.c
index f85e0b8..297b619 100644
--- a/src/gtr-utils.c
+++ b/src/gtr-utils.c
@@ -697,8 +697,8 @@ gtr_utils_help_display (GtkWindow * parent,
   gchar *command;
   const gchar *lang;
   const gchar *const *langs;
+  const gchar *path;
   gchar *uri = NULL;
-  gchar *path;
   gint i;
 
 
@@ -731,7 +731,6 @@ gtr_utils_help_display (GtkWindow * parent,
       path = gtr_dirs_get_gtr_data_dir ();
       uri = g_build_filename (path, "gnome", "help", doc_id,
                               lang, file_name, NULL);
-      g_free (path);
 
       if (g_file_test (uri, G_FILE_TEST_EXISTS))
         {
diff --git a/src/gtr-view.c b/src/gtr-view.c
index 6ad01ae..8304031 100644
--- a/src/gtr-view.c
+++ b/src/gtr-view.c
@@ -101,7 +101,7 @@ gtr_view_init (GtrView * view)
   GPtrArray *dirs;
   gchar **langs;
   const gchar *const *temp;
-  gchar *datadir;
+  const gchar *datadir;
   GtrViewPrivate *priv;
 
   view->priv = GTR_VIEW_GET_PRIVATE (view);
@@ -119,7 +119,7 @@ gtr_view_init (GtrView * view)
     g_ptr_array_add (dirs, g_strdup (*temp));
 
   datadir = gtr_dirs_get_gtr_data_dir ();
-  g_ptr_array_add (dirs, datadir);
+  g_ptr_array_add (dirs, g_strdup (datadir));
   g_ptr_array_add (dirs, NULL);
   langs = (gchar **) g_ptr_array_free (dirs, FALSE);
 
diff --git a/src/gtr-window.c b/src/gtr-window.c
index d93b485..ccc237d 100644
--- a/src/gtr-window.c
+++ b/src/gtr-window.c
@@ -359,12 +359,11 @@ gtr_window_layout_load (GtrWindow * window,
       !gdl_dock_layout_load_from_file (window->priv->layout_manager,
                                        layout_filename))
     {
+      const gchar *datadir;
       gchar *path;
-      gchar *datadir;
 
       datadir = gtr_dirs_get_gtr_data_dir ();
       path = g_build_filename (datadir, "layout.xml", NULL);
-      g_free (datadir);
 
       //DEBUG_PRINT ("Layout = %s", path);
       if (!gdl_dock_layout_load_from_file (window->priv->layout_manager,
@@ -1629,7 +1628,7 @@ gtr_window_draw (GtrWindow * window)
   GError *error = NULL;
   GtkWidget *dockbar;
   GtkActionGroup *action_group;
-  gchar *datadir;
+  const gchar *datadir;
   gchar *path;
 
   GtrWindowPrivate *priv = window->priv;
@@ -1675,7 +1674,6 @@ gtr_window_draw (GtrWindow * window)
 
   datadir = gtr_dirs_get_gtr_data_dir ();
   path = g_build_filename (datadir, "gtranslator-ui.xml", NULL);
-  g_free (datadir);
 
   if (!gtk_ui_manager_add_ui_from_file (priv->ui_manager, path, &error))
     {
@@ -1775,8 +1773,8 @@ gtr_window_init (GtrWindow * window)
 {
   GtkTargetList *tl;
   GtkWidget *view_menu;
+  const gchar *config_folder;
   gchar *filename;
-  gchar *config_folder;
 
   window->priv = GTR_WINDOW_GET_PRIVATE (window);
 
@@ -1848,7 +1846,6 @@ gtr_window_init (GtrWindow * window)
   /* Loading dock layout */
   config_folder = gtr_dirs_get_user_config_dir ();
   filename = g_build_filename (config_folder, "gtr-layout.xml", NULL);
-  g_free (config_folder);
 
   gtr_window_layout_load (window, filename, NULL);
   g_free (filename);
@@ -1857,8 +1854,8 @@ gtr_window_init (GtrWindow * window)
 static void
 save_panes_state (GtrWindow * window)
 {
+  const gchar *config_folder;
   gchar *filename;
-  gchar *config_folder;
 
   g_settings_set (window->priv->state_settings, GTR_SETTINGS_WINDOW_SIZE, "(ii)",
                   window->priv->width, window->priv->height);
@@ -1867,7 +1864,6 @@ save_panes_state (GtrWindow * window)
 
   config_folder = gtr_dirs_get_user_config_dir ();
   filename = g_build_filename (config_folder, "gtr-layout.xml", NULL);
-  g_free (config_folder);
 
   gtr_window_layout_save (window, filename, NULL);
   g_free (filename);
diff --git a/src/main.c b/src/main.c
index 6c67141..579afa0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -85,6 +85,8 @@ main (gint argc, gchar * argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
+  gtr_dirs_init ();
+
 #ifdef G_OS_WIN32
   setup_path ();
 #endif
@@ -94,6 +96,7 @@ main (gint argc, gchar * argv[])
   status = g_application_run (G_APPLICATION (app), argc, argv);
 
   g_object_unref (app);
+  gtr_dirs_shutdown ();
 
   return 0;
 }
diff --git a/src/translation-memory/gda/gtr-gda.c b/src/translation-memory/gda/gtr-gda.c
index 292b1aa..d7b8e46 100644
--- a/src/translation-memory/gda/gtr-gda.c
+++ b/src/translation-memory/gda/gtr-gda.c
@@ -755,7 +755,7 @@ gtr_gda_init (GtrGda * self)
   gda_init ();
 
   {
-    gchar *config_dir;
+    const gchar *config_dir;
     gchar *encoded_config_dir;
 
     config_dir = gtr_dirs_get_user_config_dir ();
@@ -766,7 +766,6 @@ gtr_gda_init (GtrGda * self)
                                          encoded_config_dir);
 
     g_free (encoded_config_dir);
-    g_free (config_dir);
   }
 
   self->priv->db = gda_connection_open_from_string ("Sqlite",