cheese r491 - in trunk: . src

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Sat Feb  9 21:13:03 2008
New Revision: 491
URL: http://svn.gnome.org/viewvc/cheese?rev=491&view=rev

Log:
Use xdg-open instead of g_app_info_launch_default_for_uri because for that gtk 2.16 is necessary. Bump back glib requirement to 2.15.4


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/cheese-window.c
   trunk/wscript

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Feb  9 21:13:03 2008
@@ -54,8 +54,7 @@
 # Check required libraries
 #*******************************************************************************
 
-GLIB_REQUIRED=2.15.5
-GIO_REQUIRED=2.15.5
+GLIB_REQUIRED=2.15.4
 GTK_REQUIRED=2.10.0
 LIBGLADE_REQUIRED=2.6.0
 LIBGNOMEUI_REQUIRED=2.14.0
@@ -71,7 +70,7 @@
 
 PKG_CHECK_MODULES(CHEESE, \ 
   glib-2.0 >= $GLIB_REQUIRED \
-  gio-2.0 >= $GIO_REQUIRED \
+  gio-2.0 >= $GLIB_REQUIRED \
   gtk+-2.0 >= $GTK_REQUIRED \
   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
   libglade-2.0 >= $LIBGLADE_REQUIRED \

Modified: trunk/src/cheese-window.c
==============================================================================
--- trunk/src/cheese-window.c	(original)
+++ trunk/src/cheese-window.c	Sat Feb  9 21:13:03 2008
@@ -117,6 +117,20 @@
 
 } CheeseWindow;
 
+static gboolean
+cheese_open_uri (GtkWindow *parent, const char *url, GError **error)
+{
+  gboolean ret;
+  char *cmdline;
+  GdkScreen *screen;
+
+  screen = gtk_window_get_screen (GTK_WINDOW (parent));
+  cmdline = g_strconcat ("xdg-open ", url, NULL);
+  ret = gdk_spawn_command_line_on_screen (screen, cmdline, error);
+  g_free (cmdline);
+
+  return ret;
+}
 
 /* Make url in about dialog clickable */
 static void
@@ -126,7 +140,7 @@
   GtkWidget *error_dialog;
   gboolean ret;
 
-  ret = g_app_info_launch_default_for_uri (url, NULL, &error);
+  ret = cheese_open_uri (GTK_WINDOW (dialog), url, &error);
   if (ret == FALSE) {
     error_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog), 
                                            GTK_DIALOG_DESTROY_WITH_PARENT, 
@@ -149,7 +163,7 @@
 
   uri = g_strconcat ("mailto:";, email, NULL);
 
-  ret = g_app_info_launch_default_for_uri (uri, NULL, &error);
+  ret = cheese_open_uri (GTK_WINDOW (dialog), uri, &error);
   if (ret == FALSE) {
     error_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog), 
                                            GTK_DIALOG_DESTROY_WITH_PARENT, 
@@ -240,7 +254,7 @@
   uri = g_filename_to_uri (filename, NULL, NULL);
   g_free (filename);
  
-  ret = g_app_info_launch_default_for_uri (uri, NULL, &error);
+  ret = cheese_open_uri (GTK_WINDOW (cheese_window->window), uri, &error);
   if (ret == FALSE) {
     dialog = gtk_message_dialog_new (GTK_WINDOW (cheese_window->window), 
                                      GTK_DIALOG_DESTROY_WITH_PARENT, 
@@ -525,7 +539,7 @@
   GError *error = NULL;
   gboolean ret;
 
-  ret = g_app_info_launch_default_for_uri ("ghelp:cheese", NULL, &error);
+  ret = cheese_open_uri (GTK_WINDOW (cheese_window->window), "ghelp:cheese", &error);
 
   if (ret == FALSE) 
   {

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Sat Feb  9 21:13:03 2008
@@ -34,8 +34,8 @@
 	conf.check_tool('gcc gnome intltool misc')
 
 	conf.check_pkg('gobject-2.0', destvar='GOBJECT', vnum='2.12.0', mandatory=True)
-	conf.check_pkg('glib-2.0', destvar='GLIB', vnum='2.15.5', mandatory=True)
-	conf.check_pkg('gio-2.0', destvar='GLIB', vnum='2.15.5', mandatory=True)
+	conf.check_pkg('glib-2.0', destvar='GLIB', vnum='2.15.4', mandatory=True)
+	conf.check_pkg('gio-2.0', destvar='GLIB', vnum='2.15.4', mandatory=True)
 	conf.check_pkg('cairo', destvar='CAIRO', vnum='1.4.0', mandatory=True)
 	conf.check_pkg('pangocairo', destvar='PANGOCAIRO', vnum='1.18.0', mandatory=True)
 	conf.check_pkg('gdk-2.0', destvar='GDK', vnum='2.12.0', mandatory=True)