gtk+ r21853 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Dec  8 02:39:28 2008
New Revision: 21853
URL: http://svn.gnome.org/viewvc/gtk+?rev=21853&view=rev

Log:
        * gtk/gtklinkbutton.c: Call gtk_show_uri() if no uri hook has
        been set. Patch by Emmanuele Bassi



Modified:
   trunk/ChangeLog
   trunk/gtk/gtklinkbutton.c

Modified: trunk/gtk/gtklinkbutton.c
==============================================================================
--- trunk/gtk/gtklinkbutton.c	(original)
+++ trunk/gtk/gtklinkbutton.c	Mon Dec  8 02:39:28 2008
@@ -474,6 +474,26 @@
 
   if (uri_func)
     (* uri_func) (link_button, link_button->priv->uri, uri_func_data);
+  else
+    {
+      GdkScreen *screen;
+      GError *error;
+
+      if (gtk_widget_has_screen (GTK_WIDGET (button)));
+        screen = gtk_widget_get_screen (GTK_WIDGET (button));
+      else
+        screen = NULL;
+
+      error = NULL;
+      gtk_show_uri (screen, link_button->priv->uri, GDK_CURRENT_TIME, &error);
+      if (error)
+        {
+          g_warning ("Unable to show '%s': %s",
+                     link_button->priv->uri,
+                     error->message);
+          g_error_free (error);
+        }
+    }
 
   gtk_link_button_set_visited (link_button, TRUE);
 }
@@ -690,6 +710,8 @@
  * a #GtkLinkButton. This function is called before every callback registered
  * for the "clicked" signal.
  *
+ * If no uri hook has been set, GTK+ defaults to calling gtk_show_uri().
+ *
  * Return value: the previously set hook function.
  *
  * Since: 2.10