Attachment 188614 Details for Bug 327461

Patch to remove this behavior

g-m-m-bgo-327461.patch (text/x-patch), 2.80 KB, created by Magnus Boman on 2007-12-22 21:30:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Magnus Boman

Created: 2007-12-22 21:30:34 UTC

Size: 2.80 KB

patch

obsolete

>Index: libslab/bookmark-agent.c
>===================================================================
>--- libslab/bookmark-agent.c	(revision 371)
>+++ libslab/bookmark-agent.c	(working copy)
>@@ -126,7 +126,6 @@
> static void update_recent_store_path (BookmarkAgent *);
> static void save_xbel_store          (BookmarkAgent *);
> static void create_app_item          (BookmarkAgent *, const gchar *);
>-static void create_doc_item          (BookmarkAgent *, const gchar *);
> static void create_dir_item          (BookmarkAgent *, const gchar *);
> 
> static void store_monitor_cb (GnomeVFSMonitorHandle *, const gchar *, const gchar *,
>@@ -433,7 +432,7 @@
> 		case BOOKMARK_STORE_USER_DOCS:
> 			priv->lockdown_key   = MODIFIABLE_DOCS_GCONF_KEY;
> 			priv->store_filename = USER_DOCS_STORE_FILE_NAME;
>-			priv->create_item    = create_doc_item;
>+			priv->create_item    = NULL;
> 
> 			break;
> 
>@@ -767,7 +766,8 @@
> 	uris = g_bookmark_file_get_uris (priv->store, NULL);
> 
> 	for (i = 0; uris && uris [i]; ++i)
>-		priv->create_item (this, uris [i]);
>+		if (priv->create_item)
>+			priv->create_item (this, uris [i]);
> }
> 
> static void
>@@ -814,7 +814,8 @@
> 	for (i = 0; folders && folders [i]; ++i) {
> 		if (strlen (folders [i]) > 0) {
> 			g_bookmark_file_add_group (priv->store, folders [i], "gtk-bookmarks");
>-			priv->create_item (this, folders [i]);
>+			if (priv->create_item)
>+				priv->create_item (this, folders [i]);
> 		}
> 	}
> 
>@@ -1014,60 +1015,6 @@
> }
> 
> static void
>-create_doc_item (BookmarkAgent *this, const gchar *uri)
>-{
>-	BookmarkAgentPrivate *priv = PRIVATE (this);
>-
>-	gchar *uri_new = NULL;
>-	gchar *path;
>-	gchar *dir;
>-	gchar *file;
>-	gchar *template = NULL;
>-	gsize  length;
>-	gchar *contents;
>-
>-
>-	if (! (strcmp (uri, "BLANK_SPREADSHEET") && strcmp (uri, "BLANK_DOCUMENT"))) {
>-		dir = g_build_filename (g_get_home_dir (), "Documents", NULL);
>-
>-		if (! strcmp (uri, "BLANK_SPREADSHEET")) {
>-			file = g_strconcat (_("New Spreadsheet"), ".ods", NULL);
>-			template = find_package_data_file (CALC_TEMPLATE_FILE_NAME);
>-		}
>-		else
>-			file = g_strconcat (_("New Document"), ".odt", NULL);
>-
>-		path = g_build_filename (dir, file, NULL);
>-
>-		if (! g_file_test (path, G_FILE_TEST_EXISTS)) {
>-			g_mkdir_with_parents (dir, 0700);
>-
>-			if (template != NULL) {
>-				if (g_file_get_contents (template, & contents, & length, NULL))
>-					g_file_set_contents (path, contents, length, NULL);
>-
>-				g_free (contents);
>-				g_free (template);
>-			}
>-			else
>-				fclose (g_fopen (path, "w"));
>-		}
>-
>-		uri_new = g_filename_to_uri (path, NULL, NULL);
>-
>-		g_free (dir);
>-		g_free (file);
>-		g_free (path);
>-	}
>-
>-	if (! uri_new)
>-		return;
>-
>-	if (libslab_strcmp (uri, uri_new))
>-		g_bookmark_file_move_item (priv->store, uri, uri_new, NULL);
>-}
>-
>-static void
> create_dir_item (BookmarkAgent *this, const gchar *uri)
> {
> 	BookmarkAgentPrivate *priv = PRIVATE (this);

Actions: View

Attachments on bug 327461: 188614 | 218926