2006-08-16 [paul] 2.4.0cvs53
authorPaul Mangan <paul@claws-mail.org>
Wed, 16 Aug 2006 08:59:53 +0000 (08:59 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 16 Aug 2006 08:59:53 +0000 (08:59 +0000)
* configure.ac
* src/account.c
* src/addressbook.c
* src/headerview.c
* src/prefs_account.c
* src/prefs_message.c
* src/gtk/gtkutils.c
bump up minimum required versions of GTK+ and
GLIB to 2.6.0

ChangeLog
PATCHSETS
configure.ac
src/account.c
src/addressbook.c
src/gtk/gtkutils.c
src/headerview.c
src/prefs_account.c
src/prefs_message.c

index e3b224623bfabb4a75e3fb3356112319b1578755..c4672ea63b4e75f6c70aa4e7ffc0bb4d930ec62f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-08-16 [paul]      2.4.0cvs53
+
+       * configure.ac
+       * src/account.c
+       * src/addressbook.c
+       * src/headerview.c
+       * src/prefs_account.c
+       * src/prefs_message.c
+       * src/gtk/gtkutils.c
+               bump up minimum required versions of GTK+ and
+               GLIB to 2.6.0
+
 2006-08-16 [paul]      2.4.0cvs52
 
        * src/toolbar.c
index fb9c8d33064b3dfc5c759e69b0eaf2591c883848..4e5c30fc01dffa88952f6f28ccb40772e228061c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.5.2.35 -r 1.5.2.36 src/gtk/gtkutils.c;  cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/passphrase.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/plugin.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/prefs_gpg.h;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/sgpgme.h;  ) > 2.4.0cvs50.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/plugins/pgpcore/sgpgme.c;  ) > 2.4.0cvs51.patchset
 ( cvs diff -u -r 1.43.2.49 -r 1.43.2.50 src/toolbar.c;  ) > 2.4.0cvs52.patchset
+( cvs diff -u -r 1.654.2.1791 -r 1.654.2.1792 configure.ac;  cvs diff -u -r 1.61.2.49 -r 1.61.2.50 src/account.c;  cvs diff -u -r 1.60.2.60 -r 1.60.2.61 src/addressbook.c;  cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/headerview.c;  cvs diff -u -r 1.105.2.65 -r 1.105.2.66 src/prefs_account.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_message.c;  cvs diff -u -r 1.5.2.36 -r 1.5.2.37 src/gtk/gtkutils.c;  ) > 2.4.0cvs53.patchset
index a08ff9e027ce68cc4fdc6531fa2cfc614f953efa..837a92012910fe660797e9f5f72d7357e254702a 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=52
+EXTRA_VERSION=53
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -299,7 +299,7 @@ dnl ** common code **
 dnl *****************
 
 dnl check for glib
-AM_PATH_GLIB_2_0(2.0.0,,
+AM_PATH_GLIB_2_0(2.6.0,,
        AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
        gmodule gobject gthread)
 
@@ -389,7 +389,7 @@ dnl ** GTK user interface **
 dnl ************************
 
 dnl Checks for GTK
-AM_PATH_GTK_2_0(2.4.0,,
+AM_PATH_GTK_2_0(2.6.0,,
        AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
 
 dnl --disable-deprecated switch for GTK2 purification
index 2cbb4a84dc500de4fe63b7071138c8713faf10f9..54fc31ddaba4865732a4168886bcb8f25847287e 100644 (file)
@@ -729,11 +729,7 @@ static void account_edit_create(void)
        g_signal_connect (G_OBJECT(add_btn), "clicked",
                          G_CALLBACK (account_add), NULL);
 
-#if GTK_CHECK_VERSION(2, 6, 0)
        edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
-#else
-       edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
-#endif
        gtk_widget_show (edit_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), edit_btn, FALSE, FALSE, 4);
        g_signal_connect (G_OBJECT(edit_btn), "clicked",
index 60074e11a6a48cabc8390c9a16f88af6dc070b9c..d0ddb3b7de29b62ad661ab8c3ad0f1f4984fbc8f 100644 (file)
@@ -1004,11 +1004,7 @@ static void addressbook_create(void)
 
        gtkut_stock_button_add_help(hbbox, &help_btn);
 
-#if GTK_CHECK_VERSION(2, 6, 0)
        edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
-#else
-       edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
-#endif
        GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
        del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
index 10f539626d480d04f3818b9b97525b148590b265..3ccef3b54358ab532adb99d294ef9b9006cb0b28 100644 (file)
@@ -948,30 +948,10 @@ GtkWidget *gtkut_get_browse_file_btn(const gchar *button_label)
 {
        GtkWidget *button;
 
-#if GTK_CHECK_VERSION(2, 6, 0)
        button = gtk_button_new_with_mnemonic(button_label);
        gtk_button_set_image(GTK_BUTTON(button),
                gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON));
-#else
-       GtkWidget* image;
-       GtkWidget* box;
-       GtkWidget* label;
 
-       button = gtk_button_new();
-       box = gtk_hbox_new(FALSE, 0);
-
-       image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
-       label = gtk_label_new(NULL);
-       gtk_label_set_text_with_mnemonic(GTK_LABEL(label), button_label);
-       gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
-
-       gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 1);
-       gtk_box_pack_end(GTK_BOX(box), label, FALSE, FALSE, 1);
-       gtk_widget_show(label);
-       gtk_widget_show(image);
-       gtk_widget_show(box);
-       gtk_container_add(GTK_CONTAINER(button), box);
-#endif
        return button;
 }
 
@@ -982,30 +962,10 @@ GtkWidget *gtkut_get_browse_directory_btn(const gchar *button_label)
 {
        GtkWidget *button;
 
-#if GTK_CHECK_VERSION(2, 6, 0)
        button = gtk_button_new_with_mnemonic(button_label);
        gtk_button_set_image(GTK_BUTTON(button),
                gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON));
-#else
-       GtkWidget* image;
-       GtkWidget* box;
-       GtkWidget* label;
-
-       button = gtk_button_new();
-       box = gtk_hbox_new(FALSE, 0);
-
-       image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
-       label = gtk_label_new(NULL);
-       gtk_label_set_text_with_mnemonic(GTK_LABEL(label), button_label);
-       gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
 
-       gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 1);
-       gtk_box_pack_end(GTK_BOX(box), label, FALSE, FALSE, 1);
-       gtk_widget_show(label);
-       gtk_widget_show(image);
-       gtk_widget_show(box);
-       gtk_container_add(GTK_CONTAINER(button), box);
-#endif
        return button;
 }
 
@@ -1013,30 +973,10 @@ GtkWidget *gtkut_get_replace_btn(const gchar *button_label)
 {
        GtkWidget *button;
 
-#if GTK_CHECK_VERSION(2, 6, 0)
        button = gtk_button_new_with_mnemonic(button_label);
        gtk_button_set_image(GTK_BUTTON(button),
                gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON));
-#else
-       GtkWidget* image;
-       GtkWidget* box;
-       GtkWidget* label;
-
-       button = gtk_button_new();
-       box = gtk_hbox_new(FALSE, 0);
 
-       image = gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
-       label = gtk_label_new(NULL);
-       gtk_label_set_text_with_mnemonic(GTK_LABEL(label), button_label);
-       gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
-
-       gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 1);
-       gtk_box_pack_end(GTK_BOX(box), label, FALSE, FALSE, 1);
-       gtk_widget_show(label);
-       gtk_widget_show(image);
-       gtk_widget_show(box);
-       gtk_container_add(GTK_CONTAINER(button), box);
-#endif
        return button;
 }
 
index 1e4a0d77f9909e1a72104c25c66d865f15723216..291cf347201544e83fb3b3c4d04985797c3b4535 100644 (file)
@@ -123,11 +123,10 @@ HeaderView *headerview_create(void)
        gtk_misc_set_alignment(GTK_MISC(to_body_label), 0, 0.5);
        gtk_misc_set_alignment(GTK_MISC(ng_body_label), 0, 0.5);
        gtk_misc_set_alignment(GTK_MISC(subject_body_label), 0, 0.5);
-#if GTK_CHECK_VERSION(2, 6, 0)
        gtk_label_set_ellipsize(GTK_LABEL(to_body_label), PANGO_ELLIPSIZE_END);
        gtk_label_set_ellipsize(GTK_LABEL(ng_body_label), PANGO_ELLIPSIZE_END);
        gtk_label_set_ellipsize(GTK_LABEL(subject_body_label), PANGO_ELLIPSIZE_END);
-#endif
+
        headerview->hbox = hbox;
        headerview->from_header_label    = from_header_label;
        headerview->from_body_label      = from_body_label;
index c74d2522246336eb31e2958350a9524945b5a128..ff1d95f39b023d1f8a957120756b24462dcad7fc 100644 (file)
@@ -1691,11 +1691,7 @@ static void prefs_account_send_create(void)
        PACK_CHECK_BUTTON (hbox, customhdr_chkbtn,
                           _("Add user-defined header"));
 
-#if GTK_CHECK_VERSION(2, 6, 0)
        customhdr_edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
-#else
-       customhdr_edit_btn = gtk_button_new_with_label (_(" Edit... "));
-#endif
        gtk_widget_show (customhdr_edit_btn);
        gtk_box_pack_start (GTK_BOX (hbox), customhdr_edit_btn,
                            FALSE, FALSE, 0);
@@ -1934,11 +1930,7 @@ static void prefs_account_compose_create(void)
        g_signal_connect(G_OBJECT(signature_browse_button), "clicked",
                         G_CALLBACK(prefs_account_signature_browse_cb), NULL);
 
-#if GTK_CHECK_VERSION(2, 6, 0)
        signature_edit_button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
-#else
-       signature_edit_button = gtk_button_new_with_label (_(" Edit... "));
-#endif
        gtk_widget_show (signature_edit_button);
        gtk_box_pack_start (GTK_BOX (hbox2), signature_edit_button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(signature_edit_button), "clicked",
index f8ce7dbba5375689358832055b68fb2f36bfba8d..e8c21c88945ad9270a059aba49495c708d65e878 100644 (file)
@@ -136,11 +136,7 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON(hbox1, chkbtn_disphdr,
                          _("Display short headers on message view"));
 
-#if GTK_CHECK_VERSION(2, 6, 0)
        button_edit_disphdr = gtk_button_new_from_stock(GTK_STOCK_EDIT);
-#else
-       button_edit_disphdr = gtk_button_new_with_label (_(" Edit... "));
-#endif
        gtk_widget_show (button_edit_disphdr);
        gtk_box_pack_start (GTK_BOX (hbox1), button_edit_disphdr,
                          FALSE, TRUE, 0);