[Commits] fancy_viewer.c 1.1.2.50 1.1.2.51

[iwkse at claws-mail.org]

Update of /home/claws-mail/plugins/fancy/src
In directory claws-mail:/tmp/cvs-serv3070/src

Modified Files:
      Tag: gtk2
	fancy_viewer.c 
Log Message:
2011-12-14 [iwkse]	0.9.14cvs3

	* src/fancy_viewer.c
        Bug #2564 Replacement of the deprecated function
        webkit_web_view_open() with webkit_web_view_load_uri()
        introduced in Webkit 1.1.1 - Patch by Stephane Goujet

Index: fancy_viewer.c
===================================================================
RCS file: /home/claws-mail/plugins/fancy/src/Attic/fancy_viewer.c,v
retrieving revision 1.1.2.50
retrieving revision 1.1.2.51
diff -u -d -r1.1.2.50 -r1.1.2.51
--- fancy_viewer.c	1 Nov 2011 14:03:09 -0000	1.1.2.50
+++ fancy_viewer.c	14 Dec 2011 11:17:00 -0000	1.1.2.51
@@ -141,7 +141,11 @@
 		gchar *tmp = g_filename_to_uri(viewer->filename, NULL, NULL);
 		debug_print("zoom_level: %i\n", fancy_prefs.zoom_level);
 		webkit_web_view_set_zoom_level(viewer->view, (fancy_prefs.zoom_level / 100.0));
+#if WEBKIT_CHECK_VERSION(1,1,1)
+		webkit_web_view_load_uri(viewer->view, tmp);
+#else
 		webkit_web_view_open(viewer->view, tmp);
+#endif
 		g_free(tmp);
 	}
 	viewer->loading = FALSE;
@@ -328,7 +332,11 @@
 	viewer->override_prefs_scripts = FALSE;
 	viewer->override_prefs_plugins = FALSE;
 	viewer->override_prefs_java = FALSE;
+#if WEBKIT_CHECK_VERSION(1,1,1)
+	webkit_web_view_load_uri(viewer->view, "about:blank");
+#else
 	webkit_web_view_open(viewer->view, "about:blank");
+#endif
 	debug_print("fancy_clear_viewer\n");
 	fancy_prefs.zoom_level = webkit_web_view_get_zoom_level(viewer->view) * 100;
 	viewer->to_load = NULL;
@@ -712,7 +720,11 @@
 		gchar *tmp = webkit_web_view_get_selected_text(viewer->view);
 #endif
 		search = g_strconcat(GOOGLE_SEARCH, tmp, NULL);
+#if WEBKIT_CHECK_VERSION(1,1,1)
+		webkit_web_view_load_uri(viewer->view, search);
+#else
 		webkit_web_view_open(viewer->view, search);
+#endif
 		g_free(search);
 		g_free(tmp);
 	}