diff -Nru empathy-3.3.92/debian/changelog empathy-3.3.92/debian/changelog --- empathy-3.3.92/debian/changelog 2012-03-20 14:40:33.000000000 +0000 +++ empathy-3.3.92/debian/changelog 2012-03-20 15:42:22.000000000 +0000 @@ -1,3 +1,10 @@ +empathy (3.3.92-0ubuntu2) precise; urgency=low + + * debian/patches/10_use_notify_osd_icons.patch + - Updated to fixed failed image loading (LP: #809877) + + -- Ken VanDine Tue, 20 Mar 2012 10:54:43 -0400 + empathy (3.3.92-0ubuntu1) precise; urgency=low * New upstream release diff -Nru empathy-3.3.92/debian/patches/10_use_notify_osd_icons.patch empathy-3.3.92/debian/patches/10_use_notify_osd_icons.patch --- empathy-3.3.92/debian/patches/10_use_notify_osd_icons.patch 2012-03-20 14:40:33.000000000 +0000 +++ empathy-3.3.92/debian/patches/10_use_notify_osd_icons.patch 2012-03-20 15:42:22.000000000 +0000 @@ -1,21 +1,46 @@ -Description: Use the notify-osd image for new messages -Bug: https://bugs.edge.launchpad.net/ubuntu/karmic/+source/empathy/+bug/409828 - -From 18170177bf037f682438ddcb93b8682563db7c64 Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Thu, 17 Sep 2009 17:42:26 +1000 -Subject: [PATCH] Use the notify-osd image for new messages - -Index: empathy-2.91.5.1/libempathy-gtk/empathy-images.h -=================================================================== ---- empathy-2.91.5.1.orig/libempathy-gtk/empathy-images.h 2010-12-02 08:42:03.000000000 -0500 -+++ empathy-2.91.5.1/libempathy-gtk/empathy-images.h 2011-01-20 12:49:31.354713000 -0500 -@@ -36,7 +36,7 @@ - #define EMPATHY_IMAGE_PENDING "empathy-pending" +Description: Use the notify-osd image for new message notifications +Bug: https://bugs.launchpad.net/ubuntu/+source/empathy/+bug/409828 +=== modified file 'libempathy-gtk/empathy-images.h' +--- old/libempathy-gtk/empathy-images.h 2012-03-20 15:16:51 +0000 ++++ new/libempathy-gtk/empathy-images.h 2012-03-20 15:41:01 +0000 +@@ -37,6 +37,7 @@ #define EMPATHY_IMAGE_MESSAGE "im-message" --#define EMPATHY_IMAGE_NEW_MESSAGE "im-message-new" -+#define EMPATHY_IMAGE_NEW_MESSAGE "notification-message-im" + #define EMPATHY_IMAGE_NEW_MESSAGE "im-message-new" ++#define EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY "notification-message-im" #define EMPATHY_IMAGE_TYPING "user-typing" #define EMPATHY_IMAGE_CONTACT_INFORMATION "gtk-info" #define EMPATHY_IMAGE_GROUP_MESSAGE "system-users" + +=== modified file 'libempathy-gtk/empathy-ui-utils.c' +--- old/libempathy-gtk/empathy-ui-utils.c 2012-03-20 15:16:51 +0000 ++++ new/libempathy-gtk/empathy-ui-utils.c 2012-03-20 15:25:37 +0000 +@@ -64,6 +64,9 @@ + gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), + PKGDATADIR G_DIR_SEPARATOR_S "icons"); + ++ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), ++ DATADIR G_DIR_SEPARATOR_S "notify-osd" G_DIR_SEPARATOR_S "icons"); ++ + /* Add icons from source dir if available */ + if (g_getenv ("EMPATHY_SRCDIR") != NULL) { + gchar *path; + +=== modified file 'src/empathy-event-manager.c' +--- old/src/empathy-event-manager.c 2012-03-20 15:16:51 +0000 ++++ new/src/empathy-event-manager.c 2012-03-20 15:28:04 +0000 +@@ -609,11 +609,11 @@ + msg = empathy_message_get_body (message); + + if (event != NULL) +- event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header, ++ event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY, header, + msg); + else + event_manager_add (approval->manager, NULL, sender, +- EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE, header, msg, ++ EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE_NOTIFY, header, msg, + approval, event_text_channel_process_func, NULL); + + window = empathy_roster_window_dup (); +