gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2005-10-10 [colin] 1.9.15cvs27

Browse source 
* src/export.c
	* src/import.c
		Fix compile on gtk 2.4. Patch by wwp
This commit is contained in:
Colin Leroy 2005-10-10 16:50:52 +00:00
parent b1861ab461
commit e1ca9855b2
5 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog-gtk2.claws
View file

@ -1,3 +1,9 @@
2005-10-10 [colin] 1.9.15cvs27
* src/export.c
* src/import.c
Fix compile on gtk 2.4. Patch by wwp
2005-10-09 [colin] 1.9.15cvs26
* src/mainwindow.c

1
PATCHSETS
View file

@ -863,3 +863,4 @@
( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/wizard.c; ) > 1.9.15cvs24.patchset
( cvs diff -u -r 1.382.2.180 -r 1.382.2.181 src/compose.c; cvs diff -u -r 1.50.2.14 -r 1.50.2.15 src/compose.h; ) > 1.9.15cvs25.patchset
( cvs diff -u -r 1.274.2.70 -r 1.274.2.71 src/mainwindow.c; cvs diff -u -r 1.94.2.66 -r 1.94.2.67 src/messageview.c; cvs diff -u -r 1.395.2.133 -r 1.395.2.134 src/summaryview.c; ) > 1.9.15cvs26.patchset
( cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/export.c; cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/import.c; ) > 1.9.15cvs27.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=15
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=26
EXTRA_VERSION=27
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

11
src/export.c
View file

@ -187,18 +187,25 @@ static void export_create(void)
gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, 1, 2,
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
/* XXX GTK 2.6: GTK_STOCK_DIRECTORY */
#if GTK_CHECK_VERSION(2, 6, 0)
src_button = gtk_button_new_with_mnemonic(_("_Browse"));
gtk_button_set_image((GtkButton*)src_button,
gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON));
#else
src_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
#endif
gtk_table_attach(GTK_TABLE(table), src_button, 2, 3, 0, 1,
0, 0, 0, 0);
g_signal_connect(G_OBJECT(src_button), "clicked",
G_CALLBACK(export_srcsel_cb), NULL);
#if GTK_CHECK_VERSION(2, 6, 0)
file_button = gtk_button_new_with_mnemonic(_("B_rowse"));
gtk_button_set_image((GtkButton*)file_button,
gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
#else
file_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
#endif
gtk_table_attach(GTK_TABLE(table), file_button, 2, 3, 1, 2,
0, 0, 0, 0);
g_signal_connect(G_OBJECT(file_button), "clicked",

11
src/import.c
View file

@ -193,18 +193,25 @@ static void import_create(void)
gtk_table_attach(GTK_TABLE(table), dest_entry, 1, 2, 1, 2,
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
#if GTK_CHECK_VERSION(2, 6, 0)
file_button = gtk_button_new_with_mnemonic(_("_Browse"));
gtk_button_set_image((GtkButton*)file_button,
gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
#else
file_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
#endif
gtk_table_attach(GTK_TABLE(table), file_button, 2, 3, 0, 1,
0, 0, 0, 0);
g_signal_connect(G_OBJECT(file_button), "clicked",
G_CALLBACK(import_filesel_cb), NULL);
/* XXX GTK 2.6: GTK_STOCK_DIRECTORY */
#if GTK_CHECK_VERSION(2, 6, 0)
dest_button = gtk_button_new_with_mnemonic(_("B_rowse"));
gtk_button_set_image((GtkButton*)dest_button,
gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON));
#else
dest_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
#endif
gtk_table_attach(GTK_TABLE(table), dest_button, 2, 3, 1, 2,
0, 0, 0, 0);
g_signal_connect(G_OBJECT(dest_button), "clicked",