+2003-05-06 [christoph] 0.8.11claws145
+
+ * src/main.c
+ * src/plugins/image_viewer/viewer.c
+ fix usage of imlib in imageviewer plugin
+
+ * src/gtk/prefswindow.c
+ handle window close event correctly
+
2003-05-06 [paul] 0.8.11claws144
* src/common/ssl.c
MICRO_VERSION=11
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws144
+EXTRA_VERSION=claws145
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
fi
AM_CONDITIONAL(BUILD_IMAGE_VIEWER_PLUGIN, test x"$ac_cv_enable_image_viewer_plugin" = xyes)
if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
- PLUGINS="image-viewer $PLUGINS"
+ if test "$ac_cv_enable_gdk_pixbuf" = yes; then
+ PLUGINS="image-viewer(gdk-pixbuf)"
+ elif test "$ac_cv_enable_imlib" = yes; then
+ PLUGINS="image-viewer(gdk_imlib)"
+ fi
fi
AC_ARG_ENABLE(dillo-viewer-plugin,
echo ""
echo "$PACKAGE $VERSION"
echo ""
-if test "$ac_cv_enable_gdk_pixbuf" = yes; then
- echo "image support : yes (gdk-pixbuf)"
-elif test "$ac_cv_enable_imlib" = yes; then
- echo "image support : yes (gdk_imlib)"
-else
- echo "image support : no"
-fi
echo "GnuPG : $ac_cv_enable_gpgme"
echo "JPilot : $ac_cv_enable_jpilot"
echo "LDAP : $ac_cv_enable_ldap"
#include <gtk/gtk.h>
#include "intl.h"
+#include "utils.h"
#include "prefswindow.h"
#include "gtkutils.h"
g_free(prefswindow);
}
-static void cancel_button_released(GtkButton *button, gpointer user_data)
+static void close_prefs_window(PrefsWindow *prefswindow)
{
- PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+ debug_print("prefs window closed\n");
gtk_widget_destroy(prefswindow->window);
close_all_pages(prefswindow->prefs_pages);
g_free(prefswindow);
}
+static void cancel_button_released(GtkButton *button, gpointer user_data)
+{
+ PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+
+ close_prefs_window(prefswindow);
+}
+
+static gboolean window_closed(GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+ PrefsWindow *prefswindow = (PrefsWindow *) user_data;
+
+ close_prefs_window(prefswindow);
+ return FALSE;
+}
+
struct name_search
{
gchar *text;
gtk_signal_connect(GTK_OBJECT(prefswindow->ok_btn), "released", GTK_SIGNAL_FUNC(ok_button_released), prefswindow);
gtk_signal_connect(GTK_OBJECT(prefswindow->cancel_btn), "released", GTK_SIGNAL_FUNC(cancel_button_released), prefswindow);
gtk_signal_connect(GTK_OBJECT(prefswindow->apply_btn), "released", GTK_SIGNAL_FUNC(apply_button_released), prefswindow);
+ gtk_signal_connect(GTK_OBJECT(prefswindow->window), "delete_event", GTK_SIGNAL_FUNC(window_closed), prefswindow);
gtk_widget_show_all(prefswindow->window);
}
#include <gtk/gtkmain.h>
#include <gtk/gtkrc.h>
-#if HAVE_GDK_IMLIB
-# include <gdk_imlib.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
g_error(_("g_thread is not supported by glib.\n"));
#endif
-#if HAVE_GDK_IMLIB
- gdk_imlib_init();
- gtk_widget_push_visual(gdk_imlib_get_visual());
- gtk_widget_push_colormap(gdk_imlib_get_colormap());
-#endif
-
/* parse gtkrc files */
userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc",
NULL);
void image_viewer_init(void)
{
+#if HAVE_GDK_IMLIB
+ gdk_imlib_init();
+ gtk_widget_push_visual(gdk_imlib_get_visual());
+ gtk_widget_push_colormap(gdk_imlib_get_colormap());
+#endif
+
mimeview_register_viewer_factory(&image_viewer_factory);
}