goffice r2262 - in trunk: . goffice/utils
- From: jbrefort svn gnome org
- To: svn-commits-list gnome org
- Subject: goffice r2262 - in trunk: . goffice/utils
- Date: Sun, 2 Nov 2008 14:40:12 +0000 (UTC)
Author: jbrefort
Date: Sun Nov 2 14:40:12 2008
New Revision: 2262
URL: http://svn.gnome.org/viewvc/goffice?rev=2262&view=rev
Log:
2008-11-01 Jean Brefort <jean brefort normalesup org>
* goffice/utils/go-file.c: (go_url_show): removed duplicated GError*.
Modified:
trunk/ChangeLog
trunk/goffice/utils/go-file.c
Modified: trunk/goffice/utils/go-file.c
==============================================================================
--- trunk/goffice/utils/go-file.c (original)
+++ trunk/goffice/utils/go-file.c Sun Nov 2 14:40:12 2008
@@ -35,7 +35,9 @@
#include <urlmon.h>
#include <io.h>
#endif
-
+#ifdef HAVE_GTK_SHOW_URI
+#include <gtk/gtk.h>
+#endif
#include <string.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
@@ -927,17 +929,15 @@
ShellExecute (NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
return NULL;
-#else
- GError *err = NULL;
-#ifdef HAVE_GTK_SHOW_URI
- GError *err = NULL;
+#elif defined(HAVE_GTK_SHOW_URI)
+ GError *error = NULL;
gtk_show_uri (NULL, url, GDK_CURRENT_TIME, &error);
return error;
#else
- g_app_info_launch_default_for_uri (url, NULL, &err);
+ GError *error = NULL;
+ g_app_info_launch_default_for_uri (url, NULL, &error);
return err;
#endif
-#endif
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]