aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--data/Makefile.am4
-rw-r--r--data/aim.profile7
-rw-r--r--data/sofiasip.profile11
-rw-r--r--libempathy-gtk/empathy-ui-utils.c4
5 files changed, 35 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a5ac11b7..5a1940654 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-15 Xavier Claessens <xclaesse@gmail.com>
+
+ * libempathy-gtk/empathy-ui-utils.c: Don't warning if we try to load
+ a NULL icon.
+
+ * data/Makefile.am:
+ * data/aim.profile:
+ * data/sofiasip.profile: Add AIM and SIP profiles. Fixes bug #457740
+ (Jamey Hicks).
+
2007-10-13 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-chat.c: Set chat state to ACTIVE when receiving
diff --git a/data/Makefile.am b/data/Makefile.am
index b30b08d36..964abc78e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,7 +6,9 @@ profile_DATA = \
gtalk.profile \
salut.profile \
irc.profile \
- msn.profile
+ msn.profile \
+ sofiasip.profile \
+ aim.profile
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
diff --git a/data/aim.profile b/data/aim.profile
new file mode 100644
index 000000000..281e7bbaa
--- /dev/null
+++ b/data/aim.profile
@@ -0,0 +1,7 @@
+[Profile]
+Manager=haze
+Protocol=aim
+DisplayName=AIM
+ConfigurationUI = aim
+Capabilities = chat-p2p, supports-alias
+
diff --git a/data/sofiasip.profile b/data/sofiasip.profile
new file mode 100644
index 000000000..32018cfe6
--- /dev/null
+++ b/data/sofiasip.profile
@@ -0,0 +1,11 @@
+[Profile]
+Manager=sofiasip
+Protocol=sip
+DisplayName=SofiaSIP
+ConfigurationUI = sofiasip
+Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, registration-ui, supports-avatars, supports-alias
+DefaultAccountDomain = sip.org
+SupportsInvisible = 0
+VCardField = X-SIP
+VCardDefault = true
+Default-ignore-ssl-errors = 1
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index fe032c9ee..eabdc0a46 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -530,6 +530,10 @@ empathy_pixbuf_from_icon_name (const gchar *icon_name,
gint w, h;
gint size = 48;
+ if (!icon_name) {
+ return NULL;
+ }
+
theme = gtk_icon_theme_get_default ();
if (gtk_icon_size_lookup (icon_size, &w, &h)) {