[Goodies-commits] r7023 - in gigolo/trunk: . src
Enrico Troeger
enrico at xfce.org
Sun Mar 29 12:45:56 CEST 2009
Author: enrico
Date: 2009-03-29 10:45:56 +0000 (Sun, 29 Mar 2009)
New Revision: 7023
Modified:
gigolo/trunk/ChangeLog
gigolo/trunk/src/backendgvfs.c
gigolo/trunk/src/backendgvfs.h
gigolo/trunk/src/browsenetworkpanel.c
gigolo/trunk/src/preferencesdialog.c
gigolo/trunk/src/settings.c
gigolo/trunk/src/window.c
gigolo/trunk/src/window.h
Log:
Add a new preference to set whether to show error message dialogs when auto-connecting bookmarks.
Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog 2009-03-29 10:31:43 UTC (rev 7022)
+++ gigolo/trunk/ChangeLog 2009-03-29 10:45:56 UTC (rev 7023)
@@ -3,6 +3,10 @@
* src/main.c, src/window.c:
Minimise to tray on delete-event (close button) instead of
when minimising the main window.
+ * src/backendgvfs.c, src/backendgvfs.h, src/browsenetworkpanel.c,
+ src/preferencesdialog.c, src/settings.c, src/window.c, src/window.h:
+ Add a new preference to set whether to show error message dialogs
+ when auto-connecting bookmarks.
2009-03-26 Enrico Tröger <enrico(at)xfce(dot)org>
Modified: gigolo/trunk/src/backendgvfs.c
===================================================================
--- gigolo/trunk/src/backendgvfs.c 2009-03-29 10:31:43 UTC (rev 7022)
+++ gigolo/trunk/src/backendgvfs.c 2009-03-29 10:45:56 UTC (rev 7023)
@@ -51,6 +51,7 @@
{
GigoloBackendGVFS *self;
GtkWidget *dialog;
+ gboolean show_errors;
} MountInfo;
struct _GigoloBackendGVFSPrivate
@@ -445,7 +446,7 @@
if (error != NULL && ! g_error_matches(error, G_IO_ERROR, G_IO_ERROR_ALREADY_MOUNTED))
{
gchar *msg = g_strdup_printf(_("Connecting to \"%s\" failed."), uri);
- if (mi->dialog != NULL)
+ if (mi->show_errors)
g_signal_emit(mi->self, signals[OPERATION_FAILED], 0, msg, error->message);
else
verbose("%s (%s)", msg, error->message);
@@ -464,7 +465,7 @@
void gigolo_backend_gvfs_mount_uri(GigoloBackendGVFS *backend, const gchar *uri,
- GtkWindow *parent, GtkWidget *dialog)
+ GtkWindow *parent, GtkWidget *dialog, gboolean show_errors)
{
GMountOperation *op;
GFile *file;
@@ -478,6 +479,7 @@
mi = g_new0(MountInfo, 1);
mi->self = backend;
mi->dialog = dialog;
+ mi->show_errors = show_errors;
g_file_mount_enclosing_volume(file, G_MOUNT_MOUNT_NONE, op, NULL,
(GAsyncReadyCallback) mount_ready_cb, mi);
Modified: gigolo/trunk/src/backendgvfs.h
===================================================================
--- gigolo/trunk/src/backendgvfs.h 2009-03-29 10:31:43 UTC (rev 7022)
+++ gigolo/trunk/src/backendgvfs.h 2009-03-29 10:45:56 UTC (rev 7023)
@@ -67,7 +67,8 @@
void gigolo_backend_gvfs_mount_uri (GigoloBackendGVFS *backend,
const gchar *uri,
GtkWindow *parent,
- GtkWidget *dialog);
+ GtkWidget *dialog,
+ gboolean show_errors);
gchar* gigolo_backend_gvfs_get_volume_identifier (GVolume *volume);
Modified: gigolo/trunk/src/browsenetworkpanel.c
===================================================================
--- gigolo/trunk/src/browsenetworkpanel.c 2009-03-29 10:31:43 UTC (rev 7022)
+++ gigolo/trunk/src/browsenetworkpanel.c 2009-03-29 10:45:56 UTC (rev 7023)
@@ -128,7 +128,7 @@
if (mode == GIGOLO_BE_MODE_CONNECT)
{
- gigolo_window_mount_from_bookmark(GIGOLO_WINDOW(priv->parent), bm, TRUE);
+ gigolo_window_mount_from_bookmark(GIGOLO_WINDOW(priv->parent), bm, TRUE, TRUE);
}
else
{
Modified: gigolo/trunk/src/preferencesdialog.c
===================================================================
--- gigolo/trunk/src/preferencesdialog.c 2009-03-29 10:31:43 UTC (rev 7022)
+++ gigolo/trunk/src/preferencesdialog.c 2009-03-29 10:45:56 UTC (rev 7023)
@@ -419,6 +419,10 @@
gtk_widget_set_sensitive(checkbox, gigolo_backend_gvfs_is_scheme_supported("smb"));
gtk_box_pack_start(GTK_BOX(frame_vbox), checkbox, FALSE, FALSE, 0);
+ checkbox = add_check_button(settings, "show-autoconnect-errors", _("Show auto-connect error messages"));
+ gtk_widget_set_tooltip_text(checkbox, _("Whether to show error message dialogs when auto-connecting of bookmarks fails"));
+ gtk_box_pack_start(GTK_BOX(frame_vbox), checkbox, FALSE, FALSE, 0);
+
hbox = gtk_hbox_new(FALSE, 6);
gtk_box_pack_start(GTK_BOX(frame_vbox), hbox, FALSE, FALSE, 0);
Modified: gigolo/trunk/src/settings.c
===================================================================
--- gigolo/trunk/src/settings.c 2009-03-29 10:31:43 UTC (rev 7022)
+++ gigolo/trunk/src/settings.c 2009-03-29 10:45:56 UTC (rev 7023)
@@ -51,6 +51,7 @@
gint toolbar_orientation;
gint view_mode;
gboolean show_panel;
+ gboolean show_autoconnect_errors;
gchar *file_manager;
gint autoconnect_interval;
@@ -85,7 +86,8 @@
PROP_TOOLBAR_STYLE,
PROP_TOOLBAR_ORIENTATION,
PROP_VIEW_MODE,
- PROP_SHOW_PANEL
+ PROP_SHOW_PANEL,
+ PROP_SHOW_AUTOCONNECT_ERRORS
};
@@ -129,6 +131,9 @@
case PROP_SHOW_PANEL:
priv->show_panel = g_value_get_boolean(value);
break;
+ case PROP_SHOW_AUTOCONNECT_ERRORS:
+ priv->show_autoconnect_errors = g_value_get_boolean(value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -174,6 +179,9 @@
case PROP_SHOW_PANEL:
g_value_set_boolean(value, priv->show_panel);
break;
+ case PROP_SHOW_AUTOCONNECT_ERRORS:
+ g_value_set_boolean(value, priv->show_autoconnect_errors);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -270,6 +278,14 @@
"Whether to show the side panel",
TRUE,
G_PARAM_READWRITE));
+ g_object_class_install_property(gobject_class,
+ PROP_SHOW_AUTOCONNECT_ERRORS,
+ g_param_spec_boolean(
+ "show-autoconnect-errors",
+ "show-autoconnect-errors",
+ "Whether to show error messages when auto-connecting bookmarks fails",
+ TRUE,
+ G_PARAM_READWRITE));
}
@@ -395,6 +411,7 @@
g_key_file_set_integer(k, SECTION_UI, "toolbar_orientation", priv->toolbar_orientation);
g_key_file_set_integer(k, SECTION_UI, "view_mode", priv->view_mode);
g_key_file_set_boolean(k, SECTION_UI, "show_panel", priv->show_panel);
+ g_key_file_set_boolean(k, SECTION_UI, "show_autoconnect_errors", priv->show_autoconnect_errors);
write_data(k, priv->config_filename);
@@ -499,6 +516,7 @@
priv->show_in_systray = get_setting_boolean(k, SECTION_UI, "show_in_systray", TRUE);
priv->start_in_systray = get_setting_boolean(k, SECTION_UI, "start_in_systray", FALSE);
priv->show_panel = get_setting_boolean(k, SECTION_UI, "show_panel", FALSE);
+ priv->show_autoconnect_errors = get_setting_boolean(k, SECTION_UI, "show_autoconnect_errors", TRUE);
priv->show_toolbar = get_setting_boolean(k, SECTION_UI, "show_toolbar", TRUE);
priv->toolbar_style = get_setting_int(k, SECTION_UI, "toolbar_style", -1);
priv->toolbar_orientation = get_setting_int(k, SECTION_UI, "toolbar_orientation", 0);
Modified: gigolo/trunk/src/window.c
===================================================================
--- gigolo/trunk/src/window.c 2009-03-29 10:31:43 UTC (rev 7022)
+++ gigolo/trunk/src/window.c 2009-03-29 10:45:56 UTC (rev 7023)
@@ -255,7 +255,8 @@
}
-void gigolo_window_mount_from_bookmark(GigoloWindow *window, GigoloBookmark *bookmark, gboolean show_dialog)
+void gigolo_window_mount_from_bookmark(GigoloWindow *window, GigoloBookmark *bookmark,
+ gboolean show_dialog, gboolean show_errors)
{
gchar *uri;
GtkWidget *dialog = NULL;
@@ -279,7 +280,7 @@
g_free(label);
}
- gigolo_backend_gvfs_mount_uri(priv->backend_gvfs, uri, GTK_WINDOW(window), dialog);
+ gigolo_backend_gvfs_mount_uri(priv->backend_gvfs, uri, GTK_WINDOW(window), dialog, show_errors);
if (gigolo_bookmark_get_autoconnect(bookmark))
gigolo_bookmark_set_should_not_autoconnect(bookmark, FALSE);
@@ -320,7 +321,7 @@
/* this fills the values of the dialog into 'bm' */
g_object_set(dialog, "bookmark-update", bm, NULL);
- gigolo_window_mount_from_bookmark(window, bm, TRUE);
+ gigolo_window_mount_from_bookmark(window, bm, TRUE, TRUE);
g_object_unref(bm);
}
@@ -801,7 +802,7 @@
{
GigoloBookmark *bm = g_object_get_data(G_OBJECT(item), "bookmark");
- gigolo_window_mount_from_bookmark(window, bm, TRUE);
+ gigolo_window_mount_from_bookmark(window, bm, TRUE, TRUE);
}
@@ -837,6 +838,7 @@
static gint old_interval = -1;
gint interval;
guint i;
+ gboolean show_errors;
interval = gigolo_settings_get_integer(priv->settings, "autoconnect-interval");
if (old_interval != interval)
@@ -855,12 +857,13 @@
return FALSE;
}
+ show_errors = gigolo_settings_get_boolean(priv->settings, "show-autoconnect-errors");
for (i = 0; i < bookmarks->len; i++)
{
GigoloBookmark *bm = g_ptr_array_index(bookmarks, i);
if (gigolo_bookmark_get_autoconnect(bm) && ! gigolo_bookmark_get_should_not_autoconnect(bm))
{
- gigolo_window_mount_from_bookmark(window, bm, FALSE);
+ gigolo_window_mount_from_bookmark(window, bm, FALSE, show_errors);
}
}
return TRUE;
Modified: gigolo/trunk/src/window.h
===================================================================
--- gigolo/trunk/src/window.h 2009-03-29 10:31:43 UTC (rev 7022)
+++ gigolo/trunk/src/window.h 2009-03-29 10:45:56 UTC (rev 7023)
@@ -54,7 +54,8 @@
void gigolo_window_mount_from_bookmark (GigoloWindow *window,
GigoloBookmark *bookmark,
- gboolean show_dialog);
+ gboolean show_dialog,
+ gboolean show_errors);
GigoloBookmark* gigolo_window_find_bookmark_by_uri (GigoloWindow *window, const gchar *uri);
More information about the Goodies-commits
mailing list