]> git.0d.be Git - empathy.git/commitdiff
tp-account-widgets: refer to the right renamed files
authorMarco Barisione <marco.barisione@collabora.co.uk>
Mon, 13 May 2013 09:47:00 +0000 (10:47 +0100)
committerMarco Barisione <marco.barisione@collabora.co.uk>
Tue, 20 Aug 2013 10:03:05 +0000 (11:03 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=699492

tp-account-widgets/tpaw-account-widget.c
tp-account-widgets/tpaw-irc-network-dialog.c

index 7300ea10adaeabacfb1efbb9a057327350adbb33..c7e91972524cdd26d85949465992580fa5391d44 100644 (file)
@@ -1808,7 +1808,7 @@ out:
 }
 
 #define WIDGET(cm, proto) \
-  { #cm, #proto, ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-"#proto".ui", \
+  { #cm, #proto, ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-"#proto".ui", \
     account_widget_build_##proto }
 
 static void
@@ -1904,7 +1904,7 @@ do_constructed (GObject *obj)
     const char *file;
     GtkWidget * (*func)(TpawAccountWidget *self, const gchar *filename);
   } widgets [] = {
-    { "salut", "local-xmpp", ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-local-xmpp.ui",
+    { "salut", "local-xmpp", ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-local-xmpp.ui",
         account_widget_build_salut },
     WIDGET (gabble, jabber),
     WIDGET (haze, msn),
@@ -1935,7 +1935,7 @@ do_constructed (GObject *obj)
 
   if (i == G_N_ELEMENTS (widgets))
     {
-      gchar *filename = ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-generic.ui";
+      gchar *filename = ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-generic.ui";
       box = account_widget_build_generic (self, filename);
     }
 
@@ -2238,7 +2238,7 @@ tpaw_account_widget_get_default_display_name (TpawAccountWidget *self)
 
   if (login_id != NULL)
     {
-      /* TODO: this should be done in empathy-account-widget-irc */
+      /* TODO: this should be done in tpaw-account-widget-irc */
       if (!tp_strdiff (protocol, "irc"))
         {
           TpawIrcNetwork *network;
index 502d2ca7720f0cb411c0dc39b15845b42db1b613..0f6b7ce83a463b68eac048a33610842652b108c2 100644 (file)
@@ -468,7 +468,7 @@ tpaw_irc_network_dialog_show (TpawIrcNetwork *network,
   dialog->network = network;
   g_object_ref (dialog->network);
 
-  gui = empathy_builder_get_resource (ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-irc.ui",
+  gui = empathy_builder_get_resource (ACCOUNT_WIDGETS_RESOURCES_PREFIX "/tpaw-account-widget-irc.ui",
       "irc_network_dialog", &dialog->dialog,
       "button_close", &dialog->button_close,
       "entry_network", &dialog->entry_network,