From 08a5c44c218c9a93d60c0975c317f0a7be4b677b Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Mon, 13 May 2013 11:11:26 +0100 Subject: tpaw-utils: add the TPAW namespace to ACCOUNT_WIDGETS_RESOURCES_PREFIX https://bugzilla.gnome.org/show_bug.cgi?id=699492 --- tp-account-widgets/tpaw-account-widget.c | 6 +++--- tp-account-widgets/tpaw-irc-network-dialog.c | 2 +- tp-account-widgets/tpaw-utils.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tp-account-widgets/tpaw-account-widget.c b/tp-account-widgets/tpaw-account-widget.c index d5983ffd7..2ef43f4b6 100644 --- a/tp-account-widgets/tpaw-account-widget.c +++ b/tp-account-widgets/tpaw-account-widget.c @@ -1809,7 +1809,7 @@ out: } #define WIDGET(cm, proto) \ - { #cm, #proto, ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-"#proto".ui", \ + { #cm, #proto, TPAW_ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-"#proto".ui", \ account_widget_build_##proto } static void @@ -1905,7 +1905,7 @@ do_constructed (GObject *obj) const char *file; GtkWidget * (*func)(TpawAccountWidget *self, const gchar *filename); } widgets [] = { - { "salut", "local-xmpp", ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-local-xmpp.ui", + { "salut", "local-xmpp", TPAW_ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-local-xmpp.ui", account_widget_build_salut }, WIDGET (gabble, jabber), WIDGET (haze, msn), @@ -1936,7 +1936,7 @@ do_constructed (GObject *obj) if (i == G_N_ELEMENTS (widgets)) { - gchar *filename = ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-generic.ui"; + gchar *filename = TPAW_ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-generic.ui"; box = account_widget_build_generic (self, filename); } diff --git a/tp-account-widgets/tpaw-irc-network-dialog.c b/tp-account-widgets/tpaw-irc-network-dialog.c index e9ab32091..4d8745e28 100644 --- a/tp-account-widgets/tpaw-irc-network-dialog.c +++ b/tp-account-widgets/tpaw-irc-network-dialog.c @@ -470,7 +470,7 @@ tpaw_irc_network_dialog_show (TpawIrcNetwork *network, dialog->network = network; g_object_ref (dialog->network); - gui = tpaw_builder_get_resource (ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-irc.ui", + gui = tpaw_builder_get_resource (TPAW_ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-irc.ui", "irc_network_dialog", &dialog->dialog, "button_close", &dialog->button_close, "entry_network", &dialog->entry_network, diff --git a/tp-account-widgets/tpaw-utils.h b/tp-account-widgets/tpaw-utils.h index d6acfc6e1..d9cdc6d94 100644 --- a/tp-account-widgets/tpaw-utils.h +++ b/tp-account-widgets/tpaw-utils.h @@ -41,7 +41,7 @@ G_BEGIN_DECLS #define TPAW_STR_EMPTY(s) ((s) == NULL || (s)[0] == '\0') -#define ACCOUNT_WIDGETS_RESOURCES_PREFIX "/org/gnome/AccountWidgets" +#define TPAW_ACCOUNT_WIDGETS_RESOURCES_PREFIX "/org/gnome/AccountWidgets" void tpaw_connect_new_account (TpAccount *account, TpAccountManager *account_manager); -- cgit v1.2.3