rpms/gnome-panel/devel desktop-file-monitoring.patch, 1.3, 1.4 launcher-desktop-files.patch, 1.2, 1.3 preferred-apps.patch, 1.4, 1.5

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6419

Modified Files:
	desktop-file-monitoring.patch launcher-desktop-files.patch 
	preferred-apps.patch 
Log Message:
update patches


desktop-file-monitoring.patch:

Index: desktop-file-monitoring.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/desktop-file-monitoring.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- desktop-file-monitoring.patch	14 Feb 2008 02:13:40 -0000	1.3
+++ desktop-file-monitoring.patch	18 Jun 2008 21:31:13 -0000	1.4
@@ -135,7 +135,7 @@
 +	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);
 +	}

launcher-desktop-files.patch:

Index: launcher-desktop-files.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/launcher-desktop-files.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- launcher-desktop-files.patch	13 Sep 2007 17:42:24 -0000	1.2
+++ launcher-desktop-files.patch	18 Jun 2008 21:31:13 -0000	1.3
@@ -18,15 +18,15 @@
 +
 +	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 : "");

preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- preferred-apps.patch	14 Feb 2008 02:13:40 -0000	1.4
+++ preferred-apps.patch	18 Jun 2008 21:31:13 -0000	1.5
@@ -99,9 +99,9 @@
 +
 +	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");