[Goodies-commits] r6517 - sion/trunk/src

[Enrico Troeger]

Author: enrico
Date: 2009-01-19 23:00:07 +0000 (Mon, 19 Jan 2009)
New Revision: 6517

Modified:
   sion/trunk/src/bookmarkdialog.c
   sion/trunk/src/bookmarkdialog.h
   sion/trunk/src/bookmarkeditdialog.c
   sion/trunk/src/bookmarkeditdialog.h
   sion/trunk/src/window.c
Log:
Make parent arguments GtkWindow's.

Modified: sion/trunk/src/bookmarkdialog.c
===================================================================
--- sion/trunk/src/bookmarkdialog.c	2009-01-19 23:00:00 UTC (rev 6516)
+++ sion/trunk/src/bookmarkdialog.c	2009-01-19 23:00:07 UTC (rev 6517)
@@ -40,7 +40,7 @@
 {
 	SionSettings *settings;
 
-	GtkWidget *parent;
+	GtkWindow *parent;
 
 	GtkWidget *tree;
 	GtkListStore *store;
@@ -142,7 +142,7 @@
 }
 
 
-static void add_button_click_cb(G_GNUC_UNUSED GtkButton *button, GtkWidget *dialog)
+static void add_button_click_cb(G_GNUC_UNUSED GtkButton *button, GtkWindow *dialog)
 {
 	SionBookmarkDialogPrivate *priv = SION_BOOKMARK_DIALOG_GET_PRIVATE(dialog);
 	GtkWidget *edit_dialog = sion_bookmark_edit_dialog_new(dialog, priv->settings, SION_BE_MODE_CREATE);
@@ -167,7 +167,7 @@
 }
 
 
-static void edit_button_click_cb(G_GNUC_UNUSED GtkButton *button, GtkWidget *dialog)
+static void edit_button_click_cb(G_GNUC_UNUSED GtkButton *button, GtkWindow *dialog)
 {
 	GtkTreeSelection *treesel;
 	GtkTreeIter iter;
@@ -279,7 +279,7 @@
 
 static void tree_popup_activate_cb(GtkCheckMenuItem *item, gpointer user_data)
 {
-	GtkWidget *dialog = g_object_get_data(G_OBJECT(item), "dialog");
+	GtkWindow *dialog = g_object_get_data(G_OBJECT(item), "dialog");
 
 	switch (GPOINTER_TO_INT(user_data))
 	{
@@ -465,7 +465,7 @@
 }
 
 
-GtkWidget *sion_bookmark_dialog_new(GtkWidget *parent, SionSettings *settings)
+GtkWidget *sion_bookmark_dialog_new(GtkWindow *parent, SionSettings *settings)
 {
 	GtkWidget *dialog;
 	SionBookmarkDialogPrivate *priv;

Modified: sion/trunk/src/bookmarkdialog.h
===================================================================
--- sion/trunk/src/bookmarkdialog.h	2009-01-19 23:00:00 UTC (rev 6516)
+++ sion/trunk/src/bookmarkdialog.h	2009-01-19 23:00:07 UTC (rev 6517)
@@ -47,7 +47,7 @@
 };
 
 GType		sion_bookmark_dialog_get_type		(void);
-GtkWidget*	sion_bookmark_dialog_new			(GtkWidget *parent, SionSettings *settings);
+GtkWidget*	sion_bookmark_dialog_new			(GtkWindow *parent, SionSettings *settings);
 
 G_END_DECLS
 

Modified: sion/trunk/src/bookmarkeditdialog.c
===================================================================
--- sion/trunk/src/bookmarkeditdialog.c	2009-01-19 23:00:00 UTC (rev 6516)
+++ sion/trunk/src/bookmarkeditdialog.c	2009-01-19 23:00:07 UTC (rev 6517)
@@ -826,7 +826,7 @@
 }
 
 
-GtkWidget *sion_bookmark_edit_dialog_new(GtkWidget *parent, SionSettings *settings, SionBookmarkEditDialogMode mode)
+GtkWidget *sion_bookmark_edit_dialog_new(GtkWindow *parent, SionSettings *settings, SionBookmarkEditDialogMode mode)
 {
 	SionBookmarkEditDialog *dialog = g_object_new(SION_BOOKMARK_EDIT_DIALOG_TYPE,
 		"transient-for", parent,
@@ -839,7 +839,7 @@
 }
 
 
-GtkWidget *sion_bookmark_edit_dialog_new_with_bookmark(GtkWidget *parent, SionSettings *settings, SionBookmarkEditDialogMode mode, SionBookmark *bookmark)
+GtkWidget *sion_bookmark_edit_dialog_new_with_bookmark(GtkWindow *parent, SionSettings *settings, SionBookmarkEditDialogMode mode, SionBookmark *bookmark)
 {
 	SionBookmarkEditDialog *dialog = g_object_new(SION_BOOKMARK_EDIT_DIALOG_TYPE,
 		"transient-for", parent,

Modified: sion/trunk/src/bookmarkeditdialog.h
===================================================================
--- sion/trunk/src/bookmarkeditdialog.h	2009-01-19 23:00:00 UTC (rev 6516)
+++ sion/trunk/src/bookmarkeditdialog.h	2009-01-19 23:00:07 UTC (rev 6517)
@@ -55,8 +55,8 @@
 };
 
 GType		sion_bookmark_edit_dialog_get_type			(void);
-GtkWidget*	sion_bookmark_edit_dialog_new				(GtkWidget *parent, SionSettings *settings, SionBookmarkEditDialogMode mode);
-GtkWidget*	sion_bookmark_edit_dialog_new_with_bookmark	(GtkWidget *parent, SionSettings *settings, SionBookmarkEditDialogMode, SionBookmark *bookmark);
+GtkWidget*	sion_bookmark_edit_dialog_new				(GtkWindow *parent, SionSettings *settings, SionBookmarkEditDialogMode mode);
+GtkWidget*	sion_bookmark_edit_dialog_new_with_bookmark	(GtkWindow *parent, SionSettings *settings, SionBookmarkEditDialogMode, SionBookmark *bookmark);
 gint		sion_bookmark_edit_dialog_run				(SionBookmarkEditDialog *dialog);
 
 G_END_DECLS

Modified: sion/trunk/src/window.c
===================================================================
--- sion/trunk/src/window.c	2009-01-19 23:00:00 UTC (rev 6516)
+++ sion/trunk/src/window.c	2009-01-19 23:00:07 UTC (rev 6517)
@@ -348,7 +348,7 @@
 		SionBookmark *bm = NULL;
 		GtkWidget *dialog;
 
-		dialog = sion_bookmark_edit_dialog_new(GTK_WIDGET(window),
+		dialog = sion_bookmark_edit_dialog_new(GTK_WINDOW(window),
 			priv->settings, SION_BE_MODE_CONNECT);
 		if (sion_bookmark_edit_dialog_run(SION_BOOKMARK_EDIT_DIALOG(dialog)) == GTK_RESPONSE_OK)
 		{
@@ -869,7 +869,7 @@
 					/* show the bookmark edit dialog and add the bookmark only if it was
 					 * not cancelled */
 					edit_dialog = sion_bookmark_edit_dialog_new_with_bookmark(
-						GTK_WIDGET(window), priv->settings, SION_BE_MODE_EDIT, bm);
+						GTK_WINDOW(window), priv->settings, SION_BE_MODE_EDIT, bm);
 					if (sion_bookmark_edit_dialog_run(SION_BOOKMARK_EDIT_DIALOG(edit_dialog)) ==
 						GTK_RESPONSE_OK)
 					{