ekiga r7723 - in trunk: . lib/engine/account lib/engine/components/gmconf-personal-details lib/engine/gui/gtk-frontend lib/gui src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sat Mar  7 11:01:04 2009
New Revision: 7723
URL: http://svn.gnome.org/viewvc/ekiga?rev=7723&view=rev

Log:
Applied patch from Eugen to fix hardcoded GmConf keys leading to problems
when Ekiga is compiled with another package name than Ekiga (#574336).


Modified:
   trunk/ChangeLog
   trunk/lib/engine/account/bank-impl.h
   trunk/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
   trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
   trunk/lib/gui/codecsbox.cpp
   trunk/src/gui/conf.cpp

Modified: trunk/lib/engine/account/bank-impl.h
==============================================================================
--- trunk/lib/engine/account/bank-impl.h	(original)
+++ trunk/lib/engine/account/bank-impl.h	Sat Mar  7 11:01:04 2009
@@ -37,6 +37,7 @@
 #ifndef __BANK_IMPL_H__
 #define __BANK_IMPL_H__
 
+#include "config.h"
 #include "lister.h"
 #include "account-core.h"
 #include "account.h"
@@ -167,7 +168,7 @@
   Lister<T>::object_removed.connect (account_removed.make_slot ());
   Lister<T>::object_updated.connect (account_updated.make_slot ());
 
-  GSList *accounts = gm_conf_get_string_list ("/apps/ekiga/protocols/accounts_list");
+  GSList *accounts = gm_conf_get_string_list ("/apps/" PACKAGE_NAME "/protocols/accounts_list");
   GSList *accounts_iter = accounts;
 
   while (accounts_iter) {
@@ -204,7 +205,7 @@
       accounts = g_slist_append (accounts, g_strdup (acct_str.c_str ()));
   }
 
-  gm_conf_set_string_list ("/apps/ekiga/protocols/accounts_list", accounts);
+  gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/protocols/accounts_list", accounts);
 
   g_slist_foreach (accounts, (GFunc) g_free, NULL);
   g_slist_free (accounts);

Modified: trunk/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
==============================================================================
--- trunk/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp	(original)
+++ trunk/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp	Sat Mar  7 11:01:04 2009
@@ -37,6 +37,7 @@
 #include <glib.h>
 #include <iostream>
 
+#include "config.h"
 #include "gmconf.h"
 #include "gmconf-personal-details.h"
 
@@ -81,16 +82,16 @@
   gchar* str = NULL;
 
   display_name_notifier
-    = gm_conf_notifier_add ("/apps/ekiga/general/personal_data/full_name",
+    = gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/general/personal_data/full_name",
                             display_name_changed_nt, this);
   presence_notifier
-    = gm_conf_notifier_add ("/apps/ekiga/general/personal_data/short_status",
+    = gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/general/personal_data/short_status",
                             presence_changed_nt, this);
   status_notifier
-    = gm_conf_notifier_add ("/apps/ekiga/general/personal_data/long_status",
+    = gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/general/personal_data/long_status",
                             status_changed_nt, this);
 
-  str = gm_conf_get_string ("/apps/ekiga/general/personal_data/full_name");
+  str = gm_conf_get_string ("/apps/" PACKAGE_NAME "/general/personal_data/full_name");
   if (str != NULL) {
 
     display_name = str;
@@ -98,7 +99,7 @@
   } else
     display_name = "";
 
-  str = gm_conf_get_string ("/apps/ekiga/general/personal_data/short_status");
+  str = gm_conf_get_string ("/apps/" PACKAGE_NAME "/general/personal_data/short_status");
   if (str != NULL) {
 
     presence = str;
@@ -106,7 +107,7 @@
   } else
     presence = "";
 
-  str = gm_conf_get_string ("/apps/ekiga/general/personal_data/long_status");
+  str = gm_conf_get_string ("/apps/" PACKAGE_NAME "/general/personal_data/long_status");
   if (str != NULL) {
 
     status = str;
@@ -143,21 +144,21 @@
 void
 Gmconf::PersonalDetails::set_display_name (const std::string display_name_)
 {
-  gm_conf_set_string ("/apps/ekiga/general/personal_data/full_name",
+  gm_conf_set_string ("/apps/" PACKAGE_NAME "/general/personal_data/full_name",
                       display_name_.c_str ());
 }
 
 void
 Gmconf::PersonalDetails::set_presence (const std::string presence_)
 {
-  gm_conf_set_string ("/apps/ekiga/general/personal_data/short_status",
+  gm_conf_set_string ("/apps/" PACKAGE_NAME "/general/personal_data/short_status",
                       presence_.c_str ());
 }
 
 void
 Gmconf::PersonalDetails::set_status (const std::string status_)
 {
-  gm_conf_set_string ("/apps/ekiga/general/personal_data/long_status",
+  gm_conf_set_string ("/apps/" PACKAGE_NAME "/general/personal_data/long_status",
                       status_.c_str ());
 }
 

Modified: trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/gtk-frontend.cpp	Sat Mar  7 11:01:04 2009
@@ -84,10 +84,10 @@
   gmref_ptr<Ekiga::ChatCore> chat_core = core.get ("chat-core");
 
   addressbook_window =
-    addressbook_window_new_with_key (*contact_core, "/apps/ekiga/general/user_interface/addressbook_window");
+    addressbook_window_new_with_key (*contact_core, "/apps/" PACKAGE_NAME "/general/user_interface/addressbook_window");
   chat_window =
     chat_window_new (*chat_core,
-		     "/apps/ekiga/general/user_interface/chat_window");
+		     "/apps/" PACKAGE_NAME "/general/user_interface/chat_window");
 }
 
 

Modified: trunk/lib/gui/codecsbox.cpp
==============================================================================
--- trunk/lib/gui/codecsbox.cpp	(original)
+++ trunk/lib/gui/codecsbox.cpp	Sat Mar  7 11:01:04 2009
@@ -213,9 +213,9 @@
   /* Update the gmconf key */
   codecs_data = codecs_box_to_gm_conf_list (self);
   if (self->priv->type == Ekiga::Call::Audio)
-    gm_conf_set_string_list ("/apps/ekiga/codecs/audio/media_list", codecs_data);
+    gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/codecs/audio/media_list", codecs_data);
   else if (self->priv->type == Ekiga::Call::Video)
-    gm_conf_set_string_list ("/apps/ekiga/codecs/video/media_list", codecs_data);
+    gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/codecs/video/media_list", codecs_data);
   g_slist_foreach (codecs_data, (GFunc) g_free, NULL);
   g_slist_free (codecs_data);
 }
@@ -275,9 +275,9 @@
   /* Update the gmconf key */
   codecs_data = codecs_box_to_gm_conf_list (self);
   if (self->priv->type == Ekiga::Call::Audio)
-    gm_conf_set_string_list ("/apps/ekiga/codecs/audio/media_list", codecs_data);
+    gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/codecs/audio/media_list", codecs_data);
   else if (self->priv->type == Ekiga::Call::Video)
-    gm_conf_set_string_list ("/apps/ekiga/codecs/video/media_list", codecs_data);
+    gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/codecs/video/media_list", codecs_data);
   g_slist_foreach (codecs_data, (GFunc) g_free, NULL);
   g_slist_free (codecs_data);
 }
@@ -563,9 +563,9 @@
   }
 
   if (self->priv->type == Ekiga::Call::Audio)
-    list = gm_conf_get_string_list ("/apps/ekiga/codecs/audio/media_list");
+    list = gm_conf_get_string_list ("/apps/" PACKAGE_NAME "/codecs/audio/media_list");
   else if (self->priv->type == Ekiga::Call::Video)
-    list = gm_conf_get_string_list ("/apps/ekiga/codecs/video/media_list");
+    list = gm_conf_get_string_list ("/apps/" PACKAGE_NAME "/codecs/video/media_list");
 
   codecs_box_set_codecs (self, list);
 
@@ -573,9 +573,9 @@
   g_slist_free (list);
 
   if (self->priv->type == Ekiga::Call::Audio)
-    gm_conf_notifier_add ("/apps/ekiga/codecs/audio/media_list", codecs_list_changed_nt, GTK_WIDGET (self));
+    gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/codecs/audio/media_list", codecs_list_changed_nt, GTK_WIDGET (self));
   else
-    gm_conf_notifier_add ("/apps/ekiga/codecs/video/media_list", codecs_list_changed_nt, GTK_WIDGET (self));
+    gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/codecs/video/media_list", codecs_list_changed_nt, GTK_WIDGET (self));
 }
 
 

Modified: trunk/src/gui/conf.cpp
==============================================================================
--- trunk/src/gui/conf.cpp	(original)
+++ trunk/src/gui/conf.cpp	Sat Mar  7 11:01:04 2009
@@ -138,7 +138,7 @@
   g_free (conf_url);
 
   /* diamondcard is now set at sip.diamondcard.us */
-  GSList *accounts = gm_conf_get_string_list ("/apps/ekiga/protocols/accounts_list");
+  GSList *accounts = gm_conf_get_string_list ("/apps/" PACKAGE_NAME "/protocols/accounts_list");
   GSList *accounts_iter = accounts;
   while (accounts_iter) {
 
@@ -148,7 +148,7 @@
     accounts_iter->data = g_strdup ((const char *) acct);
     accounts_iter = g_slist_next (accounts_iter);
   }
-  gm_conf_set_string_list ("/apps/ekiga/protocols/accounts_list", accounts);
+  gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/protocols/accounts_list", accounts);
   g_slist_foreach (accounts, (GFunc) g_free, NULL);
   g_slist_free (accounts);