0.9.3claws23

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

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 2f69c70c8ff13d011e27d11baf321702c7fbf33d..56f185955a4f11fbbefda31b5a1b857fce369c0f 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -23,17 +23,19 @@
 #include <gtk/gtk.h>
 
 #include "plugin.h"
 #include <gtk/gtk.h>
 
 #include "plugin.h"

+#include "utils.h"

 #include "hooks.h"
 #include "folder.h"
 #include "mainwindow.h"
 #include "gtkutils.h"
 #include "hooks.h"
 #include "folder.h"
 #include "mainwindow.h"
 #include "gtkutils.h"

+#include "intl.h"

 
 #include "eggtrayicon.h"
 #include "newmail.xpm"
 #include "unreadmail.xpm"
 #include "nomail.xpm"
 
 
 #include "eggtrayicon.h"
 #include "newmail.xpm"
 #include "unreadmail.xpm"
 #include "nomail.xpm"
 

-static gint hook_id;
+static guint hook_id;

 
 static GdkPixmap *newmail_pixmap;
 static GdkPixmap *newmail_bitmap;
 
 static GdkPixmap *newmail_pixmap;
 static GdkPixmap *newmail_bitmap;


@@ -46,6 +48,7 @@ static EggTrayIcon *trayicon;
 static GtkWidget *eventbox;
 static GtkWidget *image;
 static GtkTooltips *tooltips;
 static GtkWidget *eventbox;
 static GtkWidget *image;
 static GtkTooltips *tooltips;

+guint destroy_signal_id;

 
 typedef enum
 {
 
 typedef enum
 {


@@ -82,7 +85,7 @@ static void set_trayicon_pixmap(TrayIconType icontype)
        gtk_widget_shape_combine_mask(GTK_WIDGET(trayicon), bitmap, GTK_WIDGET(image)->allocation.x, GTK_WIDGET(image)->allocation.y);
 }
 
        gtk_widget_shape_combine_mask(GTK_WIDGET(trayicon), bitmap, GTK_WIDGET(image)->allocation.x, GTK_WIDGET(image)->allocation.y);
 }
 

-static void update()
+static void update(void)

 {
        gint new, unread, unreadmarked, total;
        gchar *buf;
 {
        gint new, unread, unreadmarked, total;
        gchar *buf;


@@ -108,14 +111,12 @@ static gboolean click_cb(GtkWidget * widget,
 {
        MainWindow *mainwin;
 
 {
        MainWindow *mainwin;
 

-/*

        mainwin = mainwindow_get_mainwindow();
        if (GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window))) {
        mainwin = mainwindow_get_mainwindow();
        if (GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window))) {

-               gtk_widget_hide_all(mainwin->window);
+               main_window_hide(mainwin);

        } else {
        } else {

-               gtk_widget_show_all(mainwin->window);
+               main_window_show(mainwin);

         }
         }

-*/

        return TRUE;
 }
 
        return TRUE;
 }
 


@@ -124,18 +125,22 @@ static void resize_cb(GtkWidget *widget, GtkAllocation *allocation)
        update();
 }
 
        update();
 }
 

-int plugin_init(gchar **error)
+static void create_trayicon(void);
+
+static void destroy_cb(GtkWidget *widget, gpointer *data)

 {
 {

-       GtkPacker *packer;
+       debug_print("Widget destroyed\n");

 
 

-       hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, folder_item_update_hook, NULL);
-       if (hook_id == -1) {
-               *error = g_strdup("Failed to register folder item update hook");
-               return -1;
-       }
+       create_trayicon();
+}
+
+static void create_trayicon()
+{
+       GtkPacker *packer;

 
         trayicon = egg_tray_icon_new("Sylpheed-Claws");
 
         trayicon = egg_tray_icon_new("Sylpheed-Claws");

-/*        trayicon = gtk_window_new(GTK_WINDOW_TOPLEVEL); */
+//        trayicon = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       gtk_widget_realize(GTK_WIDGET(trayicon));

        gtk_window_set_default_size(GTK_WINDOW(trayicon), 16, 16);
         gtk_container_set_border_width(GTK_CONTAINER(trayicon), 0);
 
        gtk_window_set_default_size(GTK_WINDOW(trayicon), 16, 16);
         gtk_container_set_border_width(GTK_CONTAINER(trayicon), 0);
 


@@ -154,8 +159,13 @@ int plugin_init(gchar **error)
         image = gtk_pixmap_new(nomail_pixmap, nomail_bitmap);
         gtk_packer_add_defaults(GTK_PACKER(packer), GTK_WIDGET(image), GTK_SIDE_TOP, GTK_ANCHOR_CENTER, GTK_PACK_EXPAND);
 
         image = gtk_pixmap_new(nomail_pixmap, nomail_bitmap);
         gtk_packer_add_defaults(GTK_PACKER(packer), GTK_WIDGET(image), GTK_SIDE_TOP, GTK_ANCHOR_CENTER, GTK_PACK_EXPAND);
 

-       gtk_signal_connect(GTK_OBJECT(trayicon), "size_allocate", GTK_SIGNAL_FUNC(resize_cb), NULL);
-        gtk_signal_connect(GTK_OBJECT(eventbox), "button-press-event", GTK_SIGNAL_FUNC(click_cb), NULL);
+       destroy_signal_id =
+       gtk_signal_connect(GTK_OBJECT(trayicon), "destroy",
+                     GTK_SIGNAL_FUNC(destroy_cb), NULL);
+       gtk_signal_connect(GTK_OBJECT(trayicon), "size_allocate",
+                   GTK_SIGNAL_FUNC(resize_cb), NULL);
+       gtk_signal_connect(GTK_OBJECT(eventbox), "button-press-event",
+                   GTK_SIGNAL_FUNC(click_cb), NULL);

 
         tooltips = gtk_tooltips_new();
         gtk_tooltips_set_delay(tooltips, 1000);
 
         tooltips = gtk_tooltips_new();
         gtk_tooltips_set_delay(tooltips, 1000);


@@ -164,29 +174,42 @@ int plugin_init(gchar **error)
         gtk_widget_show_all(GTK_WIDGET(trayicon));
 
        update();
         gtk_widget_show_all(GTK_WIDGET(trayicon));
 
        update();

+}
+
+int plugin_init(gchar **error)
+{
+       hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, folder_item_update_hook, NULL);
+       if (hook_id == -1) {
+               *error = g_strdup("Failed to register folder item update hook");
+               return -1;
+       }
+
+       create_trayicon();

 
         return 0;
 }
 
 
         return 0;
 }
 

-void plugin_done()
+void plugin_done(void)

 {
 {

+       gtk_signal_disconnect(GTK_OBJECT(trayicon), destroy_signal_id);
+

        gtk_widget_destroy(GTK_WIDGET(trayicon));
        hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, hook_id);
 }
 
 const gchar *plugin_name(void)
 {
        gtk_widget_destroy(GTK_WIDGET(trayicon));
        hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, hook_id);
 }
 
 const gchar *plugin_name(void)
 {

-       return "Trayicon";
+       return _("Trayicon");

 }
 
 const gchar *plugin_desc(void)
 {
 }
 
 const gchar *plugin_desc(void)
 {

-       return "This plugin places a mailbox icon in the system tray that "
-              "indicates if you have new or unread mail.\n"
-              "\n"
-              "The mailbox is empty if you have no unread mail, otherwise "
-              "it contains a letter. A tooltip shows new, unread and total "
-              "number of messages.";
+       return _("This plugin places a mailbox icon in the system tray that "
+                "indicates if you have new or unread mail.\n"
+                "\n"
+                "The mailbox is empty if you have no unread mail, otherwise "
+                "it contains a letter. A tooltip shows new, unread and total "
+                "number of messages.");

 }
 
 const gchar *plugin_type(void)
 }
 
 const gchar *plugin_type(void)