Attachment #188132 for bug #349604

View | Details | Raw Unified | Return to bug 349604
Collapse All | Expand All





	gchar **uris;
	gchar **groups;
	gchar **bookmarks = NULL;

	gchar  *buf, *label, *uri;

	gint i, j, bookmark_len;


	load_xbel_store (this);

	g_file_get_contents (priv->gtk_store_path, & buf, NULL, NULL);

	if (buf) {
		bookmarks = g_strsplit (buf, "\n", -1);
		g_free (buf);
	}

	for (i = 0; bookmarks && bookmarks [i]; ++i) {
		bookmark_len = strlen (bookmarks [i]);
		if (bookmark_len > 0) {
			label = strstr (bookmarks[i], " ");
			if (label != NULL && bookmark_len > 1)
				uri = g_strndup (bookmarks [i], bookmark_len - strlen (label));
			else
				uri = bookmarks [i];
			g_bookmark_file_add_group (priv->store, uri, "gtk-bookmarks");
			priv->create_item (this, uri);
			if (label != NULL)
				g_free (uri);
		}
	}

	g_strfreev (bookmarks);
}

static void

Lines 1-3 Link Here

(-)libslab/ChangeLog (+4 lines)
		1	2007-12-19 Ivan N. Zlatev <contact@i-nz.net>
		2
		3	* bookmark-agent.c: Handle labels in .gtk-bookmarks
		4
1	2007-09-16 Andre Klapper <a9016009@gmx.de>	5	2007-09-16 Andre Klapper <a9016009@gmx.de>
2		6
3	* system-tile.c: revert to svn revision 339 (=before	7	* system-tile.c: revert to svn revision 339 (=before

Return to bug 349604

Lines 777-787 Link Here

(-)libslab/bookmark-agent.c (-9 / +17 lines)
777		777
778	gchar **uris;	778	gchar **uris;
779	gchar **groups;	779	gchar **groups;
780	gchar **folders = NULL;	780	gchar **bookmarks = NULL;
781		781
782	gchar *buf;	782	gchar buf, label, *uri;
783		783
784	gint i, j;	784	gint i, j, bookmark_len;
785		785
786		786
787	load_xbel_store (this);	787	load_xbel_store (this);
Lines 807-824 Link Here
807	g_file_get_contents (priv->gtk_store_path, & buf, NULL, NULL);	807	g_file_get_contents (priv->gtk_store_path, & buf, NULL, NULL);
808		808
809	if (buf) {	809	if (buf) {
810	folders = g_strsplit (buf, "\n", -1);	810	bookmarks = g_strsplit (buf, "\n", -1);
811	g_free (buf);	811	g_free (buf);
812	}	812	}
813		813
814	for (i = 0; folders && folders [i]; ++i) {	814	for (i = 0; bookmarks && bookmarks [i]; ++i) {
815	if (strlen (folders [i]) > 0) {	815	bookmark_len = strlen (bookmarks [i]);
816	g_bookmark_file_add_group (priv->store, folders [i], "gtk-bookmarks");	816	if (bookmark_len > 0) {
817	priv->create_item (this, folders [i]);	817	label = strstr (bookmarks[i], " ");
		818	if (label != NULL && bookmark_len > 1)
		819	uri = g_strndup (bookmarks [i], bookmark_len - strlen (label));
		820	else
		821	uri = bookmarks [i];
		822	g_bookmark_file_add_group (priv->store, uri, "gtk-bookmarks");
		823	priv->create_item (this, uri);
		824	if (label != NULL)
		825	g_free (uri);
818	}	826	}
819	}	827	}
820		828
821	g_strfreev (folders);	829	g_strfreev (bookmarks);
822	}	830	}
823		831
824	static void	832	static void