2010-10-17 [colin] 3.7.6cvs56

	* src/prefs_themes.c
	* src/gtk/gtkaspell.c
	* src/gtk/gtkutils.c
	* src/gtk/gtkutils.h
	* src/gtk/inputdialog.c
	* src/gtk/progressdialog.c
		Undeprecate a few things

diff --git a/ChangeLog b/ChangeLog
index 9ea4cba91f2e6e28323d47e7afbd998552adcce7..075de60815ccdb4dbf7cb124065bf041d81477a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-17 [colin]     3.7.6cvs56
+
+       * src/prefs_themes.c
+       * src/gtk/gtkaspell.c
+       * src/gtk/gtkutils.c
+       * src/gtk/gtkutils.h
+       * src/gtk/inputdialog.c
+       * src/gtk/progressdialog.c
+               Undeprecate a few things
+

 2010-10-17 [colin]     3.7.6cvs55
 
        * src/main.c
 2010-10-17 [colin]     3.7.6cvs55
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index b82fa0f2c0c58365c3d963ca6f1733659ae6723c..601d53cbb0c650a01ebfd504354a466dc8abda06 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4051,3 +4051,4 @@
 ( cvs diff -u -r 1.213.2.196 -r 1.213.2.197 src/folder.c;  cvs diff -u -r 1.87.2.61 -r 1.87.2.62 src/folder.h;  cvs diff -u -r 1.179.2.251 -r 1.179.2.252 src/imap.c;  cvs diff -u -r 1.79.2.69 -r 1.79.2.70 src/mh.c;  cvs diff -u -r 1.150.2.115 -r 1.150.2.116 src/procmsg.c;  ) > 3.7.6cvs53.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 manual/dist/pdf/Makefile.am;  ) > 3.7.6cvs54.patchset
 ( cvs diff -u -r 1.115.2.230 -r 1.115.2.231 src/main.c;  cvs diff -u -r 1.1.2.69 -r 1.1.2.70 src/gtk/authors.h;  cvs diff -u -r 1.1.2.96 -r 1.1.2.97 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/quicksearch.h;  ) > 3.7.6cvs55.patchset
 ( cvs diff -u -r 1.213.2.196 -r 1.213.2.197 src/folder.c;  cvs diff -u -r 1.87.2.61 -r 1.87.2.62 src/folder.h;  cvs diff -u -r 1.179.2.251 -r 1.179.2.252 src/imap.c;  cvs diff -u -r 1.79.2.69 -r 1.79.2.70 src/mh.c;  cvs diff -u -r 1.150.2.115 -r 1.150.2.116 src/procmsg.c;  ) > 3.7.6cvs53.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 manual/dist/pdf/Makefile.am;  ) > 3.7.6cvs54.patchset
 ( cvs diff -u -r 1.115.2.230 -r 1.115.2.231 src/main.c;  cvs diff -u -r 1.1.2.69 -r 1.1.2.70 src/gtk/authors.h;  cvs diff -u -r 1.1.2.96 -r 1.1.2.97 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/quicksearch.h;  ) > 3.7.6cvs55.patchset

+( cvs diff -u -r 1.3.2.65 -r 1.3.2.66 src/prefs_themes.c;  cvs diff -u -r 1.9.2.68 -r 1.9.2.69 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.91 -r 1.5.2.92 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.50 -r 1.4.2.51 src/gtk/gtkutils.h;  cvs diff -u -r 1.2.2.38 -r 1.2.2.39 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/gtk/progressdialog.c;  ) > 3.7.6cvs56.patchset

diff --git a/configure.ac b/configure.ac
index 94a41fa07bc8b63c0c929b55e940c10c786b5abe..ac89abff7bc8fbc8c6171ff1a1046ca0c0bceea7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=55
+EXTRA_VERSION=56

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 6957550f07f20032a2ced990061404c2d99c1738..91195cd8f8eda83850edf86701cdff851c1c098c 100644 (file)
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -1378,7 +1378,6 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
 
        gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
        gtk_window_set_title(GTK_WINDOW(dialog),_("Replace unknown word"));
 
        gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
        gtk_window_set_title(GTK_WINDOW(dialog),_("Replace unknown word"));

-       gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);

        gtk_window_move(GTK_WINDOW(dialog), xx, yy);
 
        g_signal_connect_swapped(G_OBJECT(dialog), "destroy",
        gtk_window_move(GTK_WINDOW(dialog), xx, yy);
 
        g_signal_connect_swapped(G_OBJECT(dialog), "destroy",

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 71cb1f7e42aa78df7c9d1270795b63a286d5f5ee..4fa559ba57b7b9a34e6ed9d4173a8bf27d601145 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1073,7 +1073,6 @@ GtkWidget *xface_get_from_header(const gchar *o_xface, GdkColor *background,
 {
        static gchar *xpm_xface[XPM_XFACE_HEIGHT];
        static gboolean xpm_xface_init = TRUE;
 {
        static gchar *xpm_xface[XPM_XFACE_HEIGHT];
        static gboolean xpm_xface_init = TRUE;

-       GdkPixmap *pixmap;

        GdkBitmap *mask;
        gchar xface[2048];
        strncpy(xface, o_xface, sizeof(xface));
        GdkBitmap *mask;
        gchar xface[2048];
        strncpy(xface, o_xface, sizeof(xface));


@@ -1099,9 +1098,6 @@ GtkWidget *xface_get_from_header(const gchar *o_xface, GdkColor *background,
 
        create_xpm_from_xface(xpm_xface, xface);
 
 
        create_xpm_from_xface(xpm_xface, xface);
 

-       pixmap = gdk_pixmap_create_from_xpm_d
-               (window, &mask, 
-                background, xpm_xface);

        return gtk_image_new_from_pixbuf(
                gdk_pixbuf_new_from_xpm_data((const char **)xpm_xface));
 }
        return gtk_image_new_from_pixbuf(
                gdk_pixbuf_new_from_xpm_data((const char **)xpm_xface));
 }

diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 80123b52d4e1fe49190f2f0199c9aee0fc146e05..0b8c87d3aa4dd483df20e959ab7f5af71fe3a01a 100644 (file)
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -50,26 +50,6 @@
                gtk_main_iteration(); \
 }
 
                gtk_main_iteration(); \
 }
 

-#define PIXMAP_CREATE(widget, pixmap, mask, xpm_d) \
-{ \
-       if (!pixmap) { \
-               GtkStyle *style = gtk_widget_get_style(widget); \
-               pixmap = gdk_pixmap_create_from_xpm_d \
-                       (widget->window, &mask, \
-                        &style->bg[GTK_STATE_NORMAL], xpm_d); \
-       } \
-}
-
-#define PIXMAP_CREATE_FROM_FILE(widget, pixmap, mask, filename) \
-{ \
-       if (!pixmap) { \
-               GtkStyle *style = gtk_widget_get_style(widget); \
-               pixmap = gdk_pixmap_create_from_xpm \
-                       (widget->window, &mask, \
-                        &style->bg[GTK_STATE_NORMAL], filename); \
-       } \
-}
-

 #define GTK_WIDGET_PTR(wid)    (*(GtkWidget **)wid)
 
 #define GTKUT_CTREE_NODE_SET_ROW_DATA(node, d) \
 #define GTK_WIDGET_PTR(wid)    (*(GtkWidget **)wid)
 
 #define GTKUT_CTREE_NODE_SET_ROW_DATA(node, d) \

diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
index f6651aad858647d33d46d2f0add7b92466875579..65e38e70bc4f0d59e7ef52a8ab6bc6b4cb733a3a 100644 (file)
--- a/src/gtk/inputdialog.c
+++ b/src/gtk/inputdialog.c
@@ -313,7 +313,6 @@ static void input_dialog_create(gboolean is_password)
        gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
        gtk_window_set_default_size(GTK_WINDOW(dialog), 375, 100);
        gtk_window_set_title(GTK_WINDOW(dialog), "");
        gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
        gtk_window_set_default_size(GTK_WINDOW(dialog), 375, 100);
        gtk_window_set_title(GTK_WINDOW(dialog), "");

-       gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);

 
        g_signal_connect(G_OBJECT(dialog), "delete_event",
                         G_CALLBACK(delete_event), NULL);
 
        g_signal_connect(G_OBJECT(dialog), "delete_event",
                         G_CALLBACK(delete_event), NULL);

diff --git a/src/gtk/progressdialog.c b/src/gtk/progressdialog.c
index d20420793424599deef426acf36bf286fe7297b9..16c1a80ad683345e65b307d0157d47ed4426c702 100644 (file)
--- a/src/gtk/progressdialog.c
+++ b/src/gtk/progressdialog.c
@@ -69,7 +69,6 @@ ProgressDialog *progress_dialog_create(void)
        gtk_container_set_border_width
                (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 0);
        gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 8);
        gtk_container_set_border_width
                (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 0);
        gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 8);

-       gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);

 
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox,
 
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox,

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 2abf466e155b8418db012c0c1feb3351e06f19b6..1f52f67d9b40b556985e125f9bf13744f47c94db 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -783,40 +783,6 @@ static gchar *prefs_themes_get_theme_stats(const gchar *dirname)
        return stats;
 }
 
        return stats;
 }
 

-/* BEGIN GLADE CODE */
-/* This is a dummy pixmap we use when a pixmap can't be found. */
-static char *dummy_pixmap_xpm[] = {
-       /* columns rows colors chars-per-pixel */
-       "1 1 1 1",
-       "  c None",
-       /* pixels */
-       " "
-};
-
-/* This is an internally used function to create pixmaps. */
-static GtkWidget* create_dummy_pixmap(GtkWidget *widget)
-{
-       GdkColormap *colormap;
-       GdkPixmap *gdkpixmap;
-       GdkBitmap *mask;
-       GtkWidget *pixmap;
-
-       colormap = gtk_widget_get_colormap (widget);
-       gdkpixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &mask,
-                       NULL, dummy_pixmap_xpm);
-       if (gdkpixmap == NULL)
-               g_error ("Couldn't create replacement pixmap.");
-       pixmap = gtk_image_new_from_pixmap(gdkpixmap, mask);
-       g_object_unref (gdkpixmap);
-       g_object_unref (mask);
-       return pixmap;
-}
-/* END GLADE CODE */
-
-/* glade generates some calls to a create_pixmap support function 
- * we don't really need. */
-#define create_pixmap(widget,filename) create_dummy_pixmap(widget)
-

 static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpointer data)
 {
        ThemesPage *prefs_themes = (ThemesPage *)page;
 static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpointer data)
 {
        ThemesPage *prefs_themes = (ThemesPage *)page;


@@ -956,37 +922,37 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        gtk_widget_show (hbox1);
        gtk_container_add (GTK_CONTAINER (frame_preview), hbox1);
 
        gtk_widget_show (hbox1);
        gtk_container_add (GTK_CONTAINER (frame_preview), hbox1);
 

-       icon_1 = create_pixmap (vbox1, NULL);
+       icon_1 = gtk_image_new();

        gtk_widget_show (icon_1);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_1, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_1), 0, 5);
 
        gtk_widget_show (icon_1);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_1, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_1), 0, 5);
 

-       icon_2 = create_pixmap (vbox1, NULL);
+       icon_2 = gtk_image_new();

        gtk_widget_show (icon_2);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_2, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_2), 0, 5);
 
        gtk_widget_show (icon_2);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_2, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_2), 0, 5);
 

-       icon_3 = create_pixmap (vbox1, NULL);
+       icon_3 = gtk_image_new();

        gtk_widget_show (icon_3);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_3, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_3), 0, 5);
 
        gtk_widget_show (icon_3);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_3, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_3), 0, 5);
 

-       icon_4 = create_pixmap (vbox1, NULL);
+       icon_4 = gtk_image_new();

        gtk_widget_show (icon_4);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_4, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_4), 0, 5);
 
        gtk_widget_show (icon_4);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_4, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_4), 0, 5);
 

-       icon_5 = create_pixmap (vbox1, NULL);
+       icon_5 = gtk_image_new();

        gtk_widget_show (icon_5);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_5, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_5), 0, 5);
 
        gtk_widget_show (icon_5);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_5, TRUE, TRUE, 2);
        gtk_misc_set_padding (GTK_MISC (icon_5), 0, 5);
 

-       icon_6 = create_pixmap (vbox1, NULL);
+       icon_6 = gtk_image_new();

        gtk_widget_show (icon_6);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_6, TRUE, TRUE, 0);
        gtk_misc_set_padding (GTK_MISC (icon_6), 0, 5);
 
        gtk_widget_show (icon_6);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_6, TRUE, TRUE, 0);
        gtk_misc_set_padding (GTK_MISC (icon_6), 0, 5);
 

-       icon_7 = create_pixmap (vbox1, NULL);
+       icon_7 = gtk_image_new();

        gtk_widget_show (icon_7);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_7, TRUE, TRUE, 0);
        gtk_misc_set_padding (GTK_MISC (icon_7), 0, 5);
        gtk_widget_show (icon_7);
        gtk_box_pack_start (GTK_BOX (hbox1), icon_7, TRUE, TRUE, 0);
        gtk_misc_set_padding (GTK_MISC (icon_7), 0, 5);