Merge lp:~kalikiana/midori/appprivacy into lp:midori

[Cris Dywan]

Add privacy preferences in web app mode

[André Stösel (ivaldi)]

There is an issue with the "app" object (if you change some settings):

** (midori4:3734): CRITICAL **: katze_object_get_object: assertion `G_IS_OBJECT (object)' failed

Program received signal SIGTRAP, Trace/breakpoint trap.
0x00007ffff78dcd4d in g_logv () from /usr/lib/libglib-2.0.so.0
(gdb) bt
#0 0x00007ffff78dcd4d in g_logv () from /usr/lib/libglib-2.0.so.0
#1 0x00007ffff78dcf32 in g_log () from /usr/lib/libglib-2.0.so.0
#2 0x000000000042a50a in katze_object_get_object (object=object@entry=0x0, property=property@entry=0x482f2c "extensions") at ../katze/katze-utils.c:1209
#3 0x00000000004596b2 in midori_settings_save_to_file (settings=settings@entry=0x862b10, app=0x0, filename=filename@entry=0x1076440 "/home/andre/.local/share/midori/apps/0d31a7f58f9a80b737cb713872090cc6/config",
    error=error@entry=0x7fffffffcbb8) at ../midori/midori-websettings.c:1486
#4 0x000000000044c86d in settings_notify_cb (settings=0x862b10, pspec=<optimized out>, app=0x0) at ../midori/midori-session.c:353

review: Needs Fixing

[André Stösel (ivaldi)]

Works fine now.

review: Approve

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2013-06-30 14:58:59 +0000
+++ midori/midori-frontend.c	2013-07-29 17:43:29 +0000
@@ -36,6 +36,15 @@
     return new_browser;
 }
 
+static void
+midori_browser_privacy_preferences_cb (MidoriBrowser*    browser,
+                                       KatzePreferences* preferences,
+                                       gpointer          user_data)
+{
+    MidoriWebSettings* settings = midori_browser_get_settings (browser);
+    midori_preferences_add_privacy_category (preferences, settings);
+}
+
 MidoriBrowser*
 midori_web_app_new (const gchar* webapp,
                     gchar**      open_uris,
@@ -50,6 +59,8 @@
     MidoriBrowser* browser = midori_browser_new ();
     g_signal_connect (browser, "new-window",
         G_CALLBACK (midori_frontend_browser_new_window_cb), NULL);
+    g_signal_connect (browser, "show-preferences",
+        G_CALLBACK (midori_browser_privacy_preferences_cb), NULL);
 
     midori_browser_set_action_visible (browser, "Menubar", FALSE);
     midori_browser_set_action_visible (browser, "CompactMenu", FALSE);
@@ -243,15 +254,6 @@
 }
 
 static void
-midori_browser_privacy_preferences_cb (MidoriBrowser*    browser,
-                                       KatzePreferences* preferences,
-                                       MidoriApp*        app)
-{
-    MidoriWebSettings* settings = midori_browser_get_settings (browser);
-    midori_preferences_add_privacy_category (preferences, settings);
-}
-
-static void
 midori_app_add_browser_cb (MidoriApp*     app,
                            MidoriBrowser* browser,
                            gpointer       user_data)
@@ -269,7 +271,7 @@
 
     /* Extensions */
     g_signal_connect (browser, "show-preferences",
-        G_CALLBACK (midori_browser_privacy_preferences_cb), app);
+        G_CALLBACK (midori_browser_privacy_preferences_cb), NULL);
     g_signal_connect (browser, "show-preferences",
         G_CALLBACK (midori_browser_show_preferences_cb), app);
 

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2013-07-07 12:25:55 +0000
+++ midori/midori-preferences.c	2013-07-29 17:43:29 +0000
@@ -539,6 +539,9 @@
     GtkWidget* label;
     gchar* markup;
 
+    g_return_if_fail (KATZE_IS_PREFERENCES (preferences));
+    g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings));
+
     katze_preferences_add_category (preferences, _("Privacy"), GTK_STOCK_INDEX);
     katze_preferences_add_group (preferences, NULL);
     button = gtk_label_new (_("Delete old Cookies after:"));

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2013-07-11 15:20:32 +0000
+++ midori/midori-websettings.c	2013-07-29 17:43:29 +0000
@@ -1483,9 +1483,6 @@
     GType type;
     const gchar* property;
     gboolean saved;
-    KatzeArray* extensions = katze_object_get_object (app, "extensions");
-    MidoriExtension* extension;
-    gchar** _extensions;
 
     key_file = g_key_file_new ();
     class = G_OBJECT_GET_CLASS (settings);
@@ -1573,30 +1570,37 @@
     }
     g_free (pspecs);
 
-    /* Take frozen list of active extensions until preferences reset it */
-    if ((_extensions = g_object_get_data (G_OBJECT (app), "extensions")))
-    {
-        i = 0;
-        while (_extensions[i])
-            g_key_file_set_boolean (key_file, "extensions", _extensions[i++], TRUE);
-    }
-    else if (extensions)
-    {
-        KATZE_ARRAY_FOREACH_ITEM (extension, extensions)
-            if (midori_extension_is_active (extension))
-            {
-                const gchar* filename = g_object_get_data (G_OBJECT (extension), "filename");
-                g_return_val_if_fail (filename != NULL, FALSE);
-                if (filename && strchr (filename, '/'))
-                    g_warning ("%s: %s unexpected /", G_STRFUNC, filename);
-                gchar* key = katze_object_get_string (extension, "key");
-                gchar* subname = key ? g_strdup_printf ("%s/%s", filename, key) : g_strdup (filename);
-                g_key_file_set_boolean (key_file, "extensions", subname, TRUE);
-                g_free (key);
-                g_free (subname);
-            }
-        g_object_unref (extensions);
-    }
+    if (app != NULL)
+    {
+        /* Take frozen list of active extensions until preferences reset it */
+        gchar** _extensions;
+        KatzeArray* extensions;
+        if ((_extensions = g_object_get_data (G_OBJECT (app), "extensions")))
+        {
+            i = 0;
+            while (_extensions[i])
+                g_key_file_set_boolean (key_file, "extensions", _extensions[i++], TRUE);
+        }
+        else if ((extensions = katze_object_get_object (app, "extensions")))
+        {
+            MidoriExtension* extension;
+            KATZE_ARRAY_FOREACH_ITEM (extension, extensions)
+                if (midori_extension_is_active (extension))
+                {
+                    const gchar* filename = g_object_get_data (G_OBJECT (extension), "filename");
+                    g_return_val_if_fail (filename != NULL, FALSE);
+                    if (filename && strchr (filename, '/'))
+                        g_warning ("%s: %s unexpected /", G_STRFUNC, filename);
+                    gchar* key = katze_object_get_string (extension, "key");
+                    gchar* subname = key ? g_strdup_printf ("%s/%s", filename, key) : g_strdup (filename);
+                    g_key_file_set_boolean (key_file, "extensions", subname, TRUE);
+                    g_free (key);
+                    g_free (subname);
+                }
+            g_object_unref (extensions);
+        }
+    }
+
     saved = sokoke_key_file_save_to_file (key_file, filename, error);
     g_key_file_free (key_file);
     return saved;