summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalló György <ballogyor@gmail.com>2017-02-03 23:14:10 +0100
committerMichael Catanzaro <mcatanzaro@gnome.org>2017-02-13 18:02:31 -0600
commit0f39468dfb16b5ba40ea973bf18398b84f406fb8 (patch)
tree308acacf54fa32121bc9a59c59cd31c98dd7680a
parent143869a11bb009094069085626d343c918da319b (diff)
downloadtelepathy-account-widgets-0f39468dfb16b5ba40ea973bf18398b84f406fb8.tar.gz
Add skypeweb to known protocols
Also add icons for Skype protocols. Source: https://github.com/EionRobb/skype4pidgin/tree/master/icons https://bugzilla.gnome.org/show_bug.cgi?id=778157
-rw-r--r--data/icons/Makefile.am3
-rw-r--r--data/icons/hicolor_apps_16x16_im-skype.pngbin0 -> 885 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-skype.pngbin0 -> 1265 bytes
-rw-r--r--data/icons/hicolor_apps_48x48_im-skype.pngbin0 -> 3002 bytes
-rw-r--r--tp-account-widgets/tpaw-utils.c5
5 files changed, 8 insertions, 0 deletions
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 71207a88..2ee5ea9d 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -24,6 +24,7 @@ private_icons = \
hicolor_apps_16x16_im-mxit.png \
hicolor_apps_16x16_im-myspace.png \
hicolor_apps_16x16_im-sametime.png \
+ hicolor_apps_16x16_im-skype.png \
hicolor_apps_16x16_im-yahoo.png \
hicolor_apps_16x16_im-zephyr.png \
hicolor_apps_22x22_im-aim.png \
@@ -45,6 +46,7 @@ private_icons = \
hicolor_apps_22x22_im-mxit.png \
hicolor_apps_22x22_im-myspace.png \
hicolor_apps_22x22_im-sametime.png \
+ hicolor_apps_22x22_im-skype.png \
hicolor_apps_22x22_im-yahoo.png \
hicolor_apps_22x22_im-zephyr.png \
hicolor_apps_24x24_im-aim.png \
@@ -106,6 +108,7 @@ private_icons = \
hicolor_apps_48x48_im-mxit.png \
hicolor_apps_48x48_im-myspace.png \
hicolor_apps_48x48_im-sametime.png \
+ hicolor_apps_48x48_im-skype.png \
hicolor_apps_48x48_im-yahoo.png \
hicolor_apps_48x48_im-zephyr.png \
hicolor_apps_scalable_im-aim.svg \
diff --git a/data/icons/hicolor_apps_16x16_im-skype.png b/data/icons/hicolor_apps_16x16_im-skype.png
new file mode 100644
index 00000000..13e29614
--- /dev/null
+++ b/data/icons/hicolor_apps_16x16_im-skype.png
Binary files differ
diff --git a/data/icons/hicolor_apps_22x22_im-skype.png b/data/icons/hicolor_apps_22x22_im-skype.png
new file mode 100644
index 00000000..90984bc7
--- /dev/null
+++ b/data/icons/hicolor_apps_22x22_im-skype.png
Binary files differ
diff --git a/data/icons/hicolor_apps_48x48_im-skype.png b/data/icons/hicolor_apps_48x48_im-skype.png
new file mode 100644
index 00000000..1c487b73
--- /dev/null
+++ b/data/icons/hicolor_apps_48x48_im-skype.png
Binary files differ
diff --git a/tp-account-widgets/tpaw-utils.c b/tp-account-widgets/tpaw-utils.c
index 6b6b79f9..cd41f0a9 100644
--- a/tp-account-widgets/tpaw-utils.c
+++ b/tp-account-widgets/tpaw-utils.c
@@ -98,6 +98,10 @@ tpaw_protocol_icon_name (const gchar *protocol)
else if (!tp_strdiff (protocol, "simple"))
/* SIMPLE uses the same icon as SIP */
protocol = "sip";
+ else if (!tp_strdiff (protocol, "skype-dbus") ||
+ !tp_strdiff (protocol, "skype-x11") ||
+ !tp_strdiff (protocol, "skypeweb"))
+ protocol = "skype";
else if (!tp_strdiff (protocol, "sms"))
return g_strdup ("phone");
@@ -129,6 +133,7 @@ tpaw_protocol_name_to_display_name (const gchar *proto_name)
{ "sametime", "Sametime", FALSE },
{ "skype-dbus", "Skype (D-BUS)", FALSE },
{ "skype-x11", "Skype (X11)", FALSE },
+ { "skypeweb", "Skype", FALSE },
{ "zephyr", "Zephyr", FALSE },
{ "facebook", "Facebook Messenger", FALSE },
{ NULL, NULL }