diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-18 13:22:14 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-18 13:22:14 -0500 |
| commit | 6ac3b19f2d0e475c880136d54fb9f66528b3ab8f (patch) | |
| tree | 2e3184da603e9c34691253bc771aab4bccf6f9d6 | |
| parent | 914a3561c85f1afa7323cd33d7aaab2a96335995 (diff) | |
| parent | d4ed651dbaa582e9859ace5a5e69a63b2cffbcf6 (diff) | |
| download | ayatana-indicator-messages-6ac3b19f2d0e475c880136d54fb9f66528b3ab8f.tar.gz ayatana-indicator-messages-6ac3b19f2d0e475c880136d54fb9f66528b3ab8f.tar.bz2 ayatana-indicator-messages-6ac3b19f2d0e475c880136d54fb9f66528b3ab8f.zip | |
Use the standard libindicator icon handling
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/indicator-messages.c | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 1427bf0..4c40972 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ GTK_REQUIRED_VERSION=2.12 GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 INDICATE_REQUIRED_VERSION=0.3.0 -INDICATOR_REQUIRED_VERSION=0.3.3 +INDICATOR_REQUIRED_VERSION=0.3.5 DBUSMENUGTK_REQUIRED_VERSION=0.2.5 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 3f533a5..110875a 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -31,6 +31,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libindicator/indicator.h> #include <libindicator/indicator-object.h> +#include <libindicator/indicator-image-helper.h> #include "dbus-data.h" #include "messages-service-client.h" @@ -61,8 +62,6 @@ INDICATOR_SET_TYPE(INDICATOR_MESSAGES_TYPE) /* Globals */ static GtkWidget * main_image = NULL; -#define DESIGN_TEAM_SIZE design_team_size -static GtkIconSize design_team_size; static DBusGProxy * icon_proxy = NULL; static GtkSizeGroup * indicator_right_group = NULL; @@ -116,9 +115,9 @@ static void attention_changed_cb (DBusGProxy * proxy, gboolean dot, gpointer userdata) { if (dot) { - gtk_image_set_from_icon_name(GTK_IMAGE(main_image), "indicator-messages-new", DESIGN_TEAM_SIZE); + indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages-new"); } else { - gtk_image_set_from_icon_name(GTK_IMAGE(main_image), "indicator-messages", DESIGN_TEAM_SIZE); + indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages"); } return; } @@ -340,9 +339,7 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm static GtkImage * get_icon (IndicatorObject * io) { - design_team_size = gtk_icon_size_register("design-team-size", 22, 22); - - main_image = gtk_image_new_from_icon_name("indicator-messages", DESIGN_TEAM_SIZE); + main_image = GTK_WIDGET(indicator_image_helper("indicator-messages")); gtk_widget_show(main_image); return GTK_IMAGE(main_image); |