|
 |
f325b2 |
From c2db3c262f702e62c2f247e62b1b313ecc6e28c5 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Pranav Kant <pranavk@gnome.org>
|
|
|
f325b2 |
Date: Tue, 23 Jun 2015 01:52:44 +0530
|
|
|
f325b2 |
Subject: [PATCH 059/398] lokdocview: Don't handle hyperlink clicks
|
|
|
f325b2 |
|
|
|
f325b2 |
Instead emit the signal 'hyperlink-clicked', and let the
|
|
|
f325b2 |
application decide how it wants to handle the hyperlink clicks.
|
|
|
f325b2 |
|
|
|
f325b2 |
(cherry picked from commit 9d2fa921470152647cc3b54355f70a1365f752ff)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ief72bbd16727e140cacf28b852ad43952c02f7ae
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 14 +++++++++++++-
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 11 ++++++++---
|
|
|
f325b2 |
2 files changed, 21 insertions(+), 4 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
index fedd6c9fdf13..61f016dffab8 100644
|
|
|
f325b2 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
@@ -310,7 +310,18 @@ static void signalPart(LOKDocView* /*pLOKDocView*/, int nPart, gpointer /*pData*
|
|
|
f325b2 |
g_bPartSelectorBroadcast = true;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-/// User clicked on a cmmand button -> inform LOKDocView.
|
|
|
f325b2 |
+/// User clicked on a command button -> inform LOKDocView.
|
|
|
f325b2 |
+static void signalHyperlink(LOKDocView* /*pLOKDocView*/, char* pPayload, gpointer /*pData*/)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ GError* pError = NULL;
|
|
|
f325b2 |
+ gtk_show_uri(NULL, pPayload, GDK_CURRENT_TIME, &pError);
|
|
|
f325b2 |
+ if (pError != NULL)
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ g_warning("Unable to show URI %s : %s", pPayload, pError->message);
|
|
|
f325b2 |
+ g_error_free(pError);
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
static void toggleToolItem(GtkWidget* pWidget, gpointer /*pData*/)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
if (g_bToolItemBroadcast)
|
|
|
f325b2 |
@@ -527,6 +538,7 @@ int main( int argc, char* argv[] )
|
|
|
f325b2 |
g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), NULL);
|
|
|
f325b2 |
g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), NULL);
|
|
|
f325b2 |
g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
|
|
|
f325b2 |
+ g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(signalHyperlink), NULL);
|
|
|
f325b2 |
|
|
|
f325b2 |
// Input handling.
|
|
|
f325b2 |
g_signal_connect(pWindow, "key-press-event", G_CALLBACK(signalKey), pDocView);
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 0641197d9781..19da4b2da691 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -324,6 +324,12 @@ setPart(LOKDocView* pDocView, const std::string& rString)
|
|
|
f325b2 |
g_signal_emit(pDocView, doc_view_signals[PART_CHANGED], 0, std::stoi(rString));
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+static void
|
|
|
f325b2 |
+hyperlinkClicked(LOKDocView* pDocView, const std::string& rString)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ g_signal_emit(pDocView, doc_view_signals[HYPERLINK_CLICKED], 0, rString.c_str());
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
/// Implementation of the global callback handler, invoked by globalCallback();
|
|
|
f325b2 |
static gboolean
|
|
|
f325b2 |
globalCallback (gpointer pData)
|
|
|
f325b2 |
@@ -507,8 +513,7 @@ callback (gpointer pData)
|
|
|
f325b2 |
break;
|
|
|
f325b2 |
case LOK_CALLBACK_HYPERLINK_CLICKED:
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- GError* pError = NULL;
|
|
|
f325b2 |
- gtk_show_uri(NULL, pCallback->m_aPayload.c_str(), GDK_CURRENT_TIME, &pError);
|
|
|
f325b2 |
+ hyperlinkClicked(pDocView, pCallback->m_aPayload);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
break;
|
|
|
f325b2 |
case LOK_CALLBACK_STATE_CHANGED:
|
|
|
f325b2 |
@@ -1353,7 +1358,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
|
|
|
f325b2 |
* @aHyperlink: the URI which the application should handle
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
doc_view_signals[HYPERLINK_CLICKED] =
|
|
|
f325b2 |
- g_signal_new("hyperlinked-clicked",
|
|
|
f325b2 |
+ g_signal_new("hyperlink-clicked",
|
|
|
f325b2 |
G_TYPE_FROM_CLASS(pGObjectClass),
|
|
|
f325b2 |
G_SIGNAL_RUN_FIRST,
|
|
|
f325b2 |
0,
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|