cleaned up conflicting declarations of imageview_show_image()

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e2ec719be2511adf7494bf5587c100c17516ff1f..0a161882569fa9bdd8b22e0c432f8d5925f9b843 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-11-28 [thorsten]  0.8.6claws26
+
+       * src/imageview.[ch]
+               cleaned up conflicting declarations of
+               imageview_show_image()
+

 2002-11-28 [paul]      0.8.6claws25
 
        * src/grouplistdialog.c
 2002-11-28 [paul]      0.8.6claws25
 
        * src/grouplistdialog.c

diff --git a/configure.in b/configure.in
index 9887cc6bf01856faa1a75be9ad192108458fbbd8..ab3303fb8c582815d8548ea793547d2261d22921 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws26

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/imageview.c b/src/imageview.c
index 85443e8d8b7c478d842ad750f3508031730ae8f1..20d7be33d0808ec853101a305d680281bc2da794 100644 (file)
--- a/src/imageview.c
+++ b/src/imageview.c
@@ -194,7 +194,7 @@ void imageview_show_image(ImageView *imageview, MimeInfo *mimeinfo,
 }
 #else
 void imageview_show_image(ImageView *imageview, MimeInfo *mimeinfo,
 }
 #else
 void imageview_show_image(ImageView *imageview, MimeInfo *mimeinfo,

-                         const gchar *file)
+                         const gchar *file, gboolean resize)

 {
 }
 #endif /* HAVE_GDK_IMLIB */
 {
 }
 #endif /* HAVE_GDK_IMLIB */

diff --git a/src/imageview.h b/src/imageview.h
index ba1be743e4149fb1dea8cf591c524b8929be8588..1eaef0e116de7f95ee2e41d57c6e30093a790adf 100644 (file)
--- a/src/imageview.h
+++ b/src/imageview.h
@@ -41,7 +41,7 @@ void imageview_init           (ImageView      *imageview);
 void imageview_show_image      (ImageView      *imageview,
                                 MimeInfo       *mimeinfo,
                                 const gchar    *file,
 void imageview_show_image      (ImageView      *imageview,
                                 MimeInfo       *mimeinfo,
                                 const gchar    *file,

-                                gboolean        render);
+                                gboolean        resize);

 void imageview_clear           (ImageView      *imageview);
 void imageview_destroy         (ImageView      *imageview);
 
 void imageview_clear           (ImageView      *imageview);
 void imageview_destroy         (ImageView      *imageview);