2005-09-14 [paul] 1.9.14cvs26

[claws.git] / src / plugins / trayicon / trayicon.c

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 3fb5dcd49339015034cf45ea6e51e3d01c155295..d42634f18c17a6df58f4dbede7e5dca18275593f 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include "common/sylpheed.h"
@@ -34,7 +35,6 @@
 #include "folder.h"
 #include "mainwindow.h"
 #include "gtkutils.h"
-#include "intl.h"
 #include "menu.h"
 #include "toolbar.h"
 #include "prefs_common.h"
@@ -76,7 +76,7 @@ typedef enum
        TRAYICON_NEWMARKED,
        TRAYICON_UNREAD,
        TRAYICON_UNREADMARKED,
-       TRAYICON_NOTHING,
+       TRAYICON_NOTHING
 } TrayIconType;
 
 static void trayicon_get_cb        (gpointer data, guint action, GtkWidget *widget);
@@ -130,19 +130,18 @@ static void set_trayicon_pixmap(TrayIconType icontype)
                return;
 
        gtk_image_set_from_pixmap(GTK_IMAGE(image), pixmap, bitmap);
-       gtk_widget_shape_combine_mask(GTK_WIDGET(trayicon), bitmap, GTK_WIDGET(image)->allocation.x, GTK_WIDGET(image)->allocation.y);
 
        last_pixmap = pixmap;
 }
 
 static void update(void)
 {
-       gint new, unread, unreadmarked, total;
+       guint new, unread, unreadmarked, marked, total;
        gchar *buf;
        TrayIconType icontype = TRAYICON_NOTHING;
 
-       folder_count_total_msgs(&new, &unread, &unreadmarked, &total);
-       buf = g_strdup_printf("New %d, Unread: %d, Total: %d", new, unread, total);
+       folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total);
+       buf = g_strdup_printf(_("New %d, Unread: %d, Total: %d"), new, unread, total);
 
         gtk_tooltips_set_tip(tooltips, eventbox, buf, "");
        g_free(buf);