[Xfce4-commits] <gigolo:master> gigolo_window_find_bookmark_by_uri() => gigolo_settings_get_bookmark_by_uri()

Enrico Tröger noreply at xfce.org
Sun Oct 4 21:42:08 CEST 2009


Updating branch refs/heads/master
         to dfed14533d77228b05210a80c0a668652abb6202 (commit)
       from eb0479f4910488867007c79b6d7bd56da7c7d1b2 (commit)

commit dfed14533d77228b05210a80c0a668652abb6202
Author: Enrico Tröger <enrico at xfce.org>
Date:   Sun Oct 4 21:05:10 2009 +0200

    gigolo_window_find_bookmark_by_uri() => gigolo_settings_get_bookmark_by_uri()

 src/bookmarkdialog.c     |    2 +-
 src/bookmarkeditdialog.c |    2 +-
 src/bookmarkpanel.c      |    2 +-
 src/browsenetworkpanel.c |    7 ++++---
 src/main.c               |    2 +-
 src/preferencesdialog.c  |    1 +
 src/settings.c           |   30 +++++++++++++++++++++++++++++-
 src/settings.h           |    1 +
 src/window.c             |   39 ++++++---------------------------------
 9 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index 3192813..f8f47e1 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -23,8 +23,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "settings.h"
 #include "bookmark.h"
+#include "settings.h"
 #include "backendgvfs.h"
 #include "window.h"
 #include "compat.h"
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 65d4398..062918d 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -28,8 +28,8 @@
 
 #include "common.h"
 #include "compat.h"
-#include "settings.h"
 #include "bookmark.h"
+#include "settings.h"
 #include "backendgvfs.h"
 #include "window.h"
 #include "bookmarkeditdialog.h"
diff --git a/src/bookmarkpanel.c b/src/bookmarkpanel.c
index ccb20a9..d3e228f 100644
--- a/src/bookmarkpanel.c
+++ b/src/bookmarkpanel.c
@@ -26,8 +26,8 @@
 
 #include "common.h"
 #include "backendgvfs.h"
-#include "settings.h"
 #include "bookmark.h"
+#include "settings.h"
 #include "window.h"
 
 #include "bookmarkpanel.h"
diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index 7b742d5..be3b48d 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -28,8 +28,8 @@
 #include "common.h"
 #include "compat.h"
 #include "backendgvfs.h"
-#include "settings.h"
 #include "bookmark.h"
+#include "settings.h"
 #include "window.h"
 #include "bookmarkeditdialog.h"
 #include "browsenetworkpanel.h"
@@ -369,10 +369,11 @@ static void tree_selection_changed_cb(GtkTreeSelection *selection, GigoloBrowseN
 
 		if (set)
 		{
+			GigoloSettings *settings = gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent));
 			gchar *full_uri = g_strconcat(uri, share, "/", NULL);
 
-			is_bookmark = (gigolo_window_find_bookmark_by_uri(
-								GIGOLO_WINDOW(priv->parent), full_uri) != NULL);
+
+			is_bookmark = (gigolo_settings_get_bookmark_by_uri(settings, full_uri) != NULL);
 
 			g_free(full_uri);
 		}
diff --git a/src/main.c b/src/main.c
index ef8888e..fb03a9e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,8 +29,8 @@
 #include <libintl.h>
 
 #include "common.h"
-#include "settings.h"
 #include "bookmark.h"
+#include "settings.h"
 #include "backendgvfs.h"
 #include "window.h"
 #include "singleinstance.h"
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index 2248464..0ee2393 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -26,6 +26,7 @@
 
 #include "common.h"
 #include "compat.h"
+#include "bookmark.h"
 #include "settings.h"
 #include "backendgvfs.h"
 #include "preferencesdialog.h"
diff --git a/src/settings.c b/src/settings.c
index cbb230e..01d0048 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -27,9 +27,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "bookmark.h"
 #include "settings.h"
 #include "common.h"
-#include "bookmark.h"
 
 
 typedef struct _GigoloSettingsPrivate			GigoloSettingsPrivate;
@@ -786,3 +786,31 @@ gboolean gigolo_settings_has_file_manager(GigoloSettings *settings)
 
 	return NZV(priv->file_manager);
 }
+
+
+GigoloBookmark *gigolo_settings_get_bookmark_by_uri(GigoloSettings *settings, const gchar *uri)
+{
+	GigoloBookmarkList *bml;
+	GigoloBookmark *bm = NULL;
+	gboolean found = FALSE;
+	gchar *tmp_uri;
+	guint i;
+
+	g_return_val_if_fail(settings != NULL, FALSE);
+	g_return_val_if_fail(uri != NULL, FALSE);
+
+	bml = gigolo_settings_get_bookmarks(settings);
+
+	for (i = 0; i < bml->len && ! found; i++)
+	{
+		bm = g_ptr_array_index(bml, i);
+		tmp_uri = gigolo_bookmark_get_uri_escaped(bm);
+		if (gigolo_str_equal(uri, tmp_uri))
+			found = TRUE;
+
+		g_free(tmp_uri);
+	}
+	return (found) ? bm : NULL;
+}
+
+
diff --git a/src/settings.h b/src/settings.h
index 9780f74..3366ed6 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -69,6 +69,7 @@ gboolean			gigolo_settings_get_boolean			(GigoloSettings *settings, const gchar
 gint				gigolo_settings_get_integer			(GigoloSettings *settings, const gchar *property);
 gchar*				gigolo_settings_get_string			(GigoloSettings *settings, const gchar *property);
 
+GigoloBookmark*		gigolo_settings_get_bookmark_by_uri	(GigoloSettings *settings, const gchar *uri);
 
 G_END_DECLS
 
diff --git a/src/window.c b/src/window.c
index ac0b2ea..1295d43 100644
--- a/src/window.c
+++ b/src/window.c
@@ -233,34 +233,6 @@ static void get_selected_iter(GigoloWindow *window, GtkTreeIter *iter)
 }
 
 
-GigoloBookmark *gigolo_window_find_bookmark_by_uri(GigoloWindow *window, const gchar *uri)
-{
-	GigoloWindowPrivate *priv;
-	GigoloBookmarkList *bml;
-	GigoloBookmark *bm = NULL;
-	gboolean found = FALSE;
-	gchar *tmp_uri;
-	guint i;
-
-	g_return_val_if_fail(window != NULL, FALSE);
-	g_return_val_if_fail(uri != NULL, FALSE);
-
-	priv = GIGOLO_WINDOW_GET_PRIVATE(window);
-	bml = gigolo_settings_get_bookmarks(priv->settings);
-
-	for (i = 0; i < bml->len && ! found; i++)
-	{
-		bm = g_ptr_array_index(bml, i);
-		tmp_uri = gigolo_bookmark_get_uri_escaped(bm);
-		if (gigolo_str_equal(uri, tmp_uri))
-			found = TRUE;
-
-		g_free(tmp_uri);
-	}
-	return (found) ? bm : NULL;
-}
-
-
 void gigolo_window_mount_from_bookmark(GigoloWindow *window, GigoloBookmark *bookmark,
 									   gboolean show_dialog, gboolean show_errors)
 {
@@ -396,7 +368,7 @@ static void action_unmount_cb(G_GNUC_UNUSED GtkAction *action, GigoloWindow *win
 		{
 			gchar *uri;
 			gigolo_backend_gvfs_get_name_and_uri_from_mount(mnt, NULL, &uri);
-			bm = gigolo_window_find_bookmark_by_uri(window, uri);
+			bm = gigolo_settings_get_bookmark_by_uri(priv->settings, uri);
 			if (bm != NULL && gigolo_bookmark_get_autoconnect(bm))
 			{	/* we don't want auto-connection to reconnect this bookmark right
 				   after we unmount it. */
@@ -526,7 +498,7 @@ static void action_copy_uri_cb(G_GNUC_UNUSED GtkAction *action, GigoloWindow *wi
 
 			gigolo_backend_gvfs_get_name_and_uri_from_mount(mnt, NULL, &uri);
 
-			b = gigolo_window_find_bookmark_by_uri(window, uri);
+			b = gigolo_settings_get_bookmark_by_uri(priv->settings, uri);
 			if (b != NULL)
 				setptr(uri, g_build_filename(uri, gigolo_bookmark_get_folder(b), NULL));
 
@@ -562,7 +534,7 @@ static void action_open_cb(G_GNUC_UNUSED GtkAction *action, GigoloWindow *window
 
 			file_manager = gigolo_settings_get_string(priv->settings, "file-manager");
 			gigolo_backend_gvfs_get_name_and_uri_from_mount(mnt, NULL, &uri);
-			b = gigolo_window_find_bookmark_by_uri(window, uri);
+			b = gigolo_settings_get_bookmark_by_uri(priv->settings, uri);
 			if (b != NULL)
 				setptr(uri, g_build_filename(uri, gigolo_bookmark_get_folder(b), NULL));
 
@@ -600,10 +572,11 @@ static gboolean iter_is_bookmark(GigoloWindow *window, GtkTreeModel *model, GtkT
 	{
 		gchar *uri;
 		gboolean found = FALSE;
+		GigoloWindowPrivate *priv = GIGOLO_WINDOW_GET_PRIVATE(window);
 
 		gigolo_backend_gvfs_get_name_and_uri_from_mount(ref, NULL, &uri);
 
-		found = (gigolo_window_find_bookmark_by_uri(window, uri) != NULL);
+		found = (gigolo_settings_get_bookmark_by_uri(priv->settings, uri) != NULL);
 
 		g_free(uri);
 		return found;
@@ -881,7 +854,7 @@ static void action_create_bookmark_cb(G_GNUC_UNUSED GtkAction *button, GigoloWin
 
 			gigolo_backend_gvfs_get_name_and_uri_from_mount(mnt, &name, &uri);
 
-			if (gigolo_window_find_bookmark_by_uri(window, uri) == NULL)
+			if (gigolo_settings_get_bookmark_by_uri(priv->settings, uri) == NULL)
 			{
 				GigoloBookmark *bm = gigolo_bookmark_new_from_uri(name, uri);
 				if (gigolo_bookmark_is_valid(bm))



More information about the Xfce4-commits mailing list