[ekiga] Made it so all gm_conf_[gs]et_* calls get through a key whose basis is in gmconf-ekiga-key.h
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Made it so all gm_conf_[gs]et_* calls get through a key whose basis is in gmconf-ekiga-key.h
- Date: Mon, 14 Jan 2013 21:33:26 +0000 (UTC)
commit e827a77da102b342062ff325d9d951b936a75fdd
Author: Julien Puydt <jpuydt free fr>
Date: Mon Jan 14 22:33:15 2013 +0100
Made it so all gm_conf_[gs]et_* calls get through a key whose basis is in gmconf-ekiga-key.h
This is the last step before a GSetting migration, but it would probably
be a good idea to use the occasion to rework the organisation of the
tree of keys!
.../components/call-history/history-book.cpp | 6 +---
.../gmconf-personal-details.cpp | 18 ++++++------
lib/engine/components/local-roster/local-heap.cpp | 7 +---
lib/engine/components/opal/opal-bank.cpp | 4 +-
lib/engine/gui/gtk-core/codecsbox.cpp | 18 +++++++-----
lib/engine/gui/gtk-frontend/roster-view-gtk.cpp | 8 +++---
lib/gmconf/gmconf-ekiga-keys.h | 12 +++++---
lib/gmconf/gmconf-upgrade.c | 28 ++++++++++----------
plugins/ldap/ldap-source.cpp | 6 ++--
plugins/loudmouth/loudmouth-bank.cpp | 6 ++--
plugins/resource-list/rl-cluster.cpp | 6 ++--
11 files changed, 59 insertions(+), 60 deletions(-)
---
diff --git a/lib/engine/components/call-history/history-book.cpp b/lib/engine/components/call-history/history-book.cpp
index 7ac45ed..3880ff1 100644
--- a/lib/engine/components/call-history/history-book.cpp
+++ b/lib/engine/components/call-history/history-book.cpp
@@ -45,14 +45,12 @@
#include "history-book.h"
-#define KEY "/apps/" PACKAGE_NAME "/contacts/call_history"
-
History::Book::Book (Ekiga::ServiceCore &_core) :
core(_core), doc()
{
xmlNodePtr root = NULL;
- gchar *c_raw = gm_conf_get_string (KEY);
+ gchar *c_raw = gm_conf_get_string (CALL_HISTORY_KEY);
if (c_raw != NULL) {
@@ -172,7 +170,7 @@ History::Book::save () const
xmlDocDumpMemory (doc.get (), &buffer, &size);
- gm_conf_set_string (KEY, (const char *)buffer);
+ gm_conf_set_string (CALL_HISTORY_KEY, (const char *)buffer);
xmlFree (buffer);
}
diff --git a/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp b/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
index 2242170..533a3ed 100644
--- a/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
+++ b/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
@@ -85,16 +85,16 @@ Gmconf::PersonalDetails::PersonalDetails ()
gchar* str = NULL;
display_name_notifier
- = gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/general/personal_data/full_name",
+ = gm_conf_notifier_add (PERSONAL_DATA_KEY "full_name",
display_name_changed_nt, this);
presence_notifier
- = gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/general/personal_data/short_status",
+ = gm_conf_notifier_add (PERSONAL_DATA_KEY "short_status",
presence_changed_nt, this);
status_notifier
- = gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/general/personal_data/long_status",
+ = gm_conf_notifier_add (PERSONAL_DATA_KEY "long_status",
status_changed_nt, this);
- str = gm_conf_get_string ("/apps/" PACKAGE_NAME "/general/personal_data/full_name");
+ str = gm_conf_get_string (PERSONAL_DATA_KEY "full_name");
if (str != NULL) {
display_name = str;
@@ -102,7 +102,7 @@ Gmconf::PersonalDetails::PersonalDetails ()
} else
display_name = "";
- str = gm_conf_get_string ("/apps/" PACKAGE_NAME "/general/personal_data/short_status");
+ str = gm_conf_get_string (PERSONAL_DATA_KEY "short_status");
if (str != NULL) {
presence = str;
@@ -110,7 +110,7 @@ Gmconf::PersonalDetails::PersonalDetails ()
} else
presence = "";
- str = gm_conf_get_string ("/apps/" PACKAGE_NAME "/general/personal_data/long_status");
+ str = gm_conf_get_string (PERSONAL_DATA_KEY "long_status");
if (str != NULL) {
status = str;
@@ -147,21 +147,21 @@ Gmconf::PersonalDetails::get_status () const
void
Gmconf::PersonalDetails::set_display_name (const std::string display_name_)
{
- gm_conf_set_string ("/apps/" PACKAGE_NAME "/general/personal_data/full_name",
+ gm_conf_set_string (PERSONAL_DATA_KEY "full_name",
display_name_.c_str ());
}
void
Gmconf::PersonalDetails::set_presence (const std::string presence_)
{
- gm_conf_set_string ("/apps/" PACKAGE_NAME "/general/personal_data/short_status",
+ gm_conf_set_string (PERSONAL_DATA_KEY "short_status",
presence_.c_str ());
}
void
Gmconf::PersonalDetails::set_status (const std::string status_)
{
- gm_conf_set_string ("/apps/" PACKAGE_NAME "/general/personal_data/long_status",
+ gm_conf_set_string (PERSONAL_DATA_KEY "long_status",
status_.c_str ());
}
diff --git a/lib/engine/components/local-roster/local-heap.cpp b/lib/engine/components/local-roster/local-heap.cpp
index 038079d..3295986 100644
--- a/lib/engine/components/local-roster/local-heap.cpp
+++ b/lib/engine/components/local-roster/local-heap.cpp
@@ -45,16 +45,13 @@
#include "local-heap.h"
#include "local-presentity.h"
-#define KEY "/apps/" PACKAGE_NAME "/contacts/roster"
-
-
/*
* Public API
*/
Local::Heap::Heap (Ekiga::ServiceCore &_core): core (_core), doc ()
{
xmlNodePtr root;
- gchar *c_raw = gm_conf_get_string (KEY);
+ gchar *c_raw = gm_conf_get_string (ROSTER_KEY);
// Build the XML document representing the contacts list from the configuration
if (c_raw != NULL) {
@@ -372,7 +369,7 @@ Local::Heap::save () const
xmlDocDumpMemory (doc.get (), &buffer, &size);
- gm_conf_set_string (KEY, (const char *)buffer);
+ gm_conf_set_string (ROSTER_KEY, (const char *)buffer);
xmlFree (buffer);
}
diff --git a/lib/engine/components/opal/opal-bank.cpp b/lib/engine/components/opal/opal-bank.cpp
index 4c09826..4300209 100644
--- a/lib/engine/components/opal/opal-bank.cpp
+++ b/lib/engine/components/opal/opal-bank.cpp
@@ -51,7 +51,7 @@
Opal::Bank::Bank (Ekiga::ServiceCore &_core): core(_core)
{
- GSList *accounts = gm_conf_get_string_list ("/apps/" PACKAGE_NAME "/protocols/accounts_list");
+ GSList *accounts = gm_conf_get_string_list (PROTOCOLS_KEY "accounts_list");
GSList *accounts_iter = accounts;
while (accounts_iter) {
@@ -255,7 +255,7 @@ Opal::Bank::save () const
accounts = g_slist_append (accounts, g_strdup (acct_str.c_str ()));
}
- gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/protocols/accounts_list", accounts);
+ gm_conf_set_string_list (PROTOCOLS_KEY "accounts_list", accounts);
g_slist_foreach (accounts, (GFunc) g_free, NULL);
g_slist_free (accounts);
diff --git a/lib/engine/gui/gtk-core/codecsbox.cpp b/lib/engine/gui/gtk-core/codecsbox.cpp
index 160aad6..c8f5956 100644
--- a/lib/engine/gui/gtk-core/codecsbox.cpp
+++ b/lib/engine/gui/gtk-core/codecsbox.cpp
@@ -198,9 +198,9 @@ codec_toggled_cb (G_GNUC_UNUSED GtkCellRendererToggle *cell,
/* 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/" PACKAGE_NAME "/codecs/audio/media_list", codecs_data);
+ gm_conf_set_string_list (AUDIO_CODECS_KEY "media_list", codecs_data);
else if (self->priv->type == Ekiga::Call::Video)
- gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/codecs/video/media_list", codecs_data);
+ gm_conf_set_string_list (VIDEO_CODECS_KEY "media_list", codecs_data);
g_slist_foreach (codecs_data, (GFunc) g_free, NULL);
g_slist_free (codecs_data);
}
@@ -257,9 +257,9 @@ codec_moved_cb (GtkWidget *widget,
/* 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/" PACKAGE_NAME "/codecs/audio/media_list", codecs_data);
+ gm_conf_set_string_list (AUDIO_CODECS_KEY "media_list", codecs_data);
else if (self->priv->type == Ekiga::Call::Video)
- gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/codecs/video/media_list", codecs_data);
+ gm_conf_set_string_list (VIDEO_CODECS_KEY "media_list", codecs_data);
g_slist_foreach (codecs_data, (GFunc) g_free, NULL);
g_slist_free (codecs_data);
}
@@ -523,9 +523,9 @@ codecs_box_set_property (GObject *obj,
}
if (self->priv->type == Ekiga::Call::Audio)
- list = gm_conf_get_string_list ("/apps/" PACKAGE_NAME "/codecs/audio/media_list");
+ list = gm_conf_get_string_list (AUDIO_CODECS_KEY "media_list");
else if (self->priv->type == Ekiga::Call::Video)
- list = gm_conf_get_string_list ("/apps/" PACKAGE_NAME "/codecs/video/media_list");
+ list = gm_conf_get_string_list (VIDEO_CODECS_KEY "media_list");
codecs_box_set_codecs (self, list);
@@ -533,9 +533,11 @@ codecs_box_set_property (GObject *obj,
g_slist_free (list);
if (self->priv->type == Ekiga::Call::Audio)
- gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/codecs/audio/media_list", codecs_list_changed_nt, GTK_WIDGET (self));
+ gm_conf_notifier_add (AUDIO_CODECS_KEY "media_list",
+ codecs_list_changed_nt, GTK_WIDGET (self));
else
- gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/codecs/video/media_list", codecs_list_changed_nt, GTK_WIDGET (self));
+ gm_conf_notifier_add (VIDEO_CODECS_KEY "media_list",
+ codecs_list_changed_nt, GTK_WIDGET (self));
}
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index f156501..2047c90 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -590,7 +590,7 @@ on_clicked_fold (RosterViewGtk* self,
}
}
- gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/contacts/roster_folded_groups",
+ gm_conf_set_string_list (CONTACTS_KEY "roster_folded_groups",
self->priv->folded_groups);
}
@@ -1416,8 +1416,8 @@ roster_view_gtk_init (G_GNUC_UNUSED RosterViewGtk* self)
self->priv = g_new0 (RosterViewGtkPrivate, 1);
- self->priv->folded_groups = gm_conf_get_string_list ("/apps/" PACKAGE_NAME "/contacts/roster_folded_groups");
- self->priv->show_offline_contacts = gm_conf_get_bool ("/apps/" PACKAGE_NAME "/contacts/show_offline_contacts");
+ self->priv->folded_groups = gm_conf_get_string_list (CONTACTS_KEY "roster_folded_groups");
+ self->priv->show_offline_contacts = gm_conf_get_bool (CONTACTS_KEY "show_offline_contacts");
vbox = gtk_vbox_new (FALSE, 0);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
@@ -1526,7 +1526,7 @@ roster_view_gtk_init (G_GNUC_UNUSED RosterViewGtk* self)
G_CALLBACK (on_view_event_after), self);
/* Notifiers */
- gm_conf_notifier_add ("/apps/" PACKAGE_NAME "/contacts/show_offline_contacts",
+ gm_conf_notifier_add (CONTACTS_KEY "show_offline_contacts",
show_offline_contacts_changed_nt, self);
}
diff --git a/lib/gmconf/gmconf-ekiga-keys.h b/lib/gmconf/gmconf-ekiga-keys.h
index 2ba96ca..f1021a2 100644
--- a/lib/gmconf/gmconf-ekiga-keys.h
+++ b/lib/gmconf/gmconf-ekiga-keys.h
@@ -43,21 +43,23 @@
#define AUDIO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/audio/"
#define AUDIO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/audio/"
#define CALL_FORWARDING_KEY "/apps/" PACKAGE_NAME "/protocols/call_forwarding/"
+#define CALL_HISTORY_KEY "/apps/" PACKAGE_NAME "/contacts/call_history"
#define CALL_OPTIONS_KEY "/apps/" PACKAGE_NAME "/general/call_options/"
#define CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/"
#define CONTACTS_KEY "/apps/" PACKAGE_NAME "/contacts/"
-#define GENERAL_KEY "/apps/" PACKAGE_NAME "/general/"
+#define GENERAL_KEY "/apps/" PACKAGE_NAME "/general/"
#define H323_KEY "/apps/" PACKAGE_NAME "/protocols/h323/"
-#define LDAP_KEY "/apps/" PACKAGE_NAME "/protocols/ldap/"
#define NAT_KEY "/apps/" PACKAGE_NAME "/general/nat/"
#define PERSONAL_DATA_KEY "/apps/" PACKAGE_NAME "/general/personal_data/"
#define PORTS_KEY "/apps/" PACKAGE_NAME "/protocols/ports/"
#define PROTOCOLS_KEY "/apps/" PACKAGE_NAME "/protocols/"
+#define ROSTER_KEY "/apps/" PACKAGE_NAME "/contacts/roster"
#define SIP_KEY "/apps/" PACKAGE_NAME "/protocols/sip/"
-#define SOUND_EVENTS_KEY "/apps/" PACKAGE_NAME "/general/sound_events/"
+#define SOUND_EVENTS_KEY "/apps/" PACKAGE_NAME "/general/sound_events/"
+#define URL_HANDLERS_KEY "/desktop/gnome/url-handlers/"
#define USER_INTERFACE_KEY "/apps/" PACKAGE_NAME "/general/user_interface/"
-#define VIDEO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/video/"
+#define VIDEO_CODECS_KEY "/apps/" PACKAGE_NAME "/codecs/video/"
#define VIDEO_DEVICES_KEY "/apps/" PACKAGE_NAME "/devices/video/"
-#define VIDEO_DISPLAY_KEY USER_INTERFACE_KEY "video_display/"
+#define VIDEO_DISPLAY_KEY "/apps/" PACKAGE_NAME "/general/user_interface/video_display/"
#endif /* GMCONF_EKIGA_KEYS_H */
diff --git a/lib/gmconf/gmconf-upgrade.c b/lib/gmconf/gmconf-upgrade.c
index 53e4900..0adfd79 100644
--- a/lib/gmconf/gmconf-upgrade.c
+++ b/lib/gmconf/gmconf-upgrade.c
@@ -51,44 +51,44 @@ gmconf_upgrade_version ()
int version = gm_conf_get_int (GENERAL_KEY "version");
/* Install the sip:, h323: and callto: GNOME URL Handlers */
- gchar *conf_url = gm_conf_get_string ("/desktop/gnome/url-handlers/callto/command");
+ gchar *conf_url = gm_conf_get_string (URL_HANDLERS_KEY "callto/command");
if (!conf_url
|| !g_strcmp0 (conf_url, "gnomemeeting -c \"%s\"")) {
- gm_conf_set_string ("/desktop/gnome/url-handlers/callto/command",
+ gm_conf_set_string (URL_HANDLERS_KEY "callto/command",
"ekiga -c \"%s\"");
- gm_conf_set_bool ("/desktop/gnome/url-handlers/callto/needs_terminal",
+ gm_conf_set_bool (URL_HANDLERS_KEY "callto/needs_terminal",
FALSE);
- gm_conf_set_bool ("/desktop/gnome/url-handlers/callto/enabled", TRUE);
+ gm_conf_set_bool (URL_HANDLERS_KEY "callto/enabled", TRUE);
}
g_free (conf_url);
- conf_url = gm_conf_get_string ("/desktop/gnome/url-handlers/h323/command");
+ conf_url = gm_conf_get_string (URL_HANDLERS_KEY "h323/command");
if (!conf_url
|| !g_strcmp0 (conf_url, "gnomemeeting -c \"%s\"")) {
- gm_conf_set_string ("/desktop/gnome/url-handlers/h323/command",
+ gm_conf_set_string (URL_HANDLERS_KEY "h323/command",
"ekiga -c \"%s\"");
- gm_conf_set_bool ("/desktop/gnome/url-handlers/h323/needs_terminal", FALSE);
+ gm_conf_set_bool (URL_HANDLERS_KEY "h323/needs_terminal", FALSE);
- gm_conf_set_bool ("/desktop/gnome/url-handlers/h323/enabled", TRUE);
+ gm_conf_set_bool (URL_HANDLERS_KEY "h323/enabled", TRUE);
}
g_free (conf_url);
- conf_url = gm_conf_get_string ("/desktop/gnome/url-handlers/sip/command");
+ conf_url = gm_conf_get_string (URL_HANDLERS_KEY "sip/command");
if (!conf_url
|| !g_strcmp0 (conf_url, "gnomemeeting -c \"%s\"")) {
- gm_conf_set_string ("/desktop/gnome/url-handlers/sip/command",
+ gm_conf_set_string (URL_HANDLERS_KEY "sip/command",
"ekiga -c \"%s\"");
- gm_conf_set_bool ("/desktop/gnome/url-handlers/sip/needs_terminal", FALSE);
+ gm_conf_set_bool (URL_HANDLERS_KEY "sip/needs_terminal", FALSE);
- gm_conf_set_bool ("/desktop/gnome/url-handlers/sip/enabled", TRUE);
+ gm_conf_set_bool (URL_HANDLERS_KEY "sip/enabled", TRUE);
}
g_free (conf_url);
@@ -113,7 +113,7 @@ gmconf_upgrade_version ()
g_free (conf_url);
/* diamondcard is now set at sip.diamondcard.us */
- GSList *accounts = gm_conf_get_string_list ("/apps/" PACKAGE_NAME "/protocols/accounts_list");
+ GSList *accounts = gm_conf_get_string_list (PROTOCOLS_KEY "accounts_list");
GSList *accounts_iter = accounts;
GRegex* regex = g_regex_new ("eugw\\.ast\\.diamondcard\\.us",
(GRegexCompileFlags)0,
@@ -131,7 +131,7 @@ gmconf_upgrade_version ()
}
g_regex_unref (regex);
- gm_conf_set_string_list ("/apps/" PACKAGE_NAME "/protocols/accounts_list", accounts);
+ gm_conf_set_string_list (PROTOCOLS_KEY "accounts_list", accounts);
g_slist_foreach (accounts, (GFunc) g_free, NULL);
g_slist_free (accounts);
diff --git a/plugins/ldap/ldap-source.cpp b/plugins/ldap/ldap-source.cpp
index b934b36..aa7dc84 100644
--- a/plugins/ldap/ldap-source.cpp
+++ b/plugins/ldap/ldap-source.cpp
@@ -45,13 +45,13 @@
#include "ldap-source.h"
-#define KEY "/apps/" PACKAGE_NAME "/contacts/ldap_servers"
+#define LDAP_KEY CONTACTS_KEY "ldap_servers"
OPENLDAP::Source::Source (Ekiga::ServiceCore &_core):
core(_core), doc(), should_add_ekiga_net_book(false)
{
xmlNodePtr root;
- gchar *c_raw = gm_conf_get_string (KEY);
+ gchar *c_raw = gm_conf_get_string (LDAP_KEY);
if (c_raw != NULL && g_strcmp0 (c_raw, "")) {
@@ -204,7 +204,7 @@ OPENLDAP::Source::save ()
xmlDocDumpMemory (doc.get (), &buffer, &size);
- gm_conf_set_string (KEY, (const char *)buffer);
+ gm_conf_set_string (LDAP_KEY, (const char *)buffer);
xmlFree (buffer);
}
diff --git a/plugins/loudmouth/loudmouth-bank.cpp b/plugins/loudmouth/loudmouth-bank.cpp
index 2b62a69..825db9b 100644
--- a/plugins/loudmouth/loudmouth-bank.cpp
+++ b/plugins/loudmouth/loudmouth-bank.cpp
@@ -43,14 +43,14 @@
#include "form-request-simple.h"
-#define KEY "/apps/" PACKAGE_NAME "/contacts/jabber"
+#define JABBER_KEY CONTACTS_KEY "jabber"
LM::Bank::Bank (boost::shared_ptr<Ekiga::PersonalDetails> details_,
boost::shared_ptr<Dialect> dialect_,
boost::shared_ptr<Cluster> cluster_):
details(details_), cluster(cluster_), dialect(dialect_), doc (NULL)
{
- gchar* c_raw = gm_conf_get_string (KEY);
+ gchar* c_raw = gm_conf_get_string (JABBER_KEY);
if (c_raw != NULL) { // we already have it in store
@@ -96,7 +96,7 @@ LM::Bank::save () const
xmlDocDumpMemory (doc, &buffer, &size);
- gm_conf_set_string (KEY, (const char *)buffer);
+ gm_conf_set_string (JABBER_KEY, (const char *)buffer);
xmlFree (buffer);
}
diff --git a/plugins/resource-list/rl-cluster.cpp b/plugins/resource-list/rl-cluster.cpp
index df9501d..dc57c94 100644
--- a/plugins/resource-list/rl-cluster.cpp
+++ b/plugins/resource-list/rl-cluster.cpp
@@ -46,7 +46,7 @@
#include <iostream>
-#define KEY "/apps/" PACKAGE_NAME "/contacts/resource-lists"
+#define RL_KEY CONTACTS_KEY "resource-lists"
RL::Cluster::Cluster (Ekiga::ServiceCore& core_): core(core_), doc()
{
@@ -57,7 +57,7 @@ RL::Cluster::Cluster (Ekiga::ServiceCore& core_): core(core_), doc()
presence_core->presence_received.connect (boost::bind (&RL::Cluster::on_presence_received, this, _1, _2));
presence_core->status_received.connect (boost::bind (&RL::Cluster::on_status_received, this, _1, _2));
- c_raw = gm_conf_get_string (KEY);
+ c_raw = gm_conf_get_string (RL_KEY);
if (c_raw != NULL) {
@@ -148,7 +148,7 @@ RL::Cluster::save () const
xmlDocDumpMemory (doc.get (), &buffer, &size);
- gm_conf_set_string (KEY, (const char*)buffer);
+ gm_conf_set_string (RL_KEY, (const char*)buffer);
xmlFree (buffer);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]