2012-04-01 [colin] 3.8.0cvs36
[claws.git] / src / plugins / trayicon / trayicon.c
index 720af45048214027aab5f0689b22af6c8ead2f33..5c79e5b3e1bc505834daa220d894ac7044ab155a 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2003-2011 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <stdio.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "utils.h"
 #include "folder.h"
 #include "mainwindow.h"
 #include "gtkutils.h"
-#include "intl.h"
+#include "menu.h"
+#include "toolbar.h"
+#include "prefs_common.h"
+#include "main.h"
+#include "alertpanel.h"
+#include "account.h"
+#include "gtk/manage_window.h"
+#ifdef USE_NEW_ADDRBOOK
+       #include "addressbook-dbus.h"
+#endif
+
+#include "trayicon_prefs.h"
 
-#include "eggtrayicon.h"
-#include "newmail.xpm"
-#include "unreadmail.xpm"
-#include "nomail.xpm"
+#include "stock_pixmap.h"
 
-static guint hook_id;
+#define PLUGIN_NAME (_("Trayicon"))
 
-static GdkPixmap *newmail_pixmap;
-static GdkPixmap *newmail_bitmap;
-static GdkPixmap *unreadmail_pixmap;
-static GdkPixmap *unreadmail_bitmap;
-static GdkPixmap *nomail_pixmap;
-static GdkPixmap *nomail_bitmap;
+static guint item_hook_id;
+static guint folder_hook_id;
+static guint offline_hook_id;
+static guint account_hook_id;
+static guint close_hook_id;
+static guint iconified_hook_id;
+static guint theme_hook_id;
 
-static EggTrayIcon *trayicon;
-static GtkWidget *eventbox;
-static GtkWidget *image;
-static GtkTooltips *tooltips;
-guint destroy_signal_id;
+static GdkPixbuf *newmail_pixbuf[2] = {NULL, NULL};
+static GdkPixbuf *unreadmail_pixbuf[2] = {NULL, NULL};
+static GdkPixbuf *newmarkedmail_pixbuf[2] = {NULL, NULL};
+static GdkPixbuf *unreadmarkedmail_pixbuf[2] = {NULL, NULL};
+static GdkPixbuf *nomail_pixbuf[2] = {NULL, NULL};
+
+static GtkStatusIcon *trayicon;
+static GtkWidget *focused_widget = NULL;
+
+static GtkWidget *traymenu_popup;
+static gboolean updating_menu = FALSE;
 
 typedef enum
 {
        TRAYICON_NEW,
+       TRAYICON_NEWMARKED,
        TRAYICON_UNREAD,
        TRAYICON_UNREADMARKED,
-       TRAYICON_NOTHING,
+       TRAYICON_NOTHING
 } TrayIconType;
 
-/* static gboolean mainwin_hidden = FALSE; */
+static void trayicon_get_all_cb            (GtkAction *action, gpointer data);
+static void trayicon_compose_cb            (GtkAction *action, gpointer data);
+static void trayicon_compose_acc_cb (GtkMenuItem *menuitem, gpointer data );
+static void trayicon_addressbook_cb (GtkAction *action, gpointer data);
+static void trayicon_exit_cb       (GtkAction *action, gpointer data);
+static void trayicon_toggle_offline_cb (GtkAction *action, gpointer data);
+
+static GtkActionEntry trayicon_popup_menu_entries[] =
+{
+       {"TrayiconPopup",                       NULL, "TrayiconPopup" },
+       {"TrayiconPopup/GetMail",               NULL, N_("_Get Mail"), NULL, NULL, G_CALLBACK(trayicon_get_all_cb) },
+       {"TrayiconPopup/---",                   NULL, "---", NULL, NULL, G_CALLBACK(trayicon_compose_cb) },
+       {"TrayiconPopup/Email",                 NULL, N_("_Email"), NULL, NULL, G_CALLBACK(trayicon_compose_cb) },
+       {"TrayiconPopup/EmailAcc",              NULL, N_("E_mail from account"), NULL, NULL, NULL },
+       {"TrayiconPopup/OpenAB",                NULL, N_("Open A_ddressbook"), NULL, NULL, G_CALLBACK(trayicon_addressbook_cb) },
+       {"TrayiconPopup/Exit",                  NULL, N_("E_xit Claws Mail"), NULL, NULL, G_CALLBACK(trayicon_exit_cb) },
+};
+
+static GtkToggleActionEntry trayicon_popup_toggle_menu_entries[] =
+{
+       {"TrayiconPopup/ToggleOffline",         NULL, N_("_Work Offline"), NULL, NULL, G_CALLBACK(trayicon_toggle_offline_cb) },
+};
+
+static gboolean trayicon_set_accounts_hook(gpointer source, gpointer data)
+{
+       GList *cur_ac;
+       GtkWidget *menu, *submenu;
+       GtkWidget *menuitem;
+       PrefsAccount *ac_prefs;
+
+       GList *account_list = account_get_list();
+
+       menu = gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/TrayiconPopup/EmailAcc");
+       gtk_widget_show(menu);
+
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), NULL);
+       submenu = gtk_menu_new();
+       for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
+               ac_prefs = (PrefsAccount *)cur_ac->data;
+
+               menuitem = gtk_menu_item_new_with_label
+                       (ac_prefs->account_name ? ac_prefs->account_name
+                        : _("Untitled"));
+               gtk_widget_show(menuitem);
+               gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
+               g_signal_connect(G_OBJECT(menuitem), "activate",
+                                G_CALLBACK(trayicon_compose_acc_cb),
+                                ac_prefs);
+       }
+       gtk_widget_show(submenu);
+       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
+       return FALSE;
+}
 
-static void set_trayicon_pixmap(TrayIconType icontype)
+static void set_trayicon_pixbuf(TrayIconType icontype)
 {
-       GdkPixmap *pixmap = NULL;
-       GdkBitmap *bitmap = NULL;
+       GdkPixbuf *pixbuf = NULL;
+       static GdkPixbuf *last_pixbuf = NULL;
 
        switch(icontype) {
        case TRAYICON_NEW:
-               pixmap = newmail_pixmap;
-               bitmap = newmail_bitmap;
+               pixbuf = newmail_pixbuf[prefs_common.work_offline];
+               break;
+       case TRAYICON_NEWMARKED:
+               pixbuf = newmarkedmail_pixbuf[prefs_common.work_offline];
                break;
        case TRAYICON_UNREAD:
+               pixbuf = unreadmail_pixbuf[prefs_common.work_offline];
+               break;
        case TRAYICON_UNREADMARKED:
-               pixmap = unreadmail_pixmap;
-               bitmap = unreadmail_bitmap;
+               pixbuf = unreadmarkedmail_pixbuf[prefs_common.work_offline];
                break;
        default:
-               pixmap = nomail_pixmap;
-               bitmap = nomail_bitmap;
+               pixbuf = nomail_pixbuf[prefs_common.work_offline];
                break;
        }
 
-       gtk_pixmap_set(GTK_PIXMAP(image), pixmap, bitmap);
-       gtk_widget_shape_combine_mask(GTK_WIDGET(trayicon), bitmap, GTK_WIDGET(image)->allocation.x, GTK_WIDGET(image)->allocation.y);
+       if (pixbuf == last_pixbuf) {
+               return;
+       }
+
+       gtk_status_icon_set_from_pixbuf(GTK_STATUS_ICON(trayicon), pixbuf);
+
+       last_pixbuf = pixbuf;
 }
 
-static void update(void)
+static void update(FolderItem *removed_item)
 {
-       gint new, unread, unreadmarked, total;
+       guint new, unread, unreadmarked, marked, total;
+       guint replied, forwarded, locked, ignored, watched;
        gchar *buf;
+       TrayIconType icontype = TRAYICON_NOTHING;
+
+       folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total,
+                               &replied, &forwarded, &locked, &ignored,
+                               &watched);
+       if (removed_item) {
+               total -= removed_item->total_msgs;
+               new -= removed_item->new_msgs;
+               unread -= removed_item->unread_msgs;
+       }
 
-       folder_count_total_msgs(&new, &unread, &unreadmarked, &total);
-       buf = g_strdup_printf("New %d, Unread: %d, Total: %d", new, unread, total);
+       buf = g_strdup_printf(_("New %d, Unread: %d, Total: %d"), new, unread, total);
 
-        gtk_tooltips_set_tip(tooltips, eventbox, buf, "");
+#if !(GTK_CHECK_VERSION(2,16,0))
+       gtk_status_icon_set_tooltip(trayicon, buf);
+#else
+       gtk_status_icon_set_tooltip_text(trayicon, buf);
+#endif
        g_free(buf);
 
-       set_trayicon_pixmap(new > 0 ? TRAYICON_NEW : (unread > 0 ? TRAYICON_UNREAD : TRAYICON_NOTHING));
+       if (new > 0 && unreadmarked > 0) {
+               icontype = TRAYICON_NEWMARKED;
+       } else if (new > 0) {
+               icontype = TRAYICON_NEW;
+       } else if (unreadmarked > 0) {
+               icontype = TRAYICON_UNREADMARKED;
+       } else if (unread > 0) {
+               icontype = TRAYICON_UNREAD;
+       }
+
+       set_trayicon_pixbuf(icontype);
 }
 
 static gboolean folder_item_update_hook(gpointer source, gpointer data)
 {
-       update();
+       update(NULL);
 
        return FALSE;
 }
 
-static gboolean click_cb(GtkWidget * widget,
-                        GdkEventButton * event, gpointer user_data)
+static gboolean folder_update_hook(gpointer source, gpointer data)
 {
-       MainWindow *mainwin;
+       FolderUpdateData *hookdata;
+       hookdata = source;
+       if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM)
+               update(hookdata->item);
+       else
+               update(NULL);
 
-       mainwin = mainwindow_get_mainwindow();
-       if (GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window))) {
-               main_window_hide(mainwin);
-       } else {
-               main_window_show(mainwin);
-        }
-       return TRUE;
+       return FALSE;
+}
+
+static gboolean offline_update_hook(gpointer source, gpointer data)
+{
+       update(NULL);
+       return FALSE;
 }
 
-static void resize_cb(GtkWidget *widget, GtkAllocation *allocation)
+static gboolean trayicon_close_hook(gpointer source, gpointer data)
 {
-       update();
+       if (source) {
+               gboolean *close_allowed = (gboolean*)source;
+
+               if (trayicon_prefs.close_to_tray) {
+                       MainWindow *mainwin = mainwindow_get_mainwindow();
+
+                       *close_allowed = FALSE;
+                       focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
+                       
+                       if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
+                               main_window_hide(mainwin);
+               }
+       }
+       return FALSE;
 }
 
-static void create_trayicon(void);
+static gboolean trayicon_got_iconified_hook(gpointer source, gpointer data)
+{
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+
+       if (trayicon_prefs.hide_when_iconified
+                       && gtk_widget_get_visible(GTK_WIDGET(mainwin->window))
+                       && !gtk_window_get_skip_taskbar_hint(GTK_WINDOW(mainwin->window))) {
+               focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
+               gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), TRUE);
+       }
+       return FALSE;
+}
 
-static void destroy_cb(GtkWidget *widget, gpointer *data)
+static void fix_folderview_scroll(MainWindow *mainwin)
 {
-       debug_print("Widget destroyed\n");
+       static gboolean fix_done = FALSE;
 
-       create_trayicon();
+       if (fix_done)
+               return;
+
+       gtk_widget_queue_resize(mainwin->folderview->ctree);
+
+       fix_done = TRUE;
 }
 
-static void create_trayicon()
+static gboolean click_cb(GtkWidget * widget,
+                        GdkEventButton * event, gpointer user_data)
 {
-#if 0
-       GtkPacker *packer;
-#endif
+       MainWindow *mainwin;
 
-        trayicon = egg_tray_icon_new("Sylpheed-Claws");
-//        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);
+       if (event == NULL) {
+               return TRUE;
+       }
 
-        PIXMAP_CREATE(GTK_WIDGET(trayicon), nomail_pixmap, nomail_bitmap, nomail_xpm);
-        PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmail_pixmap, unreadmail_bitmap, unreadmail_xpm);
-        PIXMAP_CREATE(GTK_WIDGET(trayicon), newmail_pixmap, newmail_bitmap, newmail_xpm);
+       mainwin = mainwindow_get_mainwindow();
 
-        eventbox = gtk_event_box_new();
-        gtk_container_set_border_width(GTK_CONTAINER(eventbox), 0);
-        gtk_container_add(GTK_CONTAINER(trayicon), GTK_WIDGET(eventbox));
+       switch (event->button) {
+       case 1:
+               if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window))) {
+                       if ((gdk_window_get_state(gtk_widget_get_window(
+                               GTK_WIDGET(mainwin->window)))&GDK_WINDOW_STATE_ICONIFIED)
+                                       || mainwindow_is_obscured()) {
+                               gtk_window_deiconify(GTK_WINDOW(mainwin->window));
+                               gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), FALSE);
+                               main_window_show(mainwin);
+                               gtk_window_present(GTK_WINDOW(mainwin->window));
+                               gtk_window_set_focus(GTK_WINDOW(mainwin->window), focused_widget);
+                       } else {
+                               focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
+                               main_window_hide(mainwin);
+                       }
+               } else {
+                       gtk_window_deiconify(GTK_WINDOW(mainwin->window));
+                       gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), FALSE);
+                       main_window_show(mainwin);
+                       gtk_window_present(GTK_WINDOW(mainwin->window));
+                       fix_folderview_scroll(mainwin);
+                       gtk_window_set_focus(GTK_WINDOW(mainwin->window), focused_widget);
+        }
+               break;
+       case 3:
+               /* tell callbacks to skip any event */
+               updating_menu = TRUE;
+               /* initialize checkitem according to current offline state */
+               cm_toggle_menu_set_active("TrayiconPopup/ToggleOffline", prefs_common.work_offline);
+               cm_menu_set_sensitive("TrayiconPopup/GetMail", mainwin->lock_count == 0);
+               updating_menu = FALSE;
+
+               gtk_menu_popup( GTK_MENU(traymenu_popup), NULL, NULL, NULL, NULL,
+                      event->button, event->time );
+               break;
+       default:
+               return TRUE;
+       }
+       return TRUE;
+}
 
-#warning FIXME_GTK2
-#if 0
-       packer = GTK_PACKER(gtk_packer_new());
-        gtk_container_add(GTK_CONTAINER(eventbox), GTK_WIDGET(packer));
-        gtk_container_set_border_width(GTK_CONTAINER(packer), 0);
+static void create_trayicon(void);
 
-        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);
-#else
-        image = gtk_pixmap_new(nomail_pixmap, nomail_bitmap);
-        gtk_container_add(GTK_CONTAINER(eventbox), image);
-#endif
+static gboolean trayicon_update_theme(gpointer source, gpointer data)
+{
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_NOMAIL, &nomail_pixbuf[0]);
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_UNREADMAIL, &unreadmail_pixbuf[0]);
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_NEWMAIL, &newmail_pixbuf[0]);
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL, &unreadmarkedmail_pixbuf[0]);
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_NEWMARKEDMAIL, &newmarkedmail_pixbuf[0]);
 
-       destroy_signal_id =
-       g_signal_connect(G_OBJECT(trayicon), "destroy",
-                        G_CALLBACK(destroy_cb), NULL);
-       g_signal_connect(G_OBJECT(trayicon), "size_allocate",
-                        G_CALLBACK(resize_cb), NULL);
-       g_signal_connect(G_OBJECT(eventbox), "button-press-event",
-                        G_CALLBACK(click_cb), NULL);
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_NOMAIL_OFFLINE, &nomail_pixbuf[1]);
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_UNREADMAIL_OFFLINE, &unreadmail_pixbuf[1]);
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_NEWMAIL_OFFLINE, &newmail_pixbuf[1]);
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL_OFFLINE, &unreadmarkedmail_pixbuf[1]);
+       stock_pixbuf_gdk(GTK_WIDGET(mainwin->window), STOCK_PIXMAP_TRAY_NEWMARKEDMAIL_OFFLINE, &newmarkedmail_pixbuf[1]);
 
-        tooltips = gtk_tooltips_new();
-        gtk_tooltips_set_delay(tooltips, 1000);
-        gtk_tooltips_enable(tooltips);
+       update(NULL);
 
-        gtk_widget_show_all(GTK_WIDGET(trayicon));
+       return FALSE;
+}
 
-       update();
+static void create_trayicon()
+{
+       GtkActionGroup *action_group;
+       trayicon = gtk_status_icon_new();
+       gtk_status_icon_set_title(GTK_STATUS_ICON(trayicon), _("Claws Mail"));
+       g_signal_connect(G_OBJECT(trayicon), "button-press-event",
+               G_CALLBACK(click_cb), NULL);
+
+       action_group = cm_menu_create_action_group("TrayiconPopup", trayicon_popup_menu_entries,
+                       G_N_ELEMENTS(trayicon_popup_menu_entries), (gpointer)NULL);
+       gtk_action_group_add_toggle_actions(action_group, trayicon_popup_toggle_menu_entries,
+                       G_N_ELEMENTS(trayicon_popup_toggle_menu_entries), (gpointer)NULL);
+
+       MENUITEM_ADDUI("/Menus", "TrayiconPopup", "TrayiconPopup", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "GetMail", "TrayiconPopup/GetMail", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "Separator1", "TrayiconPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "Email", "TrayiconPopup/Email", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "EmailAcc", "TrayiconPopup/EmailAcc", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "Separator2", "TrayiconPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "OpenAB", "TrayiconPopup/OpenAB", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "Separator3", "TrayiconPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "ToggleOffline", "TrayiconPopup/ToggleOffline", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "Separator4", "TrayiconPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI("/Menus/TrayiconPopup", "Exit", "TrayiconPopup/Exit", GTK_UI_MANAGER_MENUITEM)
+
+       traymenu_popup = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+                               gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/TrayiconPopup")) );
+
+       trayicon_update_theme(NULL, NULL);
 }
 
 int plugin_init(gchar **error)
 {
-       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
+       if (!check_plugin_version(MAKE_NUMERIC_VERSION(2,9,2,72),
+                               VERSION_NUMERIC, PLUGIN_NAME, error))
                return -1;
+
+       item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, folder_item_update_hook, NULL);
+       if (item_hook_id == -1) {
+               *error = g_strdup(_("Failed to register folder item update hook"));
+               goto err_out_item;
        }
 
-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
-               *error = g_strdup("Your sylpheed version is too old");
-               return -1;
+       folder_hook_id = hooks_register_hook (FOLDER_UPDATE_HOOKLIST, folder_update_hook, NULL);
+       if (folder_hook_id == -1) {
+               *error = g_strdup(_("Failed to register folder update hook"));
+               goto err_out_folder;
        }
 
-       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;
+       offline_hook_id = hooks_register_hook (OFFLINE_SWITCH_HOOKLIST, offline_update_hook, NULL);
+       if (offline_hook_id == -1) {
+               *error = g_strdup(_("Failed to register offline switch hook"));
+               goto err_out_offline;
+       }
+
+       account_hook_id = hooks_register_hook (ACCOUNT_LIST_CHANGED_HOOKLIST, trayicon_set_accounts_hook, NULL);
+       if (account_hook_id == -1) {
+               *error = g_strdup(_("Failed to register account list changed hook"));
+               goto err_out_account;
+       }
+
+       close_hook_id = hooks_register_hook (MAIN_WINDOW_CLOSE, trayicon_close_hook, NULL);
+       if (close_hook_id == -1) {
+               *error = g_strdup(_("Failed to register close hook"));
+               goto err_out_close;
+       }
+
+       iconified_hook_id = hooks_register_hook (MAIN_WINDOW_GOT_ICONIFIED, trayicon_got_iconified_hook, NULL);
+       if (iconified_hook_id == -1) {
+               *error = g_strdup(_("Failed to register got iconified hook"));
+               goto err_out_iconified;
+       }
+
+       theme_hook_id = hooks_register_hook(THEME_CHANGED_HOOKLIST, trayicon_update_theme, NULL);
+       if (theme_hook_id == -1) {
+               *error = g_strdup(_("Failed to register theme change hook"));
+               goto err_out_theme;
        }
 
        create_trayicon();
+       trayicon_set_accounts_hook(NULL, NULL);
+
+       trayicon_prefs_init();
 
-        return 0;
+       if (trayicon_prefs.hide_at_startup && claws_is_starting()) {
+               MainWindow *mainwin = mainwindow_get_mainwindow();
+
+               if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
+                       main_window_hide(mainwin);
+               main_set_show_at_startup(FALSE);
+       }
+
+       return 0;
+
+err_out_theme:
+       hooks_unregister_hook(MAIN_WINDOW_GOT_ICONIFIED, iconified_hook_id);
+err_out_iconified:
+       hooks_unregister_hook(MAIN_WINDOW_CLOSE, close_hook_id);
+err_out_close:
+       hooks_unregister_hook(ACCOUNT_LIST_CHANGED_HOOKLIST, account_hook_id);
+err_out_account:
+       hooks_unregister_hook(OFFLINE_SWITCH_HOOKLIST, offline_hook_id);
+err_out_offline:
+       hooks_unregister_hook(FOLDER_UPDATE_HOOKLIST, folder_hook_id);
+err_out_folder:
+       hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, item_hook_id);
+err_out_item:
+       return -1;
 }
 
-void plugin_done(void)
+gboolean plugin_done(void)
 {
-       g_signal_handler_disconnect(G_OBJECT(trayicon), destroy_signal_id);
+       trayicon_prefs_done();
+
+       hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, item_hook_id);
+       hooks_unregister_hook(FOLDER_UPDATE_HOOKLIST, folder_hook_id);
+       hooks_unregister_hook(OFFLINE_SWITCH_HOOKLIST, offline_hook_id);
+       hooks_unregister_hook(ACCOUNT_LIST_CHANGED_HOOKLIST, account_hook_id);
+       hooks_unregister_hook(MAIN_WINDOW_CLOSE, close_hook_id);
+       hooks_unregister_hook(MAIN_WINDOW_GOT_ICONIFIED, iconified_hook_id);
+       hooks_unregister_hook(THEME_CHANGED_HOOKLIST, theme_hook_id);
 
-       gtk_widget_destroy(GTK_WIDGET(trayicon));
-       hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, hook_id);
+       if (claws_is_exiting())
+               return TRUE;
 
-       while (gtk_events_pending())
-               gtk_main_iteration();           
+       gtk_status_icon_set_visible(trayicon, FALSE);
+       g_object_unref(G_OBJECT(trayicon));
+       trayicon = NULL;
+
+       while (gtk_events_pending()) {
+               gtk_main_iteration();
+       }
+       return TRUE;
 }
 
 const gchar *plugin_name(void)
 {
-       return gettext("Trayicon");
+       return PLUGIN_NAME;
 }
 
 const gchar *plugin_desc(void)
 {
-       return gettext("This plugin places a mailbox icon in the system tray that "
+       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 "
@@ -237,5 +499,93 @@ const gchar *plugin_desc(void)
 
 const gchar *plugin_type(void)
 {
-       return "GTK";
+       return "GTK2";
+}
+
+const gchar *plugin_licence(void)
+{
+       return "GPL3+";
+}
+
+const gchar *plugin_version(void)
+{
+       return VERSION;
+}
+
+
+/* popup menu callbacks */
+static void trayicon_get_all_cb( GtkAction *action, gpointer data )
+{
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+       inc_all_account_mail_cb(mainwin, 0, NULL);
+}
+
+static void trayicon_compose_cb( GtkAction *action, gpointer data )
+{
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+       compose_mail_cb(mainwin, 0, NULL);
+}
+
+static void trayicon_compose_acc_cb( GtkMenuItem *menuitem, gpointer data )
+{
+       compose_new((PrefsAccount *)data, NULL, NULL);
+}
+
+static void trayicon_addressbook_cb( GtkAction *action, gpointer data )
+{
+#ifndef USE_NEW_ADDRBOOK
+       addressbook_open(NULL);
+#else
+       GError* error = NULL;
+       addressbook_dbus_open(FALSE, &error);
+       if (error) {
+               g_warning("%s", error->message);
+               g_error_free(error);
+       }
+#endif
+}
+
+static void trayicon_toggle_offline_cb( GtkAction *action, gpointer data )
+{
+       /* toggle offline mode if menu checkitem has been clicked */
+       if (!updating_menu) {
+               MainWindow *mainwin = mainwindow_get_mainwindow();
+               main_window_toggle_work_offline(mainwin, !prefs_common.work_offline, TRUE);
+       }
+}
+
+static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       if (prefs_common.clean_on_exit) {
+               if (!main_window_empty_trash(mainwin, prefs_common.ask_on_clean, TRUE))
+                       return;
+       }
+
+       if (prefs_common.confirm_on_exit) {
+               if (alertpanel(_("Exit"), _("Exit Claws Mail?"),
+                              GTK_STOCK_CANCEL, GTK_STOCK_OK,
+                              NULL) != G_ALERTALTERNATE) {
+                       return;
+               }
+               manage_window_focus_in(mainwin->window, NULL, NULL);
+       }
+
+       app_will_exit(NULL, mainwin);
+}
+
+static void trayicon_exit_cb( GtkAction *action, gpointer data )
+{
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+
+       if (mainwin->lock_count == 0) {
+               app_exit_cb(mainwin, 0, NULL);
+       }
+}
+
+struct PluginFeature *plugin_provides(void)
+{
+       static struct PluginFeature features[] = 
+               { {PLUGIN_NOTIFIER, N_("Trayicon")},
+                 {PLUGIN_NOTHING, NULL}};
+       return features;
 }