From 823810f0d7c8c53842926876a92c36e48c755a84 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 3 Jul 2008 14:57:14 +0000 Subject: [PATCH] fix patch --- gio-2.16-only-pass-uri-to-gio-apps.patch | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gio-2.16-only-pass-uri-to-gio-apps.patch b/gio-2.16-only-pass-uri-to-gio-apps.patch index f646710..93e4f39 100644 --- a/gio-2.16-only-pass-uri-to-gio-apps.patch +++ b/gio-2.16-only-pass-uri-to-gio-apps.patch @@ -1,14 +1,13 @@ -Index: gio/gdesktopappinfo.c -=================================================================== ---- gio/gdesktopappinfo.c (revision 6851) -+++ gio/gdesktopappinfo.c (working copy) +diff -up glib-2.17.3/gio/gdesktopappinfo.c.only-pass-uri-to-gio-apps glib-2.17.3/gio/gdesktopappinfo.c +--- glib-2.17.3/gio/gdesktopappinfo.c.only-pass-uri-to-gio-apps 2008-07-02 17:13:13.000000000 -0400 ++++ glib-2.17.3/gio/gdesktopappinfo.c 2008-07-03 10:55:58.000000000 -0400 @@ -1,3 +1,5 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ + /* GIO - GLib Input, Output and Streaming Library * * Copyright (C) 2006-2007 Red Hat, Inc. -@@ -87,6 +89,7 @@ +@@ -89,6 +91,7 @@ struct _GDesktopAppInfo char *exec; char *binary; char *path; @@ -16,7 +15,7 @@ Index: gio/gdesktopappinfo.c guint nodisplay : 1; guint hidden : 1; -@@ -149,6 +152,7 @@ +@@ -151,6 +154,7 @@ g_desktop_app_info_finalize (GObject *ob g_free (info->try_exec); g_free (info->exec); g_free (info->binary); @@ -24,15 +23,15 @@ Index: gio/gdesktopappinfo.c g_free (info->path); G_OBJECT_CLASS (g_desktop_app_info_parent_class)->finalize (object); -@@ -264,6 +268,7 @@ +@@ -254,6 +258,7 @@ g_desktop_app_info_new_from_keyfile (GKe info->terminal = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TERMINAL, NULL) != FALSE; info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE; info->hidden = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_HIDDEN, NULL) != FALSE; + info->vfs_system = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, "X-Gnome-Vfs-System", NULL); - - g_key_file_free (key_file); -@@ -498,9 +503,35 @@ + info->icon = NULL; + if (info->icon_name) +@@ -517,9 +522,35 @@ expand_macro (char macro, { GList *uris = *uri_list; char *expanded; @@ -70,7 +69,7 @@ Index: gio/gdesktopappinfo.c switch (macro) { case 'u': -@@ -509,7 +540,17 @@ +@@ -528,7 +559,17 @@ expand_macro (char macro, case 'n': if (uris) { @@ -89,7 +88,7 @@ Index: gio/gdesktopappinfo.c if (expanded) { g_string_append (exec, expanded); -@@ -526,7 +567,17 @@ +@@ -545,7 +586,17 @@ expand_macro (char macro, case 'N': while (uris) {