don't write empty groups.

2004-09-28  Sven Neumann  <sven@gimp.org>

	* app/file/gimprecentlist.c (gimp_recent_list_write): don't write
	empty groups.

	* app/file/gimprecentlist.c: disabled the code for the win32
	platform. It doesn't make much sense there anyway. If someone
	wants to contribute a win32 specific implementation, we'd welcome
	that. A Mac OS X implementation would be nice to have as well.
This commit is contained in:
Sven Neumann 2004-09-28 21:17:57 +00:00 committed by Sven Neumann
parent 2e38cfe8cb
commit 4473915408
2 changed files with 52 additions and 23 deletions

View File

@ -1,3 +1,13 @@
2004-09-28 Sven Neumann <sven@gimp.org>
* app/file/gimprecentlist.c (gimp_recent_list_write): don't write
empty groups.
* app/file/gimprecentlist.c: disabled the code for the win32
platform. It doesn't make much sense there anyway. If someone
wants to contribute a win32 specific implementation, we'd welcome
that. A Mac OS X implementation would be nice to have as well.
2004-09-28 Sven Neumann <sven@gimp.org> 2004-09-28 Sven Neumann <sven@gimp.org>
* etc/ps-menurc: updated for GIMP 2.1 by Eric Pierce. * etc/ps-menurc: updated for GIMP 2.1 by Eric Pierce.

View File

@ -26,7 +26,6 @@
#include "config.h" #include "config.h"
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
@ -40,9 +39,11 @@
#include <glib-object.h> #include <glib-object.h>
#ifdef G_OS_WIN32 #ifndef G_OS_WIN32 /* This code doesn't compile on win32 and the use of
#include "libgimpbase/gimpwin32-io.h" * the freedesktop standard doesn't make much sense
#endif * there anyway. If someone wants to contribute a win32
* specific implementation, that would be appreciated.
*/
#include "config/config-types.h" #include "config/config-types.h"
@ -433,33 +434,37 @@ gimp_recent_list_write (gint fd,
string = g_string_append (string, string = g_string_append (string,
" <" TAG_PRIVATE "/>\n"); " <" TAG_PRIVATE "/>\n");
/* write the groups */
string = g_string_append (string,
" <" TAG_GROUPS ">\n");
groups = gimp_recent_item_get_groups (item); groups = gimp_recent_item_get_groups (item);
if (groups == NULL && gimp_recent_item_get_private (item)) if (groups)
g_warning ("Item with URI \"%s\" marked as private, but"
" does not belong to any groups.\n", uri);
while (groups)
{ {
const gchar *group = groups->data; /* write the groups */
gchar *escaped_group; string = g_string_append (string,
" <" TAG_GROUPS ">\n");
escaped_group = g_markup_escape_text (group, strlen(group)); if (groups == NULL && gimp_recent_item_get_private (item))
g_warning ("Item with URI \"%s\" marked as private, but"
" does not belong to any groups.\n", uri);
g_string_append_printf (string, while (groups)
" <" TAG_GROUP ">%s</" TAG_GROUP ">\n", {
escaped_group); const gchar *group = groups->data;
gchar *escaped_group;
g_free (escaped_group); escaped_group = g_markup_escape_text (group, strlen(group));
groups = groups->next; g_string_append_printf (string,
" <" TAG_GROUP ">%s</" TAG_GROUP ">\n",
escaped_group);
g_free (escaped_group);
groups = groups->next;
}
string = g_string_append (string, " </" TAG_GROUPS ">\n");
} }
string = g_string_append (string, " </" TAG_GROUPS ">\n");
string = g_string_append (string, string = g_string_append (string,
" </" TAG_RECENT_ITEM ">\n"); " </" TAG_RECENT_ITEM ">\n");
@ -587,11 +592,14 @@ gimp_recent_list_add_item (GimpRecentItem *item)
/** /**
* gimp_recent_list_add_uri: * gimp_recent_list_add_uri:
* @uri: an URI * @uri: an URI
* @mime_type: a mime-type * @mime_type: a MIME type
* *
* This function adds an item to the list of recently used URIs. * This function adds an item to the list of recently used URIs.
* See http://freedesktop.org/Standards/recent-file-spec/. * See http://freedesktop.org/Standards/recent-file-spec/.
* *
* On the Win32 platform, this call is unimplemented and will always
* fail.
*
* Returns: %TRUE on success, %FALSE otherwise * Returns: %TRUE on success, %FALSE otherwise
*/ */
gboolean gboolean
@ -622,3 +630,14 @@ gimp_recent_list_add_uri (const gchar *uri,
return success; return success;
} }
#else /* G_OS_WIN32 */
gboolean
gimp_recent_list_add_uri (const gchar *uri,
const gchar *mime_type)
{
return FALSE;
}
#endif