rpms/glib2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix patch

Browse Source
This commit is contained in:
Matthias Clasen 2008-07-03 14:57:14 +00:00
parent 8708040ca0
commit 823810f0d7
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gio-2.16-only-pass-uri-to-gio-apps.patch
View File

@ -1,14 +1,13 @@
Index: gio/gdesktopappinfo.c 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
--- gio/gdesktopappinfo.c (revision 6851) +++ glib-2.17.3/gio/gdesktopappinfo.c 2008-07-03 10:55:58.000000000 -0400
+++ gio/gdesktopappinfo.c (working copy)
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+ +
/* GIO - GLib Input, Output and Streaming Library /* GIO - GLib Input, Output and Streaming Library
* *
* Copyright (C) 2006-2007 Red Hat, Inc. * Copyright (C) 2006-2007 Red Hat, Inc.
@@ -87,6 +89,7 @@ @@ -89,6 +91,7 @@ struct _GDesktopAppInfo
char *exec; char *exec;
char *binary; char *binary;
char *path; char *path;
@ -16,7 +15,7 @@ Index: gio/gdesktopappinfo.c
guint nodisplay : 1; guint nodisplay : 1;
guint hidden : 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->try_exec);
g_free (info->exec); g_free (info->exec);
g_free (info->binary); g_free (info->binary);
@ -24,15 +23,15 @@ Index: gio/gdesktopappinfo.c
g_free (info->path); g_free (info->path);
G_OBJECT_CLASS (g_desktop_app_info_parent_class)->finalize (object); 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->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->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->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); + 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); info->icon = NULL;
if (info->icon_name)
@@ -498,9 +503,35 @@ @@ -517,9 +522,35 @@ expand_macro (char macro,
{ {
GList *uris = *uri_list; GList *uris = *uri_list;
char *expanded; char *expanded;
@ -70,7 +69,7 @@ Index: gio/gdesktopappinfo.c
switch (macro) switch (macro)
{ {
case 'u': case 'u':
@@ -509,7 +540,17 @@ @@ -528,7 +559,17 @@ expand_macro (char macro,
case 'n': case 'n':
if (uris) if (uris)
{ {
@ -89,7 +88,7 @@ Index: gio/gdesktopappinfo.c
if (expanded) if (expanded)
{ {
g_string_append (exec, expanded); g_string_append (exec, expanded);
@@ -526,7 +567,17 @@ @@ -545,7 +586,17 @@ expand_macro (char macro,
case 'N': case 'N':
while (uris) while (uris)
{ {