Attachment #188154 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;

	gint i, j;


	load_xbel_store (this);

	uris = g_bookmark_file_get_uris (priv->store, NULL);

	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)
				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) {
				label++;
				if (strlen (label) > 0)
					g_bookmark_file_set_title (priv->store, uri, label);
				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-789 Link Here

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