2005-12-06 [paul] 1.9.100cvs69

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

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index d8eee2b8a1c791a1b64fea400a433486492b2ce6..7c1788efa7ae63ee64d2a48c6bc040c918ad0cc3 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -81,7 +81,6 @@ typedef enum
        TRAYICON_NOTHING
 } TrayIconType;
 
-static void trayicon_get_cb        (gpointer data, guint action, GtkWidget *widget);
 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_addressbook_cb (gpointer data, guint action, GtkWidget *widget);
@@ -91,15 +90,14 @@ static void resize_cb                   (GtkWidget *widget, GtkRequisition *req, gpointer use
 
 static GtkItemFactoryEntry trayicon_popup_menu_entries[] =
 {
-       {N_("/_Get"),                   NULL, trayicon_get_cb,                  0, NULL},
-       {N_("/Get _All"),               NULL, trayicon_get_all_cb,              0, NULL},
+       {N_("/_Get Mail"),              NULL, trayicon_get_all_cb,              0, NULL},
        {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
        {N_("/_Email"),                 NULL, trayicon_compose_cb,              0, NULL},
        {N_("/Open A_ddressbook"),      NULL, trayicon_addressbook_cb,          0, NULL},
        {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
        {N_("/_Work Offline"),          NULL, trayicon_toggle_offline_cb,       0, "<CheckItem>"},
        {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
-       {N_("/E_xit Sylpheed"),         NULL, trayicon_exit_cb,                 0, NULL}
+       {N_("/E_xit Sylpheed-Claws"),   NULL, trayicon_exit_cb,                 0, NULL}
 };
 
 static void set_trayicon_pixmap(TrayIconType icontype)
@@ -203,7 +201,7 @@ static gboolean click_cb(GtkWidget * widget,
                /* initialize checkitem according to current offline state */
                gtk_check_menu_item_set_active(
                        GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item(traymenu_factory,
-                       _("/Offline"))), prefs_common.work_offline);
+                       _("/Work Offline"))), prefs_common.work_offline);
                updating_menu = FALSE;
 
                gtk_menu_popup( GTK_MENU(traymenu_popup), NULL, NULL, NULL, NULL,
@@ -275,12 +273,12 @@ static void create_trayicon()
 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");
+               *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the Trayicon plugin was built with");
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
-               *error = g_strdup("Your sylpheed version is too old");
+               *error = g_strdup("Your version of Sylpheed-Claws is too old for the Trayicon plugin");
                return -1;
        }
 
@@ -328,12 +326,6 @@ const gchar *plugin_type(void)
 }
 
 /* popup menu callbacks */
-static void trayicon_get_cb( gpointer data, guint action, GtkWidget *widget )
-{
-       MainWindow *mainwin = mainwindow_get_mainwindow();
-       inc_mail_cb(mainwin, 0, NULL);
-}
-
 static void trayicon_get_all_cb( gpointer data, guint action, GtkWidget *widget )
 {
        MainWindow *mainwin = mainwindow_get_mainwindow();