diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-06-18 21:31:13 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-06-18 21:31:13 +0000 |
| commit | 5107e1895658688b0457672339737c5e6291387d (patch) | |
| tree | f135c00124c88affbc46a9df4cf5f6d8f94576a4 | |
| parent | ece03669e6e7c1713a90f5ad09242db0a24068ae (diff) | |
| download | gnome-panel-5107e1895658688b0457672339737c5e6291387d.tar.gz gnome-panel-5107e1895658688b0457672339737c5e6291387d.tar.xz gnome-panel-5107e1895658688b0457672339737c5e6291387d.zip | |
update patchesgnome-panel-2_23_4-1_fc10
| -rw-r--r-- | desktop-file-monitoring.patch | 2 | ||||
| -rw-r--r-- | launcher-desktop-files.patch | 10 | ||||
| -rw-r--r-- | preferred-apps.patch | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch index 7048299..14a5ea3 100644 --- a/desktop-file-monitoring.patch +++ b/desktop-file-monitoring.patch @@ -135,7 +135,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom + if (entry) { + key_file = g_key_file_new (); + if (!g_key_file_load_from_file (key_file, entry, 0, NULL) || -+ !panel_util_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE)) ++ !panel_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE)) + entry = NULL; + g_key_file_free (key_file); + } diff --git a/launcher-desktop-files.patch b/launcher-desktop-files.patch index f42379d..27b09fb 100644 --- a/launcher-desktop-files.patch +++ b/launcher-desktop-files.patch @@ -18,15 +18,15 @@ diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-f + + key_file = g_key_file_new (); + if (g_key_file_load_from_file (key_file, uri, 0, NULL)) { -+ if (panel_util_key_file_get_boolean (key_file, "Terminal", FALSE)) ++ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE)) + gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 1); + else + gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 0); + -+ name = panel_util_key_file_get_locale_string (key_file, "Name"); -+ comment = panel_util_key_file_get_locale_string (key_file, "Comment"); -+ icon = panel_util_key_file_get_locale_string (key_file, "Icon"); -+ exec = panel_util_key_file_get_string (key_file, "Exec"); ++ name = panel_key_file_get_locale_string (key_file, "Name"); ++ comment = panel_key_file_get_locale_string (key_file, "Comment"); ++ icon = panel_key_file_get_locale_string (key_file, "Icon"); ++ exec = panel_key_file_get_string (key_file, "Exec"); + + gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : ""); + gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : ""); diff --git a/preferred-apps.patch b/preferred-apps.patch index 89357af..74f51ae 100644 --- a/preferred-apps.patch +++ b/preferred-apps.patch @@ -99,9 +99,9 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps gnome-panel-2 + + location = find_desktop_file_from_exec (exec); + key_file = g_key_file_new (); -+ if (!panel_util_key_file_load_from_uri (key_file, location, -+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, -+ NULL)) { ++ if (!panel_key_file_load_from_uri (key_file, location, ++ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, ++ NULL)) { + /* FIXME would be much better if preferred apps were backed by desktop files */ + g_key_file_set_string (key_file, "Desktop Entry", "Version", "1.0"); + g_key_file_set_string (key_file, "Desktop Entry", "Encoding", "UTF-8"); |