[Commits] dillo_viewer.c 1.12.2.29 1.12.2.30

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/plugins/dillo_viewer
In directory claws-mail:/tmp/cvs-serv26650/src/plugins/dillo_viewer

Modified Files:
      Tag: gtk2
	dillo_viewer.c 
Log Message:
2011-10-07 [colin]	3.7.10cvs21

	* configure.ac
	* src/action.c
	* src/addr_compl.c
	* src/addrgather.c
	* src/compose.c
	* src/compose.h
	* src/editldap.c
	* src/mainwindow.c
	* src/message_search.c
	* src/mimeview.c
	* src/mimeview.h
	* src/prefs_account.c
	* src/prefs_compose_writing.c
	* src/prefs_filtering_action.c
	* src/prefs_folder_item.c
	* src/prefs_logging.c
	* src/prefs_matcher.c
	* src/prefs_message.c
	* src/prefs_other.c
	* src/prefs_receive.c
	* src/prefs_summaries.c
	* src/prefs_wrapping.c
	* src/printing.c
	* src/ssl_manager.c
	* src/statusbar.c
	* src/stock_pixmap.c
	* src/summary_search.c
	* src/textview.c
	* src/gtk/Makefile.am
	* src/gtk/colorlabel.c
	* src/gtk/gtkutils.c
	* src/gtk/gtkutils.h
	* src/gtk/logwindow.c
	* src/gtk/menu.c
	* src/gtk/menu.h
	* src/gtk/quicksearch.c
	* src/gtk/spell_entry.c
	* src/plugins/bogofilter/bogofilter_gtk.c
	* src/plugins/dillo_viewer/dillo_viewer.c
	* src/plugins/pgpcore/prefs_gpg.c
	* src/plugins/spamassassin/spamassassin_gtk.c
		Bug #2371, "Port to GTK+ 3.0". Third patch from Hanno, starting
		the real job. GtkCMOptionMenu and GTKHSRuler disabled, should be
		ported (especially GtkCMOptionMenu)

Index: dillo_viewer.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/dillo_viewer/dillo_viewer.c,v
retrieving revision 1.12.2.29
retrieving revision 1.12.2.30
diff -u -d -r1.12.2.29 -r1.12.2.30
--- dillo_viewer.c	16 Feb 2011 07:16:23 -0000	1.12.2.29
+++ dillo_viewer.c	7 Oct 2011 09:40:16 -0000	1.12.2.30
@@ -26,6 +26,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtk/gtkx.h>
+#endif
 #include <gdk/gdkx.h>
 
 #include "common/claws.h"
@@ -60,7 +63,11 @@
 	return GTK_WIDGET(viewer->widget);
 }
 
+#if !GTK_CHECK_VERSION(3, 0, 0)
 static gboolean socket_destroy_cb(GtkObject *object, gpointer data)
+#else
+static gboolean socket_destroy_cb(GtkObject *object, gpointer data)
+#endif
 {
 	DilloViewer *viewer = (DilloViewer *) data;
 	debug_print("Destroyed dillo socket %p\n", viewer->socket);