talons

commit 106dd17f2fb1db004ece0b282336388425af5646
parent e15b80be44c6d620d7e377ef2a3cf04b3d43937e
Author: Colin Leroy <colin@colino.net>
Date:   Mon,  7 Jul 2008 17:44:20 +0000

2008-07-07 [colin]	3.5.0cvs18

	* src/mainwindow.c
	* src/prefs_toolbar.c
	* src/stock_pixmap.c
		Finish fixing bug 1609, 'Icon issues'

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
2
+-
M
src/prefs_toolbar.c
 | 
1
+
M
src/stock_pixmap.c
 | 
12
++++++------

6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-07 [colin]	3.5.0cvs18
+
+	* src/mainwindow.c
+	* src/prefs_toolbar.c
+	* src/stock_pixmap.c
+		Finish fixing bug 1609, 'Icon issues'
+
 2008-07-07 [colin]	3.5.0cvs17
 
 	* src/prefs_common.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3429,3 +3429,4 @@
 ( cvs diff -u -r 1.100.2.62 -r 1.100.2.63 AUTHORS;  cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/gtk/authors.h;  cvs diff -u -r 1.204.2.173 -r 1.204.2.174 src/prefs_common.c;  cvs diff -u -r 1.103.2.110 -r 1.103.2.111 src/prefs_common.h;  cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.371 -r 1.395.2.372 src/summaryview.c;  cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/gtk/authors.h;  ) > 3.5.0cvs15.patchset
 ( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/prefs_summaries.c;  ) > 3.5.0cvs16.patchset
 ( cvs diff -u -r 1.204.2.174 -r 1.204.2.175 src/prefs_common.c;  ) > 3.5.0cvs17.patchset
+( cvs diff -u -r 1.274.2.249 -r 1.274.2.250 src/mainwindow.c;  cvs diff -u -r 1.30.2.51 -r 1.30.2.52 src/prefs_toolbar.c;  cvs diff -u -r 1.25.2.57 -r 1.25.2.58 src/stock_pixmap.c;  ) > 3.5.0cvs18.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3864,7 +3864,7 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
 	mainwin = (MainWindow *) data;
 	
 	ifactory = gtk_item_factory_from_widget(mainwin->menubar);
-	menuitem = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_widget(ifactory, "/File/Work offline"));
+	menuitem = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_widget(ifactory, "/File/Offline mode"));
 	
 	g_return_if_fail(mainwin != NULL);
 	g_return_if_fail(menuitem != NULL);
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -141,6 +141,7 @@ static const gint ToolbarIcons[] =
 	STOCK_PIXMAP_HAM_BTN,
 	STOCK_PIXMAP_TRASH,
 	STOCK_PIXMAP_DELETE,
+	STOCK_PIXMAP_CANCEL,
 	STOCK_PIXMAP_EMPTY,              /* last entry */
 };
 
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -366,7 +366,7 @@ static StockPixmapData pixmaps[] =
 	{claws_mail_icon_xpm			, NULL, NULL, "claws_mail_icon", NULL},
 	{read_xpm				, NULL, NULL, "read", NULL},
 	{delete_btn_xpm				, NULL, NULL, "delete_btn", NULL},
-	{cancel_xpm				, NULL, NULL, "cancel_btn", NULL},
+	{cancel_xpm				, NULL, NULL, "cancel", NULL},
 	{trash_btn_xpm				, NULL, NULL, "trash_btn", NULL},
 #ifndef GENERIC_UMPC
 	{claws_mail_logo_xpm			, NULL, NULL, "claws_mail_logo", NULL},
@@ -381,15 +381,15 @@ static StockPixmapData pixmaps[] =
 	{copied_xpm				, NULL, NULL, "copied", NULL},
 	{selection_xpm				, NULL, NULL, "selection", NULL},
 	{watchthread_xpm			, NULL, NULL, "watchthread", NULL},
-	{tray_newmail_offline_xpm		, NULL, NULL, "tray_newmail_offline", NULL},
+	{tray_newmail_offline_xpm		, NULL, NULL, "tray_newmail.offline", NULL},
 	{tray_newmail_xpm			, NULL, NULL, "tray_newmail", NULL},
-	{tray_newmarkedmail_offline_xpm		, NULL, NULL, "tray_newmarkedmail_offline", NULL},
+	{tray_newmarkedmail_offline_xpm		, NULL, NULL, "tray_newmarkedmail.offline", NULL},
 	{tray_newmarkedmail_xpm			, NULL, NULL, "tray_newmarkedmail", NULL},
-	{tray_nomail_offline_xpm		, NULL, NULL, "tray_nomail_offline", NULL},
+	{tray_nomail_offline_xpm		, NULL, NULL, "tray_nomail.offline", NULL},
 	{tray_nomail_xpm			, NULL, NULL, "tray_nomail", NULL},
-	{tray_unreadmail_offline_xpm		, NULL, NULL, "tray_unreadmail_offline", NULL},
+	{tray_unreadmail_offline_xpm		, NULL, NULL, "tray_unreadmail.offline", NULL},
 	{tray_unreadmail_xpm			, NULL, NULL, "tray_unreadmail", NULL},
-	{tray_unreadmarkedmail_offline_xpm	, NULL, NULL, "tray_unreadmarkedmail_offline", NULL},
+	{tray_unreadmarkedmail_offline_xpm	, NULL, NULL, "tray_unreadmarkedmail.offline", NULL},
 	{tray_unreadmarkedmail_xpm		, NULL, NULL, "tray_unreadmarkedmail", NULL},
         {empty_xpm                              , NULL, NULL, "empty" , NULL}
 };