Merge lp:~midori/midori/alcoPops into lp:midori

[Cris Dywan]

Port location action from Granite.PopOver to Gtk.Popover

TODO: Port security buttons
Error: Gdk-CRITICAL **: gdk_window_get_scale_factor: assertion 'GDK_IS_WINDOW (window)' failed

Unmerged revisions

6602. By Cris Dywan on 2014-03-16

Port location action from Granite.PopOver to Gtk.Popover

=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2014-02-23 11:30:04 +0000
+++ midori/midori-locationaction.c	2014-03-16 13:03:22 +0000
@@ -1332,6 +1332,7 @@
     MIDORI_CERT_EXPORT,
 } MidoriCertTrust;
 
+#if !GTK_CHECK_VERSION (3, 11, 8)
 static void
 midori_location_action_cert_response_cb (GtkWidget*      dialog,
                                          gint            response,
@@ -1373,6 +1374,7 @@
     gtk_widget_destroy (dialog);
 }
 #endif
+#endif
 
 const gchar*
 midori_location_action_tls_flags_to_string (GTlsCertificateFlags tls_flags)
@@ -1434,6 +1436,7 @@
     details = (GtkWidget*)gcr_certificate_details_widget_new (gcr_cert);
     gtk_widget_show (details);
     gtk_container_add (GTK_CONTAINER (box), details);
+    #if !GTK_CHECK_VERSION (3, 11, 8)
     if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, NULL))
         gtk_dialog_add_buttons (GTK_DIALOG (dialog),
             ("_Don't trust this website"), MIDORI_CERT_REVOKE, NULL);
@@ -1443,11 +1446,12 @@
     gtk_container_child_set (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dialog))),
         gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Export certificate"), MIDORI_CERT_EXPORT),
         "secondary", TRUE, NULL);
+    g_signal_connect (dialog, "response",
+        G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert);
+    #endif
 
     g_object_set_data_full (G_OBJECT (gcr_cert), "peer", hostname, (GDestroyNotify)g_free);
     g_object_set_data_full (G_OBJECT (dialog), "gcr-cert", gcr_cert, (GDestroyNotify)g_object_unref);
-    g_signal_connect (dialog, "response",
-        G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert);
     /* With GTK+2 the scrolled contents can't communicate a natural size to the window */
     #if !GTK_CHECK_VERSION (3, 0, 0)
     gtk_window_set_default_size (GTK_WINDOW (dialog), 250, 200);
@@ -1490,28 +1494,20 @@
         const gchar* title = _("Security details");
         GtkWidget* content_area;
         GtkWidget* hbox;
-        #ifdef HAVE_GRANITE
-        gint wx, wy;
-        GtkAllocation allocation;
+        #if GTK_CHECK_VERSION (3, 11, 8)
         GdkRectangle icon_rect;
 
-        /* FIXME: granite: should return GtkWidget* like GTK+ */
-        dialog = (GtkWidget*)granite_widgets_pop_over_new ();
+        dialog = gtk_popover_new (widget);
         gchar* markup = g_strdup_printf ("<b>%s</b>", title);
         GtkWidget* label = gtk_label_new (markup);
-        content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+        content_area = gtk_vbox_new (FALSE, 0);
+        gtk_container_add (GTK_CONTAINER (dialog), content_area);
         g_free (markup);
         gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
         gtk_box_pack_start (GTK_BOX (content_area), label, FALSE, FALSE, 0);
 
-        gtk_widget_get_allocation (widget, &allocation);
-        gdk_window_get_origin (gtk_widget_get_window (widget), &wx, &wy);
-        wx += allocation.x;
         gtk_entry_get_icon_area (GTK_ENTRY (widget), icon_pos, &icon_rect);
-        wx += (icon_rect.x + icon_rect.width / 2);
-        wy += (icon_rect.y + icon_rect.height);
-        granite_widgets_pop_over_move_to_coords (GRANITE_WIDGETS_POP_OVER (dialog),
-            wx, wy, TRUE);
+        gtk_popover_set_pointing_to (GTK_POPOVER (dialog), &icon_rect);
         #else
         dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (gtk_widget_get_toplevel (widget)),
             GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, NULL, NULL);