[Goodies-commits] r6968 - in gigolo/trunk: . src
Enrico Troeger
enrico at xfce.org
Sun Mar 22 01:06:28 CET 2009
Author: enrico
Date: 2009-03-22 00:06:28 +0000 (Sun, 22 Mar 2009)
New Revision: 6968
Modified:
gigolo/trunk/ChangeLog
gigolo/trunk/src/bookmarkdialog.c
gigolo/trunk/src/bookmarkdialog.h
gigolo/trunk/src/bookmarkeditdialog.c
gigolo/trunk/src/bookmarkeditdialog.h
gigolo/trunk/src/browsenetworkpanel.c
gigolo/trunk/src/preferencesdialog.c
gigolo/trunk/src/singleinstance.c
gigolo/trunk/src/window.c
gigolo/trunk/src/window.h
Log:
Add gigolo_window_get_settings() to not have to pass the settings object to so many other classes.
Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/ChangeLog 2009-03-22 00:06:28 UTC (rev 6968)
@@ -1,3 +1,12 @@
+2009-03-21 Enrico Tröger <enrico(at)xfce(dot)org>
+
+ * src/bookmarkdialog.c, src/bookmarkdialog.h, src/bookmarkeditdialog.c,
+ src/bookmarkeditdialog.h, src/browsenetworkpanel.c,
+ src/preferencesdialog.c, src/window.c, src/window.h:
+ Add gigolo_window_get_settings() to not have to pass the settings
+ object to so many other classes.
+
+
2009-03-20 Enrico Tröger <enrico(at)xfce(dot)org>
* po/POTFILES.in, src/browsenetworkpanel.c,
Modified: gigolo/trunk/src/bookmarkdialog.c
===================================================================
--- gigolo/trunk/src/bookmarkdialog.c 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/src/bookmarkdialog.c 2009-03-22 00:06:28 UTC (rev 6968)
@@ -38,8 +38,6 @@
struct _GigoloBookmarkDialogPrivate
{
- GigoloSettings *settings;
-
GtkWindow *parent;
GtkWidget *tree;
@@ -117,18 +115,19 @@
static void add_button_click_cb(G_GNUC_UNUSED GtkButton *button, GtkWindow *dialog)
{
GigoloBookmarkDialogPrivate *priv = GIGOLO_BOOKMARK_DIALOG_GET_PRIVATE(dialog);
- GtkWidget *edit_dialog = gigolo_bookmark_edit_dialog_new(dialog, priv->settings, GIGOLO_BE_MODE_CREATE);
+ GtkWidget *edit_dialog = gigolo_bookmark_edit_dialog_new(dialog, GIGOLO_BE_MODE_CREATE);
GigoloBookmark *bm = NULL;
if (gigolo_bookmark_edit_dialog_run(GIGOLO_BOOKMARK_EDIT_DIALOG(edit_dialog)) == GTK_RESPONSE_OK)
{
GtkTreeIter iter;
+ GigoloSettings *settings = gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent));
bm = gigolo_bookmark_new();
/* this fills the values of the dialog into 'bm' */
g_object_set(edit_dialog, "bookmark-update", bm, NULL);
- g_ptr_array_add(gigolo_settings_get_bookmarks(priv->settings), bm);
+ g_ptr_array_add(gigolo_settings_get_bookmarks(settings), bm);
gtk_list_store_append(priv->store, &iter);
update_row_in_model(GIGOLO_BOOKMARK_DIALOG(dialog), &iter, bm);
@@ -156,8 +155,7 @@
gtk_tree_model_get(GTK_TREE_MODEL(priv->store), &iter, COL_BMREF, &bm, -1);
- edit_dialog = gigolo_bookmark_edit_dialog_new_with_bookmark(dialog,
- priv->settings, GIGOLO_BE_MODE_EDIT, bm);
+ edit_dialog = gigolo_bookmark_edit_dialog_new_with_bookmark(dialog, GIGOLO_BE_MODE_EDIT, bm);
if (gigolo_bookmark_edit_dialog_run(GIGOLO_BOOKMARK_EDIT_DIALOG(edit_dialog)) == GTK_RESPONSE_OK)
{
/* this fills the values of the dialog into 'bm' */
@@ -177,7 +175,8 @@
GtkTreeIter iter;
GigoloBookmarkDialogPrivate *priv = GIGOLO_BOOKMARK_DIALOG_GET_PRIVATE(user_data);
GigoloBookmark *bm;
- GigoloBookmarkList *bml = gigolo_settings_get_bookmarks(priv->settings);
+ GigoloBookmarkList *bml = gigolo_settings_get_bookmarks(
+ gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent)));
treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->tree));
@@ -199,7 +198,8 @@
guint i;
GigoloBookmark *bm;
GigoloBookmarkDialogPrivate *priv = GIGOLO_BOOKMARK_DIALOG_GET_PRIVATE(dialog);
- GigoloBookmarkList *bml = gigolo_settings_get_bookmarks(priv->settings);
+ GigoloBookmarkList *bml = gigolo_settings_get_bookmarks(
+ gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent)));
GtkTreeIter iter;
for (i = 0; i < bml->len; i++)
@@ -437,7 +437,7 @@
}
-GtkWidget *gigolo_bookmark_dialog_new(GtkWindow *parent, GigoloSettings *settings)
+GtkWidget *gigolo_bookmark_dialog_new(GtkWindow *parent)
{
GtkWidget *dialog;
GigoloBookmarkDialogPrivate *priv;
@@ -445,7 +445,6 @@
dialog = g_object_new(GIGOLO_BOOKMARK_DIALOG_TYPE, "transient-for", parent, NULL);
priv = GIGOLO_BOOKMARK_DIALOG_GET_PRIVATE(dialog);
- priv->settings = settings;
priv->parent = parent;
tree_fill(GIGOLO_BOOKMARK_DIALOG(dialog));
Modified: gigolo/trunk/src/bookmarkdialog.h
===================================================================
--- gigolo/trunk/src/bookmarkdialog.h 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/src/bookmarkdialog.h 2009-03-22 00:06:28 UTC (rev 6968)
@@ -47,7 +47,7 @@
};
GType gigolo_bookmark_dialog_get_type (void);
-GtkWidget* gigolo_bookmark_dialog_new (GtkWindow *parent, GigoloSettings *settings);
+GtkWidget* gigolo_bookmark_dialog_new (GtkWindow *parent);
G_END_DECLS
Modified: gigolo/trunk/src/bookmarkeditdialog.c
===================================================================
--- gigolo/trunk/src/bookmarkeditdialog.c 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/src/bookmarkeditdialog.c 2009-03-22 00:06:28 UTC (rev 6968)
@@ -30,6 +30,7 @@
#include "compat.h"
#include "settings.h"
#include "bookmark.h"
+#include "window.h"
#include "backendgvfs.h"
#include "bookmarkeditdialog.h"
@@ -41,7 +42,7 @@
struct _GigoloBookmarkEditDialogPrivate
{
- GigoloSettings *settings;
+ GtkWindow *parent;
GtkWidget *table;
@@ -191,7 +192,8 @@
}
else
{ /* check for duplicate bookmark names */
- GigoloBookmarkList *bml = gigolo_settings_get_bookmarks(priv->settings);
+ GigoloSettings *settings = gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent));
+ GigoloBookmarkList *bml = gigolo_settings_get_bookmarks(settings);
GigoloBookmark *bm;
guint i;
@@ -945,22 +947,21 @@
}
-GtkWidget *gigolo_bookmark_edit_dialog_new(GtkWindow *parent,
- GigoloSettings *settings, GigoloBookmarkEditDialogMode mode)
+GtkWidget *gigolo_bookmark_edit_dialog_new(GtkWindow *parent, GigoloBookmarkEditDialogMode mode)
{
GigoloBookmarkEditDialog *dialog = g_object_new(GIGOLO_BOOKMARK_EDIT_DIALOG_TYPE,
"transient-for", parent,
"mode", mode,
NULL);
GigoloBookmarkEditDialogPrivate *priv = GIGOLO_BOOKMARK_EDIT_DIALOG_GET_PRIVATE(dialog);
- priv->settings = settings;
+ priv->parent = parent;
return GTK_WIDGET(dialog);
}
GtkWidget *gigolo_bookmark_edit_dialog_new_with_bookmark(GtkWindow *parent,
- GigoloSettings *settings, GigoloBookmarkEditDialogMode mode, GigoloBookmark *bookmark)
+ GigoloBookmarkEditDialogMode mode, GigoloBookmark *bookmark)
{
GigoloBookmarkEditDialog *dialog = g_object_new(GIGOLO_BOOKMARK_EDIT_DIALOG_TYPE,
"transient-for", parent,
@@ -968,7 +969,7 @@
"mode", mode,
NULL);
GigoloBookmarkEditDialogPrivate *priv = GIGOLO_BOOKMARK_EDIT_DIALOG_GET_PRIVATE(dialog);
- priv->settings = settings;
+ priv->parent = parent;
return GTK_WIDGET(dialog);
}
Modified: gigolo/trunk/src/bookmarkeditdialog.h
===================================================================
--- gigolo/trunk/src/bookmarkeditdialog.h 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/src/bookmarkeditdialog.h 2009-03-22 00:06:28 UTC (rev 6968)
@@ -56,10 +56,8 @@
GType gigolo_bookmark_edit_dialog_get_type (void);
GtkWidget* gigolo_bookmark_edit_dialog_new (GtkWindow *parent,
- GigoloSettings *settings,
GigoloBookmarkEditDialogMode mode);
GtkWidget* gigolo_bookmark_edit_dialog_new_with_bookmark (GtkWindow *parent,
- GigoloSettings *settings,
GigoloBookmarkEditDialogMode,
GigoloBookmark *bookmark);
gint gigolo_bookmark_edit_dialog_run (GigoloBookmarkEditDialog *dialog);
Modified: gigolo/trunk/src/browsenetworkpanel.c
===================================================================
--- gigolo/trunk/src/browsenetworkpanel.c 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/src/browsenetworkpanel.c 2009-03-22 00:06:28 UTC (rev 6968)
@@ -42,7 +42,6 @@
struct _GigoloBrowseNetworkPanelPrivate
{
GtkWindow *parent;
- GigoloSettings *settings;
GtkWidget *button_refresh;
GtkWidget *button_connect;
@@ -68,14 +67,8 @@
ACTION_CONNECT
};
-enum
-{
- PROP_0,
- PROP_SETTINGS
-};
-
static void tree_selection_changed_cb(GtkTreeSelection *selection, GigoloBrowseNetworkPanel *panel);
@@ -93,44 +86,15 @@
}
-static void gigolo_browse_network_panel_set_property(GObject *object, guint prop_id,
- const GValue *value, GParamSpec *pspec)
-{
- GigoloBrowseNetworkPanelPrivate *priv = GIGOLO_BROWSE_NETWORK_PANEL_GET_PRIVATE(object);
-
- switch (prop_id)
- {
- case PROP_SETTINGS:
- {
- priv->settings = g_value_get_object(value);
- break;
- }
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
- break;
- }
-}
-
-
static void gigolo_browse_network_panel_class_init(GigoloBrowseNetworkPanelClass *klass)
{
GObjectClass *g_object_class;
g_object_class = G_OBJECT_CLASS(klass);
g_object_class->finalize = gigolo_browse_network_panel_finalize;
- g_object_class->set_property = gigolo_browse_network_panel_set_property;
gigolo_browse_network_panel_parent_class = (GtkVBoxClass*) g_type_class_peek(GTK_TYPE_VBOX);
g_type_class_add_private(klass, sizeof(GigoloBrowseNetworkPanelPrivate));
-
- g_object_class_install_property(g_object_class,
- PROP_SETTINGS,
- g_param_spec_object(
- "settings",
- "Settings",
- "Settings instance to provide properties",
- GIGOLO_SETTINGS_TYPE,
- G_PARAM_WRITABLE));
}
@@ -157,7 +121,7 @@
GtkWidget *edit_dialog;
edit_dialog = gigolo_bookmark_edit_dialog_new_with_bookmark(
- GTK_WINDOW(priv->parent), priv->settings, mode, bm);
+ GTK_WINDOW(priv->parent), mode, bm);
if (gigolo_bookmark_edit_dialog_run(GIGOLO_BOOKMARK_EDIT_DIALOG(edit_dialog)) == GTK_RESPONSE_OK)
{
@@ -170,9 +134,10 @@
}
else
{
- g_ptr_array_add(gigolo_settings_get_bookmarks(priv->settings), g_object_ref(bm));
+ GigoloSettings *settings = gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent));
+ g_ptr_array_add(gigolo_settings_get_bookmarks(settings), g_object_ref(bm));
gigolo_window_update_bookmarks(GIGOLO_WINDOW(priv->parent));
- gigolo_settings_write(priv->settings, GIGOLO_SETTINGS_BOOKMARKS);
+ gigolo_settings_write(settings, GIGOLO_SETTINGS_BOOKMARKS);
tree_selection_changed_cb(NULL, panel);
}
@@ -326,8 +291,9 @@
static void button_close_click_cb(G_GNUC_UNUSED GtkToolButton *btn, GigoloBrowseNetworkPanel *panel)
{
GigoloBrowseNetworkPanelPrivate *priv = GIGOLO_BROWSE_NETWORK_PANEL_GET_PRIVATE(panel);
+ GigoloSettings *settings = gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent));
/* hide the panel by setting the property to FALSE */
- g_object_set(priv->settings, "show-panel", FALSE, NULL);
+ g_object_set(settings, "show-panel", FALSE, NULL);
}
Modified: gigolo/trunk/src/preferencesdialog.c
===================================================================
--- gigolo/trunk/src/preferencesdialog.c 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/src/preferencesdialog.c 2009-03-22 00:06:28 UTC (rev 6968)
@@ -522,7 +522,6 @@
"settings", settings,
NULL);
-
return dialog;
}
Modified: gigolo/trunk/src/singleinstance.c
===================================================================
--- gigolo/trunk/src/singleinstance.c 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/src/singleinstance.c 2009-03-22 00:06:28 UTC (rev 6968)
@@ -140,7 +140,8 @@
}
-static gboolean message_received(GtkWidget *w, GdkEventClient *ev, GigoloSingleInstance *gis)
+static gboolean message_received(G_GNUC_UNUSED GtkWidget *widget,
+ GdkEventClient *ev, GigoloSingleInstance *gis)
{
if (ev->data_format == 8 && gigolo_str_equal(ev->data.b, GIGOLO_SI_CMD))
{
@@ -261,7 +262,8 @@
/* When creating a new object of this class we search an already running instance of Gigolo
* and in case we found one, we set the 'found_instance' member to TRUE.
* Otherwise, we register ourselves as new single running instance. */
-GigoloSingleInstance *gigolo_single_instance_new(void)
+GigoloSingleInstance *
+gigolo_single_instance_new(void)
{
GigoloSingleInstance *gis = g_object_new(GIGOLO_SINGLE_INSTANCE_TYPE, NULL);
GigoloSingleInstancePrivate *priv = GIGOLO_SINGLE_INSTANCE_GET_PRIVATE(gis);
Modified: gigolo/trunk/src/window.c
===================================================================
--- gigolo/trunk/src/window.c 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/src/window.c 2009-03-22 00:06:28 UTC (rev 6968)
@@ -332,8 +332,7 @@
GigoloBookmark *bm = NULL;
GtkWidget *dialog;
- dialog = gigolo_bookmark_edit_dialog_new(GTK_WINDOW(window),
- priv->settings, GIGOLO_BE_MODE_CONNECT);
+ dialog = gigolo_bookmark_edit_dialog_new(GTK_WINDOW(window), GIGOLO_BE_MODE_CONNECT);
if (gigolo_bookmark_edit_dialog_run(GIGOLO_BOOKMARK_EDIT_DIALOG(dialog)) == GTK_RESPONSE_OK)
{
bm = gigolo_bookmark_new();
@@ -407,7 +406,7 @@
GtkWidget *dialog;
GigoloWindowPrivate *priv = GIGOLO_WINDOW_GET_PRIVATE(window);
- dialog = gigolo_bookmark_dialog_new(GTK_WINDOW(window), priv->settings);
+ dialog = gigolo_bookmark_dialog_new(GTK_WINDOW(window));
gtk_dialog_run(GTK_DIALOG(dialog));
gigolo_settings_write(priv->settings, GIGOLO_SETTINGS_BOOKMARKS);
@@ -888,7 +887,7 @@
/* show the bookmark edit dialog and add the bookmark only if it was
* not cancelled */
edit_dialog = gigolo_bookmark_edit_dialog_new_with_bookmark(
- GTK_WINDOW(window), priv->settings, GIGOLO_BE_MODE_EDIT, bm);
+ GTK_WINDOW(window), GIGOLO_BE_MODE_EDIT, bm);
if (gigolo_bookmark_edit_dialog_run(
GIGOLO_BOOKMARK_EDIT_DIALOG(edit_dialog)) == GTK_RESPONSE_OK)
{
@@ -1373,7 +1372,6 @@
g_signal_connect(settings, "notify", G_CALLBACK(gigolo_window_settings_notify_cb), window);
g_object_set(priv->action_bookmarks, "settings", settings, NULL);
- g_object_set(priv->browse_panel, "settings", settings, NULL);
gigolo_window_show_systray_icon(GIGOLO_WINDOW(window),
gigolo_settings_get_boolean(settings, "show-in-systray"));
@@ -1406,3 +1404,17 @@
return window;
}
+
+
+GigoloSettings *gigolo_window_get_settings(GigoloWindow *window)
+{
+ GigoloWindowPrivate *priv;
+
+ g_return_val_if_fail(window != NULL, NULL);
+
+ priv = GIGOLO_WINDOW_GET_PRIVATE(window);
+
+ return priv->settings;
+}
+
+
Modified: gigolo/trunk/src/window.h
===================================================================
--- gigolo/trunk/src/window.h 2009-03-21 12:44:32 UTC (rev 6967)
+++ gigolo/trunk/src/window.h 2009-03-22 00:06:28 UTC (rev 6968)
@@ -58,6 +58,7 @@
GigoloBookmark* gigolo_window_find_bookmark_by_uri (GigoloWindow *window, const gchar *uri);
+GigoloSettings* gigolo_window_get_settings (GigoloWindow *window);
G_END_DECLS
More information about the Goodies-commits
mailing list