aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-21 20:13:37 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-12-07 21:06:06 +0800
commit0b94b1427a34bc16d98c4c0622c637df8856adc4 (patch)
tree5b552d442d13f05f80ccb9ddf6780f80b296beb9
parent6c5839c976407292715daf22cdddf6aca469fa75 (diff)
downloadgsoc2013-empathy-0b94b1427a34bc16d98c4c0622c637df8856adc4.tar
gsoc2013-empathy-0b94b1427a34bc16d98c4c0622c637df8856adc4.tar.gz
gsoc2013-empathy-0b94b1427a34bc16d98c4c0622c637df8856adc4.tar.bz2
gsoc2013-empathy-0b94b1427a34bc16d98c4c0622c637df8856adc4.tar.lz
gsoc2013-empathy-0b94b1427a34bc16d98c4c0622c637df8856adc4.tar.xz
gsoc2013-empathy-0b94b1427a34bc16d98c4c0622c637df8856adc4.tar.zst
gsoc2013-empathy-0b94b1427a34bc16d98c4c0622c637df8856adc4.zip
add Ovi chat profile (#630146)
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c15
-rw-r--r--libempathy/empathy-utils.c1
2 files changed, 16 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 689f6a28a..c126c2f80 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -258,6 +258,16 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
COL_PROTOCOL_NAME, proto->name,
COL_SERVICE, "facebook",
-1);
+
+ display_name = empathy_service_name_to_display_name ("ovi-chat");
+ gtk_list_store_insert_with_values (priv->store,
+ NULL, 0,
+ COL_ICON, "im-ovi",
+ COL_LABEL, display_name,
+ COL_CM, cm,
+ COL_PROTOCOL_NAME, proto->name,
+ COL_SERVICE, "ovi-chat",
+ -1);
}
g_free (icon_name);
@@ -608,6 +618,11 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
empathy_account_settings_set_string (settings, "server",
"chat.facebook.com");
}
+ else if (!tp_strdiff (service, "ovi-chat"))
+ {
+ empathy_account_settings_set_icon_name_async (settings, "im-ovi",
+ NULL, NULL);
+ }
g_object_unref (cm);
g_free (service);
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 6bbd53f86..6f2fc4113 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -576,6 +576,7 @@ empathy_service_name_to_display_name (const gchar *service_name)
} names[] = {
{ "google-talk", N_("Google Talk"), FALSE },
{ "facebook", N_("Facebook Chat"), TRUE },
+ { "ovi-chat", "Ovi", FALSE },
{ NULL, NULL }
};