Midori Web Browser

Merge lp:~ivaldi/midori/about-content-signal into lp:midori

  1. about-content-signal
  2. Merge into trunk
Proposed by André Stösel
Status: Merged
Approved by: Cris Dywan
Approved revision: 6357
Merged at revision: 6368
Proposed branch: lp:~ivaldi/midori/about-content-signal
Merge into: lp:midori
Diff against target: 78 lines (+32/-0)
3 files modified
midori/marshal.list (+1/-0)
midori/midori-view.c (+30/-0)
midori/midori.vapi (+1/-0)
To merge this branch: bzr merge lp:~ivaldi/midori/about-content-signal
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+180990@code.launchpad.net

Commit message

New signal about-content to provide content for about uris

Description of the change

This is a part of the tabby branch but it's needed for other extensions as well.

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Looks appealingly simple.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'midori/marshal.list'
--- midori/marshal.list 2012-09-14 23:19:58 +0000
+++ midori/marshal.list 2013-08-20 08:29:20 +0000
@@ -2,6 +2,7 @@
2BOOLEAN:OBJECT,OBJECT2BOOLEAN:OBJECT,OBJECT
3BOOLEAN:OBJECT,UINT3BOOLEAN:OBJECT,UINT
4BOOLEAN:VOID4BOOLEAN:VOID
5BOOLEAN:STRING
5OBJECT:OBJECT6OBJECT:OBJECT
6VOID:BOOLEAN,STRING7VOID:BOOLEAN,STRING
7VOID:OBJECT,ENUM,BOOLEAN8VOID:OBJECT,ENUM,BOOLEAN
89
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c 2013-08-15 11:55:34 +0000
+++ midori/midori-view.c 2013-08-20 08:29:20 +0000
@@ -160,6 +160,7 @@
160 NEW_VIEW,160 NEW_VIEW,
161 DOWNLOAD_REQUESTED,161 DOWNLOAD_REQUESTED,
162 ADD_BOOKMARK,162 ADD_BOOKMARK,
163 ABOUT_CONTENT,
163164
164 LAST_SIGNAL165 LAST_SIGNAL
165};166};
@@ -303,6 +304,28 @@
303 G_TYPE_NONE, 1,304 G_TYPE_NONE, 1,
304 G_TYPE_STRING);305 G_TYPE_STRING);
305306
307 /**
308 * MidoriView::about-content:
309 * @view: the object on which the signal is emitted
310 * @uri: the about URI
311 *
312 * Emitted when loading the about content
313 *
314 * Return value: the view content as string
315 *
316 * Since: 0.5.5
317 */
318 signals[ABOUT_CONTENT] = g_signal_new (
319 "about-content",
320 G_TYPE_FROM_CLASS (class),
321 (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
322 0,
323 g_signal_accumulator_true_handled,
324 NULL,
325 midori_cclosure_marshal_BOOLEAN__STRING,
326 G_TYPE_BOOLEAN, 1,
327 G_TYPE_STRING);
328
306 gobject_class = G_OBJECT_CLASS (class);329 gobject_class = G_OBJECT_CLASS (class);
307 gobject_class->constructor = midori_view_constructor;330 gobject_class->constructor = midori_view_constructor;
308 gobject_class->finalize = midori_view_finalize;331 gobject_class->finalize = midori_view_finalize;
@@ -3819,7 +3842,14 @@
38193842
3820 if (!midori_debug ("unarmed"))3843 if (!midori_debug ("unarmed"))
3821 {3844 {
3845 gboolean handled = FALSE;
3822 gchar* temporary_uri = NULL;3846 gchar* temporary_uri = NULL;
3847 if (g_str_has_prefix (uri, "about:"))
3848 g_signal_emit (view, signals[ABOUT_CONTENT], 0, uri, &handled);
3849
3850 if (handled)
3851 return;
3852
3823 if (!strcmp (uri, "about:new"))3853 if (!strcmp (uri, "about:new"))
3824 uri = midori_settings_get_tabhome (MIDORI_SETTINGS (view->settings));3854 uri = midori_settings_get_tabhome (MIDORI_SETTINGS (view->settings));
3825 if (!strcmp (uri, "about:home"))3855 if (!strcmp (uri, "about:home"))
38263856
=== modified file 'midori/midori.vapi'
--- midori/midori.vapi 2013-08-04 12:00:43 +0000
+++ midori/midori.vapi 2013-08-20 08:29:20 +0000
@@ -203,6 +203,7 @@
203203
204 [HasEmitter]204 [HasEmitter]
205 public signal bool download_requested (WebKit.Download download);205 public signal bool download_requested (WebKit.Download download);
206 public signal bool about_content (string uri);
206207
207 }208 }
208209

Subscribers

People subscribed via source and target branches

to all changes: