gtk+ r19509 - in trunk: . gtk tests

[ebassi svn gnome org]

Author: ebassi
Date: Mon Feb 11 09:54:09 2008
New Revision: 19509
URL: http://svn.gnome.org/viewvc/gtk+?rev=19509&view=rev

Log:
2008-02-11  Emmanuele Bassi  <ebassi gnome org>

	* gtk/gtkrecentchoosermenu.c:
	(gtk_recent_chooser_menu_constructor): Set no-show-all flag
	on the placeholder menu item.

	* tests/testrecentchoosermenu.c:
	(create_recent_chooser_menu): Use gtk_widget_show_all() to test
	whether the placeholder menu item gets shown.

Modified:
   trunk/ChangeLog
   trunk/gtk/gtklinkbutton.c
   trunk/gtk/gtkrecentchoosermenu.c
   trunk/tests/testrecentchoosermenu.c

Modified: trunk/gtk/gtklinkbutton.c
==============================================================================
--- trunk/gtk/gtklinkbutton.c	(original)
+++ trunk/gtk/gtklinkbutton.c	Mon Feb 11 09:54:09 2008
@@ -538,8 +538,8 @@
     }
   
   retval = g_object_new (GTK_TYPE_LINK_BUTTON,
-  			 "uri", uri,
   			 "label", utf8_uri,
+  			 "uri", uri,
   			 NULL);
   
   g_free (utf8_uri);
@@ -590,17 +590,24 @@
 gtk_link_button_set_uri (GtkLinkButton *link_button,
 			 const gchar   *uri)
 {
+  GtkLinkButtonPrivate *priv;
+  const gchar *label;
   gchar *tmp;
 
   g_return_if_fail (GTK_IS_LINK_BUTTON (link_button));
   g_return_if_fail (uri != NULL);
-  
-  tmp = link_button->priv->uri;
-  link_button->priv->uri = g_strdup (uri);
-  g_free (tmp);
 
-  link_button->priv->visited = FALSE;
-  
+  priv = link_button->priv;
+
+  g_free (priv->uri);
+  priv->uri = g_strdup (uri);
+
+  label = gtk_button_get_label (GTK_BUTTON (link_button));
+  if (label && *label != '\0' && strcmp (label, uri) != 0)
+    gtk_widget_set_tooltip_text (GTK_WIDGET (link_button), uri);
+
+  priv->visited = FALSE;
+
   g_object_notify (G_OBJECT (link_button), "uri");
 }
 

Modified: trunk/gtk/gtkrecentchoosermenu.c
==============================================================================
--- trunk/gtk/gtkrecentchoosermenu.c	(original)
+++ trunk/gtk/gtkrecentchoosermenu.c	Mon Feb 11 09:54:09 2008
@@ -324,6 +324,7 @@
                      GINT_TO_POINTER (TRUE));
 
   gtk_menu_shell_insert (GTK_MENU_SHELL (menu), priv->placeholder, 0);
+  gtk_widget_set_no_show_all (priv->placeholder, TRUE);
   gtk_widget_show (priv->placeholder);
 
   /* (re)populate the menu */

Modified: trunk/tests/testrecentchoosermenu.c
==============================================================================
--- trunk/tests/testrecentchoosermenu.c	(original)
+++ trunk/tests/testrecentchoosermenu.c	Mon Feb 11 09:54:09 2008
@@ -81,8 +81,6 @@
                     G_CALLBACK (item_activated_cb),
                     NULL);
 
-  gtk_widget_show (menu);
-
   menuitem = gtk_separator_menu_item_new ();
   gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
@@ -103,6 +101,8 @@
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
 
+  gtk_widget_show_all (menu);
+
   return menu;
 }