Merge lp:~gue5t/midori/last-placeholders into lp:midori

[gue5t gue5t]

Fix last known GTK2 entry placeholder text bugs

This branch fixes the last bugs I could find with GTK2 entry placeholder text. One is that cookie permissions was still using the old string to check placeholder visibility, but this branch also ensures that signal handlers for placeholder maintenance are removed when setting a NULL placeholder and makes right-click paste work properly.

[Cris Dywan (kalikiana)]

Maybe we should have some #define or utility function like sokoke_gtk_entry_has_default afterall..

review: Needs Information

[Cris Dywan (kalikiana)]

Aside from that finding an easier approach for testing this sort of thing, but that's always a matter of brainstorming and takes time.

[Cris Dywan (kalikiana)]

Let's not block on that for now.

review: Approve

=== modified file 'extensions/cookie-manager/cookie-manager-page.c'
--- extensions/cookie-manager/cookie-manager-page.c	2013-06-26 21:54:50 +0000
+++ extensions/cookie-manager/cookie-manager-page.c	2015-08-10 23:48:40 +0000
@@ -163,7 +163,7 @@
 	g_object_unref(priv->filter);
 
 	/* if a filter is set, apply it again but ignore the place holder text */
-	if (!g_object_get_data (G_OBJECT (priv->filter_entry), "sokoke_has_default"))
+	if (!g_object_get_data (G_OBJECT (priv->filter_entry), "sokoke_showing_default"))
 	{
 		filter_text = gtk_entry_get_text(GTK_ENTRY(priv->filter_entry));
 		if (*filter_text != '\0')
@@ -575,7 +575,7 @@
 	if (toplevel != NULL)
 		gtk_window_set_icon_name(GTK_WINDOW(dialog), gtk_window_get_icon_name(GTK_WINDOW(toplevel)));
 
-	if (!g_object_get_data (G_OBJECT (priv->filter_entry), "sokoke_has_default"))
+	if (!g_object_get_data (G_OBJECT (priv->filter_entry), "sokoke_showing_default"))
 	{
 		filter_text = gtk_entry_get_text(GTK_ENTRY(priv->filter_entry));
 		if (*filter_text != '\0')
@@ -808,7 +808,7 @@
 	if (priv->ignore_changed_filter)
 		return;
 
-	if (!g_object_get_data (G_OBJECT (editable), "sokoke_has_default"))
+	if (!g_object_get_data (G_OBJECT (editable), "sokoke_showing_default"))
 		text = gtk_entry_get_text(GTK_ENTRY(editable));
 	else
 		text = NULL;
 
=== modified file 'katze/gtk3-compat.c'
--- katze/gtk3-compat.c	2015-03-15 19:09:28 +0000
+++ katze/gtk3-compat.c	2015-08-10 23:48:40 +0000
@@ -166,17 +166,44 @@
     return FALSE;
 }
 
+static void
+sokoke_on_entry_popup (GtkEntry  *entry,
+                       GtkWidget *popup,
+                       gpointer   user_data)
+{
+    /* If the user selects paste in the popup, we should hide the default
+    when the menu closes so it pastes into a clean entry */
+    g_signal_connect_swapped (popup, "destroy", G_CALLBACK (
+        sokoke_hide_placeholder_text), entry);
+}
+
 void
 gtk_entry_set_placeholder_text (GtkEntry*    entry,
                                 const gchar* default_text)
 {
     /* Note: The default text initially overwrites any previous text */
-    gchar* old_value = g_object_get_data (G_OBJECT (entry), "sokoke_default_text");
+    gchar* old_default_text = g_object_get_data (G_OBJECT (entry), "sokoke_default_text");
     g_object_set_data (G_OBJECT (entry), "sokoke_default_text", (gpointer)default_text);
 
     if (default_text == NULL)
+    {
         g_object_set_data (G_OBJECT (entry), "sokoke_showing_default", GINT_TO_POINTER (0));
-    else if (!old_value)
+        g_signal_handlers_disconnect_by_func (entry,
+            G_CALLBACK (sokoke_on_entry_drag_motion), NULL);
+        g_signal_handlers_disconnect_by_func (entry,
+            G_CALLBACK (sokoke_on_entry_focus_in_event), NULL);
+        g_signal_handlers_disconnect_by_func (entry,
+            G_CALLBACK (sokoke_on_entry_drag_leave), NULL);
+        g_signal_handlers_disconnect_by_func (entry,
+            G_CALLBACK (sokoke_on_entry_drag_drop), NULL);
+        g_signal_handlers_disconnect_by_func (entry,
+           G_CALLBACK (sokoke_on_entry_focus_out_event), NULL);
+        g_signal_handlers_disconnect_by_func (entry,
+            G_CALLBACK (sokoke_on_entry_text_changed), NULL);
+        g_signal_handlers_disconnect_by_func (entry,
+            G_CALLBACK (sokoke_on_entry_popup), NULL);
+    }
+    else if (old_default_text == NULL)
     {
         g_object_set_data (G_OBJECT (entry), "sokoke_showing_default", GINT_TO_POINTER (1));
         sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC);
@@ -193,6 +220,8 @@
            G_CALLBACK (sokoke_on_entry_focus_out_event), NULL);
         g_signal_connect (entry, "notify::text",
             G_CALLBACK (sokoke_on_entry_text_changed), NULL);
+        g_signal_connect (entry, "populate-popup",
+            G_CALLBACK (sokoke_on_entry_popup), NULL);
     }
     else if (!gtk_widget_has_focus (GTK_WIDGET (entry)))
     {
 
=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2015-07-06 21:26:46 +0000
+++ midori/midori-locationaction.c	2015-08-10 23:48:40 +0000
@@ -981,7 +981,10 @@
 midori_location_action_changed_cb (GtkEntry*             entry,
                                    MidoriLocationAction* location_action)
 {
-    katze_assign (location_action->text, g_strdup (gtk_entry_get_text (entry)));
+    if (g_object_get_data (G_OBJECT (entry), "sokoke_showing_default"))
+        katze_assign (location_action->text, g_strdup (""));
+    else
+        katze_assign (location_action->text, g_strdup (gtk_entry_get_text (entry)));
 }
 
 static void