Updating branch refs/heads/master
to a4bc10567790f71920d7286f6f791db585d55677 (commit)
from a95036f97824c682ca2c10ed3deb99195ed3c4eb (commit)
commit a4bc10567790f71920d7286f6f791db585d55677
Author: Enrico Tröger <enr...@xfce.org>
Date: Mon Jan 18 00:02:27 2010 +0100
Fix a stupid typo which causes lots of unnecessary casts
src/bookmarkeditdialog.c | 10 +++++-----
src/common.c | 2 +-
src/common.h | 2 +-
src/window.c | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 1b1398d..2931b82 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -211,7 +211,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
- gigolo_message_dialog((gpointer)dialog,
GTK_MESSAGE_ERROR, _("Error"),
+ gigolo_message_dialog(dialog,
GTK_MESSAGE_ERROR, _("Error"),
_("You must enter a name for
the bookmark."), NULL);
gtk_widget_grab_focus(priv->name_entry);
}
@@ -230,7 +230,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (gigolo_str_equal(tmp,
gigolo_bookmark_get_name(bm)))
{
error = TRUE;
-
gigolo_message_dialog((gpointer)dialog, GTK_MESSAGE_ERROR, _("Error"),
+
gigolo_message_dialog(dialog, GTK_MESSAGE_ERROR, _("Error"),
_("The entered bookmark name is already in use. Please
choose another one."), NULL);
gtk_widget_grab_focus(priv->name_entry);
}
@@ -243,7 +243,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
- gigolo_message_dialog((gpointer)dialog,
GTK_MESSAGE_ERROR, _("Error"),
+ gigolo_message_dialog(dialog,
GTK_MESSAGE_ERROR, _("Error"),
_("You must enter a server
address or name."), NULL);
gtk_widget_grab_focus(priv->host_entry);
}
@@ -254,7 +254,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
- gigolo_message_dialog((gpointer)dialog,
GTK_MESSAGE_ERROR, _("Error"),
+ gigolo_message_dialog(dialog,
GTK_MESSAGE_ERROR, _("Error"),
_("You must enter a share
name."), NULL);
gtk_widget_grab_focus(priv->share_combo);
}
@@ -265,7 +265,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
- gigolo_message_dialog((gpointer)dialog,
GTK_MESSAGE_ERROR, _("Error"),
+ gigolo_message_dialog(dialog,
GTK_MESSAGE_ERROR, _("Error"),
_("You must enter a valid URI
for the connection."), NULL);
gtk_widget_grab_focus(priv->uri_entry);
}
diff --git a/src/common.c b/src/common.c
index ebb6d2d..13ad491 100644
--- a/src/common.c
+++ b/src/common.c
@@ -149,7 +149,7 @@ gboolean gigolo_is_desktop_xfce(void)
}
-gboolean gigolo_message_dialog(gpointer *parent, gint type, const gchar *title,
+gboolean gigolo_message_dialog(gpointer parent, gint type, const gchar *title,
const gchar *text,
const gchar *secondary)
{
gboolean ret = FALSE;
diff --git a/src/common.h b/src/common.h
index 554e4ab..24a4e8e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -58,7 +58,7 @@ void gigolo_show_uri(const gchar *uri);
guint gigolo_get_default_port(const gchar *scheme);
-gboolean gigolo_message_dialog(gpointer *parent, gint type, const gchar *title,
+gboolean gigolo_message_dialog(gpointer parent, gint type, const gchar *title,
const gchar *text,
const gchar *secondary);
const gchar *gigolo_get_application_icon_name(void);
diff --git a/src/window.c b/src/window.c
index 00a1b28..284e6c6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -552,7 +552,7 @@ static void action_open_cb(G_GNUC_UNUSED GtkAction *action,
GigoloWindow *window
if (! g_spawn_command_line_async(cmd, &error))
{
gchar *msg = g_strdup_printf(_("The command
'%s' failed"), cmd);
- gigolo_message_dialog((gpointer) window,
GTK_MESSAGE_ERROR, _("Error"), msg, error->message);
+ gigolo_message_dialog(window,
GTK_MESSAGE_ERROR, _("Error"), msg, error->message);
verbose("%s: %s", msg, error->message);
g_error_free(error);
g_free(msg);
@@ -679,7 +679,7 @@ static void mounts_changed_cb(G_GNUC_UNUSED
GigoloBackendGVFS *backend, GigoloWi
static void mount_operation_failed_cb(G_GNUC_UNUSED GigoloBackendGVFS
*backend, const gchar *message,
const gchar
*error_message, GigoloWindow *window)
{
- gigolo_message_dialog((gpointer) window, GTK_MESSAGE_ERROR, _("Error"),
message, error_message);
+ gigolo_message_dialog(window, GTK_MESSAGE_ERROR, _("Error"), message,
error_message);
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
