[gnome-panel] libgnome-panel: remove gp_module_info_set_translation_domain

[Alberts Muktupāvels <muktupavels src gnome org>]

commit ec5851f5f9b3f165e39429a10888e95b7d288951
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Jul 31 13:37:11 2017 +0300

    libgnome-panel: remove gp_module_info_set_translation_domain

 gnome-panel/libpanel-applet-private/gp-module.c |    2 +-
 libgnome-panel/gp-module-info-private.h         |    3 +--
 libgnome-panel/gp-module-info.c                 |   22 +++++-----------------
 libgnome-panel/gp-module-info.h                 |   12 +++++-------
 libgnome-panel/gp-module.h                      |    3 +--
 modules/clock/clock-module.c                    |    3 +--
 modules/fish/fish-module.c                      |    3 +--
 modules/notification-area/na-module.c           |    3 +--
 modules/separator/separator-module.c            |    3 +--
 modules/status-notifier/sn-module.c             |    3 +--
 modules/wncklet/wncklet-module.c                |    4 +---
 11 files changed, 19 insertions(+), 42 deletions(-)
---
diff --git a/gnome-panel/libpanel-applet-private/gp-module.c b/gnome-panel/libpanel-applet-private/gp-module.c
index c6b8001..ef99adb 100644
--- a/gnome-panel/libpanel-applet-private/gp-module.c
+++ b/gnome-panel/libpanel-applet-private/gp-module.c
@@ -425,7 +425,7 @@ gp_module_applet_new (GpModule         *module,
   return g_object_new (type,
                        "id", applet,
                        "settings-path", settings_path,
-                       "translation-domain", module->info->domain,
+                       "translation-domain", module->info->translation_domain,
                        "locked-down", locked_down,
                        "orientation", orientation,
                        "position", position,
diff --git a/libgnome-panel/gp-module-info-private.h b/libgnome-panel/gp-module-info-private.h
index dd3f3cc..91a5a1b 100644
--- a/libgnome-panel/gp-module-info-private.h
+++ b/libgnome-panel/gp-module-info-private.h
@@ -26,10 +26,9 @@ struct _GpModuleInfo
 {
   gchar  *id;
   gchar  *version;
+  gchar  *translation_domain;
 
   gchar **applets;
-
-  gchar  *domain;
 };
 
 void gp_module_info_free (GpModuleInfo *info);
diff --git a/libgnome-panel/gp-module-info.c b/libgnome-panel/gp-module-info.c
index 3bee334..725952c 100644
--- a/libgnome-panel/gp-module-info.c
+++ b/libgnome-panel/gp-module-info.c
@@ -49,6 +49,7 @@ get_applets (va_list args)
  * gp_module_info_new:
  * @id: the id of this module
  * @version: the version of this module
+ * @translation_domain: the translation domain or %NULL
  *
  * Creates a new #GpModuleInfo.
  *
@@ -56,7 +57,8 @@ get_applets (va_list args)
  */
 GpModuleInfo *
 gp_module_info_new (const gchar *id,
-                    const gchar *version)
+                    const gchar *version,
+                    const gchar *translation_domain)
 {
   GpModuleInfo *info;
 
@@ -64,6 +66,7 @@ gp_module_info_new (const gchar *id,
 
   info->id = g_strdup (id);
   info->version = g_strdup (version);
+  info->translation_domain = g_strdup (translation_domain);
 
   return info;
 }
@@ -87,21 +90,6 @@ gp_module_info_set_applets (GpModuleInfo *info,
   va_end (args);
 }
 
-/**
- * gp_module_info_set_translation_domain:
- * @info: a #GpModuleInfo
- * @domain: the translation domain or NULL
- *
- * Sets the translation domain.
- */
-void
-gp_module_info_set_translation_domain (GpModuleInfo *info,
-                                       const gchar  *domain)
-{
-  g_free (info->domain);
-  info->domain = g_strdup (domain);
-}
-
 void
 gp_module_info_free (GpModuleInfo *info)
 {
@@ -110,8 +98,8 @@ gp_module_info_free (GpModuleInfo *info)
 
   g_free (info->id);
   g_free (info->version);
+  g_free (info->translation_domain);
   g_strfreev (info->applets);
-  g_free (info->domain);
 
   g_free (info);
 }
diff --git a/libgnome-panel/gp-module-info.h b/libgnome-panel/gp-module-info.h
index af369c9..baba52e 100644
--- a/libgnome-panel/gp-module-info.h
+++ b/libgnome-panel/gp-module-info.h
@@ -29,14 +29,12 @@ G_BEGIN_DECLS
  */
 typedef struct _GpModuleInfo GpModuleInfo;
 
-GpModuleInfo *gp_module_info_new                    (const gchar  *id,
-                                                     const gchar  *version);
+GpModuleInfo *gp_module_info_new         (const gchar  *id,
+                                          const gchar  *version,
+                                          const gchar  *translation_domain);
 
-void          gp_module_info_set_applets            (GpModuleInfo *info,
-                                                     ...);
-
-void          gp_module_info_set_translation_domain (GpModuleInfo *info,
-                                                     const gchar  *domain);
+void          gp_module_info_set_applets (GpModuleInfo *info,
+                                          ...);
 
 G_END_DECLS
 
diff --git a/libgnome-panel/gp-module.h b/libgnome-panel/gp-module.h
index 47f633b..6270797 100644
--- a/libgnome-panel/gp-module.h
+++ b/libgnome-panel/gp-module.h
@@ -41,10 +41,9 @@ G_BEGIN_DECLS
  *   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
  *   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  *
- *   info = gp_module_info_new ("example", PACKAGE_VERSION);
+ *   info = gp_module_info_new ("example", PACKAGE_VERSION, GETTEXT_PACKAGE);
  *
  *   gp_module_info_set_applets (info, "example1", "example2", NULL);
- *   gp_module_info_set_translation_domain (info, GETTEXT_PACKAGE);
  *
  *   return info;
  * }
diff --git a/modules/clock/clock-module.c b/modules/clock/clock-module.c
index 392b030..784635c 100644
--- a/modules/clock/clock-module.c
+++ b/modules/clock/clock-module.c
@@ -30,10 +30,9 @@ clock_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("clock", PACKAGE_VERSION);
+  info = gp_module_info_new ("clock", PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "clock", NULL);
-  gp_module_info_set_translation_domain (info, GETTEXT_PACKAGE);
 
   return info;
 }
diff --git a/modules/fish/fish-module.c b/modules/fish/fish-module.c
index 5c6a37b..a919ad4 100644
--- a/modules/fish/fish-module.c
+++ b/modules/fish/fish-module.c
@@ -30,10 +30,9 @@ fish_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("fish", PACKAGE_VERSION);
+  info = gp_module_info_new ("fish", PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "fish", NULL);
-  gp_module_info_set_translation_domain (info, GETTEXT_PACKAGE);
 
   return info;
 }
diff --git a/modules/notification-area/na-module.c b/modules/notification-area/na-module.c
index e9890b0..dd75696 100644
--- a/modules/notification-area/na-module.c
+++ b/modules/notification-area/na-module.c
@@ -30,10 +30,9 @@ na_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("notification-area", PACKAGE_VERSION);
+  info = gp_module_info_new ("notification-area", PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "notification-area", NULL);
-  gp_module_info_set_translation_domain (info, GETTEXT_PACKAGE);
 
   return info;
 }
diff --git a/modules/separator/separator-module.c b/modules/separator/separator-module.c
index 576b149..e7c76ed 100644
--- a/modules/separator/separator-module.c
+++ b/modules/separator/separator-module.c
@@ -30,10 +30,9 @@ separator_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("separator", PACKAGE_VERSION);
+  info = gp_module_info_new ("separator", PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "separator", NULL);
-  gp_module_info_set_translation_domain (info, GETTEXT_PACKAGE);
 
   return info;
 }
diff --git a/modules/status-notifier/sn-module.c b/modules/status-notifier/sn-module.c
index 751352a..290d93e 100644
--- a/modules/status-notifier/sn-module.c
+++ b/modules/status-notifier/sn-module.c
@@ -30,10 +30,9 @@ sn_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("status-notifier", PACKAGE_VERSION);
+  info = gp_module_info_new ("status-notifier", PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "status-notifier", NULL);
-  gp_module_info_set_translation_domain (info, GETTEXT_PACKAGE);
 
   return info;
 }
diff --git a/modules/wncklet/wncklet-module.c b/modules/wncklet/wncklet-module.c
index b206893..04752b9 100644
--- a/modules/wncklet/wncklet-module.c
+++ b/modules/wncklet/wncklet-module.c
@@ -36,14 +36,12 @@ wncklet_get_module_info (void)
 
   wnck_set_client_type (WNCK_CLIENT_TYPE_PAGER);
 
-  info = gp_module_info_new ("wncklet", PACKAGE_VERSION);
+  info = gp_module_info_new ("wncklet", PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "show-desktop", "window-list",
                               "window-menu", "workspace-switcher",
                               NULL);
 
-  gp_module_info_set_translation_domain (info, GETTEXT_PACKAGE);
-
   return info;
 }