diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | src/messages-service.c | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index cc1163d..bda6ea9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ -indicator-messages (0.5.95-0ubuntu1~ppa1) precise; urgency=low +indicator-messages (0.5.95-0ubuntu1) precise; urgency=low + [ Charles Kerr ] * New upstream release. * Fix 0.5.94 blacklist regression. - * Fix broken icon images in Thunderbird (LP: #956147) - -- Charles Kerr <charles.kerr@canonical.com> Thu, 05 Apr 2012 13:13:41 -0500 + [ Ken VanDine ] + * src/indicator-messages.c + * revert fix for the broken images in indicator-messages-service, it + caused the service to build against gtk and we can't parallel install + the service anyway + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 05 Apr 2012 16:47:19 -0400 indicator-messages (0.5.94-0ubuntu1) precise; urgency=low diff --git a/src/messages-service.c b/src/messages-service.c index 8e85da2..1d86aa9 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -29,7 +29,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libindicator/indicator-service.h> #include <gio/gio.h> #include <glib/gi18n.h> -#include <gtk/gtk.h> #include <libdbusmenu-glib/client.h> #include <libdbusmenu-glib/server.h> @@ -665,9 +664,7 @@ server_shortcut_added (AppMenuItem * appitem, DbusmenuMenuitem * mi, gpointer da g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none"); DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data); if (mi != NULL) { -#if GTK_CHECK_VERSION(3, 0, 0) dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, ""); -#endif dbusmenu_menuitem_child_append(shell, mi); } resort_menu(shell); |