2006-02-09 [wwp] 2.0.0cvs38

	* src/gtk/filesel.c
		fix few compiler warnings (type mismatch).

diff --git a/ChangeLog b/ChangeLog
index a5e1886b9dbfd0cd675e7ab5438632a68a0eabb1..1404519c0c383a2283c89710f0fde0d9f2291531 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-09 [wwp]       2.0.0cvs38
+
+       * src/gtk/filesel.c
+               fix few compiler warnings (type mismatch).
+

 2006-02-09 [paul]      2.0.0cvs37
 
        * po/fr.po
 2006-02-09 [paul]      2.0.0cvs37
 
        * po/fr.po

diff --git a/PATCHSETS b/PATCHSETS
index 11689389dc8ef48f672c4d1d8ed3e7cc68661891..1bd02b10d5c439ab2edcbef272c829ea2009ced8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1221,3 +1221,4 @@
 ( cvs diff -u -r 1.60.2.12 -r 1.60.2.13 src/filtering.c;  cvs diff -u -r 1.75.2.15 -r 1.75.2.16 src/matcher.c;  cvs diff -u -r 1.39.2.6 -r 1.39.2.7 src/matcher.h;  cvs diff -u -r 1.25.2.12 -r 1.25.2.13 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.4.24 -r 1.1.4.25 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.34 -r 1.43.2.35 src/prefs_matcher.c;  ) > 2.0.0cvs35.patchset
 ( cvs diff -u -r 1.204.2.74 -r 1.204.2.75 src/prefs_common.c;  cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/common/defs.h;  cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/common/plugin.c;  ) > 2.0.0cvs36.patchset
 ( cvs diff -u -r 1.42.2.20 -r 1.42.2.21 po/fr.po;  ) > 2.0.0cvs37.patchset
 ( cvs diff -u -r 1.60.2.12 -r 1.60.2.13 src/filtering.c;  cvs diff -u -r 1.75.2.15 -r 1.75.2.16 src/matcher.c;  cvs diff -u -r 1.39.2.6 -r 1.39.2.7 src/matcher.h;  cvs diff -u -r 1.25.2.12 -r 1.25.2.13 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.4.24 -r 1.1.4.25 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.34 -r 1.43.2.35 src/prefs_matcher.c;  ) > 2.0.0cvs35.patchset
 ( cvs diff -u -r 1.204.2.74 -r 1.204.2.75 src/prefs_common.c;  cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/common/defs.h;  cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/common/plugin.c;  ) > 2.0.0cvs36.patchset
 ( cvs diff -u -r 1.42.2.20 -r 1.42.2.21 po/fr.po;  ) > 2.0.0cvs37.patchset

+( cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/gtk/filesel.c;  ) > 2.0.0cvs38.patchset

diff --git a/configure.ac b/configure.ac
index 90f826fea2d135e5da9120981af4f2ab0af099b4..a0fa2ad8dfc4d72e1b957a3a291e36bf46a7f307 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=37
+EXTRA_VERSION=38

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c
index bc273f27850a94f3d4694986719486278069a5bd..d3ed92c484d11cc4141dc90b9af29f9536bbd3c2 100644 (file)
--- a/src/gtk/filesel.c
+++ b/src/gtk/filesel.c
@@ -95,8 +95,8 @@ static GList *filesel_create(const gchar *title, const gchar *path,
 
        if (action == GTK_FILE_CHOOSER_ACTION_OPEN) {
                GtkImage *preview;
 
        if (action == GTK_FILE_CHOOSER_ACTION_OPEN) {
                GtkImage *preview;

-               preview = gtk_image_new ();
-               gtk_file_chooser_set_preview_widget (chooser, preview);
+               preview = GTK_IMAGE(gtk_image_new ());
+               gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER(chooser), GTK_WIDGET(preview));

                g_signal_connect (chooser, "update-preview",
                            G_CALLBACK (update_preview_cb), preview);
 
                g_signal_connect (chooser, "update-preview",
                            G_CALLBACK (update_preview_cb), preview);