diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
commit | 2302f1d28510fadb2dcfa119f28ed28f164845bf (patch) | |
tree | e7040e1c743f46bc60a7844275516e4404f6ac30 /extra/claws-mail-extra-plugins/webkit1.6.1.patch | |
parent | 2a9d1292ab60e8a2356fb3eeb36b8c3cfc22759b (diff) | |
parent | 5442e9b8f357932ed5d6cb46e90fcbf6f453469f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fotoxx/PKGBUILD
community/gtkdialog/PKGBUILD
community/hubbub/PKGBUILD
community/libgdamm/PKGBUILD
community/libparserutils/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mtpaint/PKGBUILD
community/netsurf/PKGBUILD
community/patchage/PKGBUILD
community/qgo/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/tre/PKGBUILD
community/virtualbox/PKGBUILD
core/net-tools/PKGBUILD
core/openldap/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/exiv2/PKGBUILD
extra/folks/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gvfs/PKGBUILD
extra/jack/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim/PKGBUILD
extra/koffice/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/nautilus/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject2/PKGBUILD
extra/swt/PKGBUILD
extra/tomcat/PKGBUILD
extra/totem/PKGBUILD
extra/vigra/PKGBUILD
extra/vte/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/wine/PKGBUILD
social/miniupnpc/PKGBUILD
testing/icedtea-web-java7/PKGBUILD
testing/sqlite3/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'extra/claws-mail-extra-plugins/webkit1.6.1.patch')
-rw-r--r-- | extra/claws-mail-extra-plugins/webkit1.6.1.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/extra/claws-mail-extra-plugins/webkit1.6.1.patch b/extra/claws-mail-extra-plugins/webkit1.6.1.patch new file mode 100644 index 000000000..82bc5d062 --- /dev/null +++ b/extra/claws-mail-extra-plugins/webkit1.6.1.patch @@ -0,0 +1,106 @@ +--- src/fancy_viewer.c 2011-07-01 11:50:25.000000000 +0200 ++++ src/fancy_viewer.c 2011-09-30 06:02:45.000000000 +0200 +@@ -83,8 +83,10 @@ + static void download_file_cb(GtkWidget *widget, FancyViewer *viewer); + #endif + +-/*FIXME substitute webkitwebsettings.cpp functions with their API when available */ +-gchar* webkit_web_view_get_selected_text(WebKitWebView* webView); ++#if !WEBKIT_CHECK_VERSION (1,5,1) ++gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view); ++#endif ++ + /*------*/ + static GtkWidget *fancy_get_widget(MimeViewer *_viewer) + { +@@ -243,6 +245,8 @@ + + gtk_print_unix_dialog_set_manual_capabilities(print_dialog, + GTK_PRINT_CAPABILITY_GENERATE_PS); ++ gtk_print_unix_dialog_set_manual_capabilities(print_dialog, ++ GTK_PRINT_CAPABILITY_PREVIEW); + + result = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_hide (dialog); +@@ -293,7 +297,19 @@ + { + debug_print("fancy_get_selection\n"); + FancyViewer *viewer = (FancyViewer *) _viewer; ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ if (viewer->selection == NULL) ++ return NULL; ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ if (viewer->range == NULL) ++ return NULL; ++ gchar *sel = webkit_dom_range_get_text (viewer->range); ++#else + gchar *sel = webkit_web_view_get_selected_text(viewer->view); ++#endif + if (!viewer->view || strlen(sel) == 0) { + g_free(sel); + return NULL; +@@ -686,7 +702,15 @@ + debug_print("Clicked on Search on Web\n"); + if (webkit_web_view_has_selection(viewer->view)) { + gchar *search; ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ gchar *tmp = webkit_dom_range_get_text (viewer->range); ++#else + gchar *tmp = webkit_web_view_get_selected_text(viewer->view); ++#endif + search = g_strconcat(GOOGLE_SEARCH, tmp, NULL); + webkit_web_view_open(viewer->view, search); + g_free(search); +@@ -896,7 +920,6 @@ + static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu, + FancyViewer *viewer) + { +- /*FIXME hack..until webkit does not give the proper way to handle it*/ + Plugin *plugin = plugin_get_loaded_by_name("RSSyl"); + gtk_container_foreach(GTK_CONTAINER(menu), + (GtkCallback)viewer_menu_handler, +@@ -941,7 +964,19 @@ + if (webkit_web_view_can_copy_clipboard(view)) { + GtkClipboard *wv_clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); + const gchar *sel_text; +- sel_text = (const gchar*)webkit_web_view_get_selected_text(view); ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view)); ++ viewer->window = webkit_dom_document_get_default_view (viewer->doc); ++ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window); ++ if (viewer->selection == NULL) ++ return NULL; ++ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL); ++ if (viewer->range == NULL) ++ return NULL; ++ sel_text = (const *gchar)webkit_dom_range_get_text (viewer->range); ++#else ++ sel_text = (const *gchar)webkit_web_view_get_selected_text(viewer->view); ++#endif + gtk_clipboard_set_text(wv_clipboard, sel_text, -1); + } + return FALSE; +--- src/fancy_viewer.h 2011-07-01 11:50:25.000000000 +0200 ++++ src/fancy_viewer.h 2011-09-30 06:02:45.000000000 +0200 +@@ -113,6 +113,14 @@ + gint tag; + gint loading; + gint stop_previous; ++ ++ /* DOM Objects */ ++#if WEBKIT_CHECK_VERSION(1,5,1) ++ WebKitDOMDocument *doc; ++ WebKitDOMDOMWindow *window; ++ WebKitDOMDOMSelection *selection; ++ WebKitDOMRange *range; ++#endif + }; + #define OPEN_INTERNAL FALSE + #define OPEN_EXTERNAL TRUE |