diff -u indicator-messages-0.6.0/debian/indicator-status-provider-mc5.install indicator-messages-0.6.0/debian/indicator-status-provider-mc5.install --- indicator-messages-0.6.0/debian/indicator-status-provider-mc5.install +++ indicator-messages-0.6.0/debian/indicator-status-provider-mc5.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libmc5.so /usr/lib/indicator-messages/status-providers/1/ +debian/tmp/usr/lib/indicator-messages/status-providers/1/libmc5.so /usr/lib/indicator-messages/status-providers/1/ diff -u indicator-messages-0.6.0/debian/indicator-status-provider-emesene.install indicator-messages-0.6.0/debian/indicator-status-provider-emesene.install --- indicator-messages-0.6.0/debian/indicator-status-provider-emesene.install +++ indicator-messages-0.6.0/debian/indicator-status-provider-emesene.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libemesene.so /usr/lib/indicator-messages/status-providers/1/ +debian/tmp/usr/lib/indicator-messages/status-providers/1/libemesene.so /usr/lib/indicator-messages/status-providers/1/ diff -u indicator-messages-0.6.0/debian/libindicator-messages-status-provider1.install indicator-messages-0.6.0/debian/libindicator-messages-status-provider1.install --- indicator-messages-0.6.0/debian/libindicator-messages-status-provider1.install +++ indicator-messages-0.6.0/debian/libindicator-messages-status-provider1.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/libindicator-messages-status-provider.so.* /usr/lib/ +debian/tmp/usr/lib/libindicator-messages-status-provider.so.* /usr/lib/ diff -u indicator-messages-0.6.0/debian/rules indicator-messages-0.6.0/debian/rules --- indicator-messages-0.6.0/debian/rules +++ indicator-messages-0.6.0/debian/rules @@ -1,23 +1,11 @@ #!/usr/bin/make -f -DEB_BUILDDIR = build -DEB_MAKE_FLAVORS = gtk2 gtk3 - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk -DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ -DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ - -DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 -DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 - LDFLAGS += -Wl,-z,defs -Wl,--as-needed -debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) - common-install-arch:: find debian/tmp -name \*.la -delete cd po; intltool-update --pot --verbose diff -u indicator-messages-0.6.0/debian/libindicator-messages-status-provider-dev.install indicator-messages-0.6.0/debian/libindicator-messages-status-provider-dev.install --- indicator-messages-0.6.0/debian/libindicator-messages-status-provider-dev.install +++ indicator-messages-0.6.0/debian/libindicator-messages-status-provider-dev.install @@ -1,3 +1,3 @@ -debian/tmp/gtk3/usr/lib/libindicator-messages-status-provider.so /usr/lib/ -debian/tmp/gtk3/usr/include /usr/ -debian/tmp/gtk3/usr/lib/pkgconfig /usr/lib/ +debian/tmp/usr/lib/libindicator-messages-status-provider.so /usr/lib/ +debian/tmp/usr/include /usr/ +debian/tmp/usr/lib/pkgconfig /usr/lib/ diff -u indicator-messages-0.6.0/debian/changelog indicator-messages-0.6.0/debian/changelog --- indicator-messages-0.6.0/debian/changelog +++ indicator-messages-0.6.0/debian/changelog @@ -1,3 +1,26 @@ +indicator-messages (0.6.0-0ubuntu3~webapps1) quantal; urgency=low + + [ Sebastien Bacher ] + * Drop gtk2 build from the packaging since support for it was + dropped in trunk, thanks Lars Uebernickel + + [ Ken VanDine ] + * Merged from quantal + + -- Ken VanDine Thu, 19 Jul 2012 14:26:28 -0400 + +indicator-messages (0.6.0-0ubuntu2~webapps2) precise; urgency=low + + * Webapps icon sizing fixes + + -- Robert Carr Fri, 27 Apr 2012 14:06:54 -0400 + +indicator-messages (0.6.0-0ubuntu2~webapps1) precise; urgency=low + + * Support for webapps favicons + + -- Robert Carr Tue, 17 Apr 2012 19:05:26 +0100 + indicator-messages (0.6.0-0ubuntu1) precise; urgency=low * New upstream release. diff -u indicator-messages-0.6.0/debian/indicator-status-provider-telepathy.install indicator-messages-0.6.0/debian/indicator-status-provider-telepathy.install --- indicator-messages-0.6.0/debian/indicator-status-provider-telepathy.install +++ indicator-messages-0.6.0/debian/indicator-status-provider-telepathy.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libtelepathy.so /usr/lib/indicator-messages/status-providers/1/ +debian/tmp/usr/lib/indicator-messages/status-providers/1/libtelepathy.so /usr/lib/indicator-messages/status-providers/1/ diff -u indicator-messages-0.6.0/debian/indicator-messages.install indicator-messages-0.6.0/debian/indicator-messages.install --- indicator-messages-0.6.0/debian/indicator-messages.install +++ indicator-messages-0.6.0/debian/indicator-messages.install @@ -1,4 +1,4 @@ -debian/tmp/gtk3/usr/lib/indicators3 /usr/lib/ -debian/tmp/gtk3/usr/lib/indicator-messages/indicator-messages-service /usr/lib/indicator-messages/ -debian/tmp/gtk3/usr/share/dbus-1 /usr/share/ -debian/tmp/gtk3/usr/share/libindicator /usr/share/ +debian/tmp/usr/lib/indicators3 /usr/lib/ +debian/tmp/usr/lib/indicator-messages/indicator-messages-service /usr/lib/indicator-messages/ +debian/tmp/usr/share/dbus-1 /usr/share/ +debian/tmp/usr/share/libindicator /usr/share/ diff -u indicator-messages-0.6.0/debian/control indicator-messages-0.6.0/debian/control --- indicator-messages-0.6.0/debian/control +++ indicator-messages-0.6.0/debian/control @@ -7,20 +7,16 @@ Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), dh-autoreconf, - libgtk2.0-dev (>= 2.12.0), libgtk-3-dev, libdbus-glib-1-dev, intltool, libindicate-dev (>= 0.6.90), - libindicate-gtk-dev (>= 0.6.90), libindicate-gtk3-dev (>= 0.6.90), - libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), libdbusmenu-glib-dev (>= 0.5.90), - libdbusmenu-gtk-dev (>= 0.5.90), libdbusmenu-gtk3-dev (>= 0.5.90), libtelepathy-glib-dev (>= 0.9.0) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-messages Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu/files @@ -38,20 +34,6 @@ for quick access, but without making them annoying in times that you want to ignore them. -Package: indicator-messages-gtk2 -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - indicator-messages (= ${binary:Version}) -Recommends: indicator-applet | indicator-renderer -Replaces: indicator-messages (<< 0.4.90) -Breaks: indicator-applet (<< 0.3.0) -Description: indicator that collects messages that need a response - A place on the user's desktop that collects messages that need a response. - This menu provides a condensed and collected view of all of those messages - for quick access, but without making them annoying in times that you want - to ignore them. - Package: libindicator-messages-status-provider1 Architecture: any Section: libs diff -u indicator-messages-0.6.0/debian/indicator-status-provider-pidgin.install indicator-messages-0.6.0/debian/indicator-status-provider-pidgin.install --- indicator-messages-0.6.0/debian/indicator-status-provider-pidgin.install +++ indicator-messages-0.6.0/debian/indicator-status-provider-pidgin.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libpidgin.so /usr/lib/indicator-messages/status-providers/1/ +debian/tmp/usr/lib/indicator-messages/status-providers/1/libpidgin.so /usr/lib/indicator-messages/status-providers/1/ reverted: --- indicator-messages-0.6.0/debian/indicator-messages-gtk2.install +++ indicator-messages-0.6.0.orig/debian/indicator-messages-gtk2.install @@ -1 +0,0 @@ -debian/tmp/gtk2/usr/lib/indicators /usr/lib/ only in patch2: unchanged: --- indicator-messages-0.6.0.orig/src/dbus-data.h +++ indicator-messages-0.6.0/src/dbus-data.h @@ -12,6 +12,7 @@ #define APPLICATION_MENUITEM_PROP_NAME "label" #define APPLICATION_MENUITEM_PROP_ICON "icon-name" #define APPLICATION_MENUITEM_PROP_RUNNING "app-running" +#define APPLICATION_MENUITEM_PROP_ICON_THEME "icon-theme" #define INDICATOR_MENUITEM_TYPE "indicator-item" #define INDICATOR_MENUITEM_PROP_LABEL "indicator-label" only in patch2: unchanged: --- indicator-messages-0.6.0.orig/src/indicator-messages.c +++ indicator-messages-0.6.0/src/indicator-messages.c @@ -583,10 +583,38 @@ /* remember to destroy cairo context to avoid leaks */ cairo_destroy (cr); #endif - + return TRUE; } + +static GtkWidget * +get_application_icon_widget (DbusmenuMenuitem *newitem, gint size) +{ + GtkIconTheme *icon_theme = NULL; + const gchar *icon_theme_name = dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_ICON_THEME); + + if (icon_theme_name != NULL && (strlen(icon_theme_name) >= 1)) { + icon_theme = gtk_icon_theme_new(); + gtk_icon_theme_set_custom_theme(icon_theme, icon_theme_name); + } else { + icon_theme = g_object_ref(gtk_icon_theme_get_default()); + } + + GdkPixbuf *pb = gtk_icon_theme_load_icon(icon_theme, + dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_ICON), + size, + 0, + NULL); + GtkWidget * icon = gtk_image_new_from_pixbuf(pb); + + g_object_unref(G_OBJECT(pb)); + g_object_unref(G_OBJECT(icon_theme)); + + return icon; +} + + /* Builds a menu item representing a running application in the messaging menu */ static gboolean @@ -596,7 +624,7 @@ GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); - gint padding = 4; + gint padding = 4, width = 16, height = 16; gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL); #if GTK_CHECK_VERSION(3, 0, 0) @@ -605,8 +633,13 @@ GtkWidget * hbox = gtk_hbox_new(FALSE, padding); #endif - GtkWidget * icon = gtk_image_new_from_icon_name(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_ICON), GTK_ICON_SIZE_MENU); + GtkWidget * icon = get_application_icon_widget(newitem, width); + gtk_widget_set_size_request(icon, width + + 2 /* padding */, + height); gtk_misc_set_alignment(GTK_MISC(icon), 1.0 /* right aligned */, 0.5); + gtk_image_set_pixel_size (GTK_IMAGE (icon), 16); + gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); /* Application name in a label */ only in patch2: unchanged: --- indicator-messages-0.6.0.orig/src/app-menu-item.c +++ indicator-messages-0.6.0/src/app-menu-item.c @@ -73,6 +73,7 @@ static void count_cb (IndicateListener * listener, IndicateListenerServer * server, guint value, gpointer data); static void menu_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * menupath, gpointer data); static void desktop_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * value, gpointer data); +static void icon_theme_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * value, gpointer data); static void update_label (AppMenuItem * self); /* GObject Boilerplate */ @@ -240,6 +241,7 @@ indicate_listener_server_get_desktop(listener, server, desktop_cb, self); indicate_listener_server_get_count(listener, server, count_cb, self); indicate_listener_server_get_menu(listener, server, menu_cb, self); + indicate_listener_server_get_icon_theme(listener, server, icon_theme_cb, self); g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL); @@ -380,6 +382,18 @@ return; } +static void +icon_theme_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * value, gpointer data) +{ + g_return_if_fail(IS_APP_MENU_ITEM(data)); + AppMenuItem * self = APP_MENU_ITEM(data); + + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_ICON_THEME, + value); + + return; +} + /* Relay this signal into causing a rebuild of the shortcuts from those above us. */ static void