diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-25 14:36:14 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-25 14:36:14 +0200 |
| commit | 360744a79cc03a22b489462e362b3805abd3539c (patch) | |
| tree | c35da078d9016af1999de74e78312063cb01d867 | |
| parent | 96c22741a03a8cb4a0d4897ba03db3e8ba0df858 (diff) | |
'local-xmpp' protocol has been renamed 'local_xmpp'
| -rw-r--r-- | tp-account-widgets/tpaw-account-widget.c | 2 | ||||
| -rw-r--r-- | tp-account-widgets/tpaw-protocol.c | 2 | ||||
| -rw-r--r-- | tp-account-widgets/tpaw-utils.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tp-account-widgets/tpaw-account-widget.c b/tp-account-widgets/tpaw-account-widget.c index e15a3d16..a3a18ea5 100644 --- a/tp-account-widgets/tpaw-account-widget.c +++ b/tp-account-widgets/tpaw-account-widget.c @@ -1805,7 +1805,7 @@ do_constructed (GObject *obj) const char *file; GtkWidget * (*func)(TpawAccountWidget *self, const gchar *filename); } widgets [] = { - { "salut", "local-xmpp", TPAW_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), diff --git a/tp-account-widgets/tpaw-protocol.c b/tp-account-widgets/tpaw-protocol.c index 72c579fc..20a08acb 100644 --- a/tp-account-widgets/tpaw-protocol.c +++ b/tp-account-widgets/tpaw-protocol.c @@ -422,7 +422,7 @@ sort_protocol_value (const gchar *protocol_name) guint i; const gchar *names[] = { "jabber", - "local-xmpp", + "local_xmpp", "gtalk", NULL }; diff --git a/tp-account-widgets/tpaw-utils.c b/tp-account-widgets/tpaw-utils.c index d83f3967..0724d546 100644 --- a/tp-account-widgets/tpaw-utils.c +++ b/tp-account-widgets/tpaw-utils.c @@ -100,6 +100,9 @@ tpaw_protocol_icon_name (const gchar *protocol) protocol = "sip"; else if (!tp_strdiff (protocol, "sms")) return g_strdup ("phone"); + else if (!tp_strdiff (protocol, "local_xmpp")) + /* Icon names can't have '_' in their name */ + return g_strdup ("im-local-xmpp"); return g_strdup_printf ("im-%s", protocol); } @@ -115,7 +118,7 @@ tpaw_protocol_name_to_display_name (const gchar *proto_name) } names[] = { { "jabber", "Jabber", FALSE }, { "msn", "Windows Live (MSN)", FALSE, }, - { "local-xmpp", N_("People Nearby"), TRUE }, + { "local_xmpp", N_("People Nearby"), TRUE }, { "irc", "IRC", FALSE }, { "icq", "ICQ", FALSE }, { "aim", "AIM", FALSE }, |