Merge lp:~elementary-apps/midori/remove-lightwindow into lp:midori

[Danielle Foré]

Drop deprecated Granite LightWindow used for the Clear Private Data dialog

Removes Granite Lightwindow from the clear private data dialog.

[Robert Roth (evfool)]

When clicking Cancel on the dialog (cancel didn't exist on the lightwindow, just closing it didn't crash midori) midori crashes. Here's the stacktrace:
Program received signal SIGSEGV, Segmentation fault.
0x00007ffff7b34795 in midori_browser_get_settings (browser=0xfffffffa)
    at /home/evfool/Projects/elementary/remove-lightwindow/midori/midori-browser.c:3008
3008 g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
(gdb) backtrace
#0 0x00007ffff7b34795 in midori_browser_get_settings (browser=0xfffffffa)
    at /home/evfool/Projects/elementary/remove-lightwindow/midori/midori-browser.c:3008
#1 0x00007ffff7b48105 in midori_private_data_dialog_response_cb (
    button=0xde63a0, browser=0xfffffffa)
    at /home/evfool/Projects/elementary/remove-lightwindow/midori/midori-privatedata.c:52
#2 0x00007ffff78833b8 in g_closure_invoke (closure=0xde3180,
    return_value=0x0, n_param_values=2, param_values=0x7fffffffc9d0,
    invocation_hint=0x7fffffffc970)
    at /build/buildd/glib2.0-2.40.0/./gobject/gclosure.c:768
#3 0x00007ffff7894d3d in signal_emit_unlocked_R (node=node@entry=0x7704b0,
    detail=detail@entry=0, instance=instance@entry=0xde63a0,
    emission_return=emission_return@entry=0x0,
    instance_and_params=instance_and_params@entry=0x7fffffffc9d0)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3551
#4 0x00007ffff789ca29 in g_signal_emit_valist (instance=<optimized out>,
    signal_id=<optimized out>, detail=<optimized out>,
    var_args=var_args@entry=0x7fffffffcb68)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3307
#5 0x00007ffff789cce2 in g_signal_emit (instance=<optimized out>,
    signal_id=<optimized out>, detail=<optimized out>)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3363
---Type <return> to continue, or q <return> to quit---
#6 0x00007ffff78835e7 in _g_closure_invoke_va (closure=0xd16630,
    return_value=0x0, instance=0xd447a0, args=0x7fffffffce18, n_params=0,
    param_types=0x0) at /build/buildd/glib2.0-2.40.0/./gobject/gclosure.c:831
#7 0x00007ffff789c088 in g_signal_emit_valist (instance=0xd447a0,
    signal_id=<optimized out>, detail=0,
    var_args=var_args@entry=0x7fffffffce18)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3215
#8 0x00007ffff789cce2 in g_signal_emit (instance=<optimized out>,
    signal_id=<optimized out>, detail=<optimized out>)
    at /build/buildd/glib2.0-2.40.0/./gobject/gsignal.c:3363
#9 0x00007ffff6cef8fd in gtk_button_do_release (button=0xd447a0,
    emit_clicked=<optimized out>)
    at /build/buildd/gtk+3.0-3.12.2/./gtk/gtkbutton.c:1985
#10 0x00007ffff6cef943 in gtk_real_button_released (button=0xd447a0)
    at /build/buildd/gtk+3.0-3.12.2/./gtk/gtkbutton.c:2103
#11 0x00007ffff78833b8 in g_closure_invoke (closure=0x64ef10,
    return_value=0x0, n_param_values=1, param_values=0x7fffffffd0d0,
    invocation_hint=0x7fffffffd070)
    at /build/buildd/glib2.0-2.40.0/./gobject/gclosure.c:768
#12 0x00007ffff7894557 in signal_emit_unlocked_R (node=node@entry=0x64ef40,
    detail=detail@entry=0, instance=instance@entry=0xd447a0,
    emission_return=emission_return@entry=0x0,
    instance_and_params=instance_and_params@entry...

review: Needs Fixing

[Danielle Foré (danrabbit)]

There were a couple of other ifdefs I missed. Shouldn't crash now

[lp:~elementary-apps/midori/remove-lightwindow]

6744. By Danielle Foré on 2014-07-11

revert cmake accidental changes

[Danielle Foré (danrabbit)]

review: Approve

[Robert Roth (evfool)]

Ok, thanks for the fix.

review: Approve

=== modified file 'midori/midori-privatedata.c'
--- midori/midori-privatedata.c	2014-03-21 06:26:51 +0000
+++ midori/midori-privatedata.c	2014-07-11 01:37:06 +0000
@@ -22,26 +22,14 @@
 #include <gdk/gdkkeysyms.h>
 #include <sqlite3.h>
 
-#ifdef HAVE_GRANITE
-#include <granite/granite.h>
-#endif
-
     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
     #include <libsoup/soup-cache.h>
 
 static void
-#ifdef HAVE_GRANITE
-midori_private_data_dialog_response_cb (GtkWidget*    button,
-#else
 midori_private_data_dialog_response_cb (GtkWidget*     dialog,
                                         gint           response_id,
-#endif
                                         MidoriBrowser* browser)
 {
-    #ifdef HAVE_GRANITE
-    GtkWidget* dialog = gtk_widget_get_toplevel (button);
-    gint response_id = GTK_RESPONSE_ACCEPT;
-    #endif
     if (response_id == GTK_RESPONSE_ACCEPT)
     {
         GtkToggleButton* button;
@@ -126,18 +114,6 @@
     gint clear_prefs = MIDORI_CLEAR_NONE;
     g_object_get (settings, "clear-private-data", &clear_prefs, NULL);
 
-    #ifdef HAVE_GRANITE
-    /* FIXME: granite: should return GtkWidget* like GTK+ */
-    dialog = (GtkWidget*)granite_widgets_light_window_new (_("Clear Private Data"));
-    /* FIXME: granite: should return GtkWidget* like GTK+ */
-    content_area = (GtkWidget*)granite_widgets_decorated_window_get_box (GRANITE_WIDGETS_DECORATED_WINDOW (dialog));
-    hbox = gtk_hbox_new (FALSE, 4);
-    gtk_box_pack_end (GTK_BOX (content_area), hbox, FALSE, FALSE, 4);
-    button = gtk_button_new_with_mnemonic (_("_Clear private data"));
-    gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4);
-    g_signal_connect (button, "clicked",
-        G_CALLBACK (midori_private_data_dialog_response_cb), browser);
-    #else
     /* i18n: Dialog: Clear Private Data, in the Tools menu */
     dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"),
         GTK_WINDOW (browser),
@@ -150,17 +126,13 @@
     g_signal_connect (dialog, "response",
         G_CALLBACK (midori_private_data_dialog_response_cb), browser);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-    #endif
-    /* Elementary */
-    katze_widget_add_class (button, "noundo");
-    /* GNOME Shell */
     katze_widget_add_class (button, "destructive-action");
     screen = gtk_widget_get_screen (GTK_WIDGET (browser));
     if (screen)
         gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_CLEAR);
     sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     hbox = gtk_hbox_new (FALSE, 4);
-    icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_DIALOG);
+    icon = gtk_image_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_DIALOG);
     gtk_size_group_add_widget (sizegroup, icon);
     gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
     label = gtk_label_new (_("Clear the following data:"));
@@ -410,5 +382,4 @@
     item->clear = clear;
     items = g_list_append (items, item);
     return NULL;
-}
-
+}
\ No newline at end of file