/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
#include "alertpanel.h"
#include "account.h"
#include "gtk/manage_window.h"
+#ifdef USE_NEW_ADDRBOOK
+ #include "addressbook-dbus.h"
+#endif
-#include "eggtrayicon.h"
+#include "trayicon_prefs.h"
-#include "newmarkedmail.xpm"
-#include "unreadmarkedmail.xpm"
-#include "newmail.xpm"
-#include "unreadmail.xpm"
-#include "nomail.xpm"
-#include "newmarkedmail.offline.xpm"
-#include "unreadmarkedmail.offline.xpm"
-#include "newmail.offline.xpm"
-#include "unreadmail.offline.xpm"
-#include "nomail.offline.xpm"
+#include "stock_pixmap.h"
#define PLUGIN_NAME (_("Trayicon"))
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 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 GdkPixmap *newmail_pixmap[2];
-static GdkPixmap *newmail_bitmap[2];
-static GdkPixmap *unreadmail_pixmap[2];
-static GdkPixmap *unreadmail_bitmap[2];
-static GdkPixmap *newmarkedmail_pixmap[2];
-static GdkPixmap *newmarkedmail_bitmap[2];
-static GdkPixmap *unreadmarkedmail_pixmap[2];
-static GdkPixmap *unreadmarkedmail_bitmap[2];
-static GdkPixmap *nomail_pixmap[2];
-static GdkPixmap *nomail_bitmap[2];
-
-static EggTrayIcon *trayicon;
-static GtkWidget *eventbox;
-static GtkWidget *image;
-static GtkTooltips *tooltips;
static GtkWidget *traymenu_popup;
-static GtkItemFactory *traymenu_factory;
static gboolean updating_menu = FALSE;
-guint destroy_signal_id;
-
typedef enum
{
TRAYICON_NEW,
TRAYICON_NOTHING
} TrayIconType;
-static void trayicon_get_all_cb (gpointer data, guint action, GtkWidget *widget);
-static void trayicon_compose_cb (gpointer data, guint action, GtkWidget *widget);
+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 (gpointer data, guint action, GtkWidget *widget);
-static void trayicon_exit_cb (gpointer data, guint action, GtkWidget *widget);
-static void trayicon_toggle_offline_cb (gpointer data, guint action, GtkWidget *widget);
-static void resize_cb (GtkWidget *widget, GtkRequisition *req, gpointer user_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 GtkItemFactoryEntry trayicon_popup_menu_entries[] =
+static GtkActionEntry trayicon_popup_menu_entries[] =
{
- {N_("/_Get Mail"), NULL, trayicon_get_all_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/_Email"), NULL, trayicon_compose_cb, 0, NULL},
- {N_("/_Email from account"), NULL, NULL, 0, "<Branch>"},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/Open A_ddressbook"), NULL, trayicon_addressbook_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/_Work Offline"), NULL, trayicon_toggle_offline_cb, 0, "<CheckItem>"},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/E_xit Claws Mail"), NULL, trayicon_exit_cb, 0, NULL}
+ {"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, *cur_item = NULL;
- GtkWidget *menu;
+ GList *cur_ac;
+ GtkWidget *menu, *submenu;
GtkWidget *menuitem;
PrefsAccount *ac_prefs;
GList *account_list = account_get_list();
- menu = gtk_item_factory_get_widget(traymenu_factory,
- "/Email from account");
-
- /* destroy all previous menu item */
- cur_item = GTK_MENU_SHELL(menu)->children;
- while (cur_item != NULL) {
- GList *next = cur_item->next;
- gtk_widget_destroy(GTK_WIDGET(cur_item->data));
- cur_item = next;
- }
+ 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;
(ac_prefs->account_name ? ac_prefs->account_name
: _("Untitled"));
gtk_widget_show(menuitem);
- gtk_menu_append(GTK_MENU(menu), 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;
- static GdkPixmap *last_pixmap = NULL;
+ GdkPixbuf *pixbuf = NULL;
+ static GdkPixbuf *last_pixbuf = NULL;
switch(icontype) {
case TRAYICON_NEW:
- pixmap = newmail_pixmap[prefs_common.work_offline];
- bitmap = newmail_bitmap[prefs_common.work_offline];
+ pixbuf = newmail_pixbuf[prefs_common.work_offline];
break;
case TRAYICON_NEWMARKED:
- pixmap = newmarkedmail_pixmap[prefs_common.work_offline];
- bitmap = newmarkedmail_bitmap[prefs_common.work_offline];
+ pixbuf = newmarkedmail_pixbuf[prefs_common.work_offline];
break;
case TRAYICON_UNREAD:
- pixmap = unreadmail_pixmap[prefs_common.work_offline];
- bitmap = unreadmail_bitmap[prefs_common.work_offline];
+ pixbuf = unreadmail_pixbuf[prefs_common.work_offline];
break;
case TRAYICON_UNREADMARKED:
- pixmap = unreadmarkedmail_pixmap[prefs_common.work_offline];
- bitmap = unreadmarkedmail_bitmap[prefs_common.work_offline];
+ pixbuf = unreadmarkedmail_pixbuf[prefs_common.work_offline];
break;
default:
- pixmap = nomail_pixmap[prefs_common.work_offline];
- bitmap = nomail_bitmap[prefs_common.work_offline];
+ pixbuf = nomail_pixbuf[prefs_common.work_offline];
break;
}
- if (pixmap == last_pixmap) {
+ if (pixbuf == last_pixbuf) {
return;
}
- gtk_image_set_from_pixmap(GTK_IMAGE(image), pixmap, bitmap);
+ gtk_status_icon_set_from_pixbuf(GTK_STATUS_ICON(trayicon), pixbuf);
- last_pixmap = pixmap;
+ last_pixbuf = pixbuf;
}
static void update(FolderItem *removed_item)
{
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);
+ 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;
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);
if (new > 0 && unreadmarked > 0) {
icontype = TRAYICON_UNREAD;
}
- set_trayicon_pixmap(icontype);
+ set_trayicon_pixbuf(icontype);
}
static gboolean folder_item_update_hook(gpointer source, gpointer data)
return FALSE;
}
-static void resize_cb(GtkWidget *widget, GtkRequisition *req,
- gpointer user_data)
+static gboolean trayicon_close_hook(gpointer source, gpointer data)
{
- update(NULL);
+ 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 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 fix_folderview_scroll(MainWindow *mainwin)
+{
+ static gboolean fix_done = FALSE;
+
+ if (fix_done)
+ return;
+
+ gtk_widget_queue_resize(mainwin->folderview->ctree);
+
+ fix_done = TRUE;
}
static gboolean click_cb(GtkWidget * widget,
switch (event->button) {
case 1:
- if (GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window))) {
- main_window_hide(mainwin);
+ 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 */
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item(traymenu_factory,
- _("/Work Offline"))), prefs_common.work_offline);
- gtk_widget_set_sensitive(
- GTK_WIDGET(gtk_item_factory_get_item(traymenu_factory,
- _("/Get Mail"))), mainwin->lock_count == 0);
+ 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,
static void create_trayicon(void);
-static void destroy_cb(GtkWidget *widget, gpointer *data)
+static gboolean trayicon_update_theme(gpointer source, gpointer data)
{
- debug_print("Widget destroyed\n");
+ 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]);
+
+ 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]);
- create_trayicon();
+ update(NULL);
+
+ return FALSE;
}
static void create_trayicon()
{
- gint n_entries = 0;
-
- trayicon = egg_tray_icon_new("Claws Mail");
- 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);
-
- PIXMAP_CREATE(GTK_WIDGET(trayicon), nomail_pixmap[0], nomail_bitmap[0], nomail_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmail_pixmap[0], unreadmail_bitmap[0], unreadmail_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), newmail_pixmap[0], newmail_bitmap[0], newmail_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmarkedmail_pixmap[0], unreadmarkedmail_bitmap[0], unreadmarkedmail_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), newmarkedmail_pixmap[0], newmarkedmail_bitmap[0], newmarkedmail_xpm);
-
- PIXMAP_CREATE(GTK_WIDGET(trayicon), nomail_pixmap[1], nomail_bitmap[1], nomail_offline_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmail_pixmap[1], unreadmail_bitmap[1], unreadmail_offline_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), newmail_pixmap[1], newmail_bitmap[1], newmail_offline_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmarkedmail_pixmap[1], unreadmarkedmail_bitmap[1], unreadmarkedmail_offline_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), newmarkedmail_pixmap[1], newmarkedmail_bitmap[1], newmarkedmail_offline_xpm);
-
-
- eventbox = gtk_event_box_new();
- gtk_container_set_border_width(GTK_CONTAINER(eventbox), 0);
- gtk_container_add(GTK_CONTAINER(trayicon), GTK_WIDGET(eventbox));
-
- image = gtk_image_new_from_pixmap(nomail_pixmap[0], nomail_bitmap[0]);
- gtk_container_add(GTK_CONTAINER(eventbox), image);
-
- destroy_signal_id =
- g_signal_connect(G_OBJECT(trayicon), "destroy",
- G_CALLBACK(destroy_cb), NULL);
- g_signal_connect(GTK_OBJECT(trayicon), "size-request",
- G_CALLBACK(resize_cb), NULL);
- g_signal_connect(G_OBJECT(eventbox), "button-press-event",
+ 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);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_enable(tooltips);
-
- n_entries = sizeof(trayicon_popup_menu_entries) /
- sizeof(trayicon_popup_menu_entries[0]);
- traymenu_popup = menu_create_items(trayicon_popup_menu_entries,
- n_entries, "<TrayiconMenu>", &traymenu_factory,
- NULL);
-
- gtk_widget_show_all(GTK_WIDGET(trayicon));
-
- update(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 (!check_plugin_version(MAKE_NUMERIC_VERSION(0, 9, 3, 86),
+ 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"));
- return -1;
+ goto err_out_item;
}
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"));
- return -1;
+ goto err_out_folder;
}
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"));
- return -1;
+ goto err_out_offline;
}
account_hook_id = hooks_register_hook (ACCOUNT_LIST_CHANGED_HOOKLIST, trayicon_set_accounts_hook, NULL);
- if (offline_hook_id == -1) {
- *error = g_strdup(_("Failed to register offline switch hook"));
- return -1;
+ 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();
+
+ 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)
{
+ 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);
if (claws_is_exiting())
- return;
+ return TRUE;
- g_signal_handler_disconnect(G_OBJECT(trayicon), destroy_signal_id);
-
- gtk_widget_destroy(GTK_WIDGET(trayicon));
+ 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)
const gchar *plugin_licence(void)
{
- return "GPL";
+ return "GPL3+";
}
const gchar *plugin_version(void)
/* popup menu callbacks */
-static void trayicon_get_all_cb( gpointer data, guint action, GtkWidget *widget )
+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( gpointer data, guint action, GtkWidget *widget )
+static void trayicon_compose_cb( GtkAction *action, gpointer data )
{
MainWindow *mainwin = mainwindow_get_mainwindow();
compose_mail_cb(mainwin, 0, NULL);
compose_new((PrefsAccount *)data, NULL, NULL);
}
-static void trayicon_addressbook_cb( gpointer data, guint action, GtkWidget *widget )
+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( gpointer data, guint action, GtkWidget *widget )
+static void trayicon_toggle_offline_cb( GtkAction *action, gpointer data )
{
/* toggle offline mode if menu checkitem has been clicked */
if (!updating_menu) {
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 this program?"),
+ if (alertpanel(_("Exit"), _("Exit Claws Mail?"),
GTK_STOCK_CANCEL, GTK_STOCK_OK,
NULL) != G_ALERTALTERNATE) {
return;
app_will_exit(NULL, mainwin);
}
-static void trayicon_exit_cb( gpointer data, guint action, GtkWidget *widget )
+static void trayicon_exit_cb( GtkAction *action, gpointer data )
{
MainWindow *mainwin = mainwindow_get_mainwindow();
projects / claws.git / blobdiff