aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bordoley <bordoley@msu.edu>2003-04-06 01:04:48 +0800
committerDave Bordoley <Bordoley@src.gnome.org>2003-04-06 01:04:48 +0800
commit893ec76256945916281467e8937ffa283efd7cd3 (patch)
tree264078e7c2336472e444cff675b3e2ddd4e1c587
parent1d2079919896bb08fdfd2d21236c5314b21908fb (diff)
downloadgsoc2013-epiphany-893ec76256945916281467e8937ffa283efd7cd3.tar
gsoc2013-epiphany-893ec76256945916281467e8937ffa283efd7cd3.tar.gz
gsoc2013-epiphany-893ec76256945916281467e8937ffa283efd7cd3.tar.bz2
gsoc2013-epiphany-893ec76256945916281467e8937ffa283efd7cd3.tar.lz
gsoc2013-epiphany-893ec76256945916281467e8937ffa283efd7cd3.tar.xz
gsoc2013-epiphany-893ec76256945916281467e8937ffa283efd7cd3.tar.zst
gsoc2013-epiphany-893ec76256945916281467e8937ffa283efd7cd3.zip
Just show the new bookmark dialog, don't go modal.
2003-04-05 David Bordoley <bordoley@msu.edu> * src/popup-commands.c: (popup_cmd_bookmark_link): * src/window-commands.c: (window_cmd_file_bookmark_page): Just show the new bookmark dialog, don't go modal. * src/bookmarks/ephy-bookmark-properties.c: (ephy_bookmark_properties_new): * src/bookmarks/ephy-bookmark-properties.h Need to pass the parent window to _new(), and set the dialog transient to its parent. * src/bookmarks/ephy-bookmarks-editor.c: (cmd_bookmark_properties): Pass the bme window to the ephy_bookmark_properties_new. * src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_response_cb): Call gtk_widget_destroy() when cancel or ok are clicked.
-rw-r--r--ChangeLog18
-rw-r--r--src/bookmarks/ephy-bookmark-properties.c11
-rw-r--r--src/bookmarks/ephy-bookmark-properties.h3
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c2
-rw-r--r--src/bookmarks/ephy-new-bookmark.c2
-rw-r--r--src/popup-commands.c3
-rw-r--r--src/window-commands.c3
7 files changed, 33 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 65d2c3d7c..d52a18808 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2003-04-05 David Bordoley <bordoley@msu.edu>
+
+ * src/popup-commands.c: (popup_cmd_bookmark_link):
+ * src/window-commands.c: (window_cmd_file_bookmark_page):
+ Just show the new bookmark dialog, don't go modal.
+
+ * src/bookmarks/ephy-bookmark-properties.c:
+ (ephy_bookmark_properties_new):
+ * src/bookmarks/ephy-bookmark-properties.h
+ Need to pass the parent window to _new(), and
+ set the dialog transient to its parent.
+
+ * src/bookmarks/ephy-bookmarks-editor.c: (cmd_bookmark_properties):
+ Pass the bme window to the ephy_bookmark_properties_new.
+
+ * src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_response_cb):
+ Call gtk_widget_destroy() when cancel or ok are clicked.
+
2003-04-05 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/egg/eggintl.h:
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index fcf1cd23e..0d1cb0c94 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -386,7 +386,8 @@ ephy_bookmark_properties_init (EphyBookmarkProperties *editor)
GtkWidget *
ephy_bookmark_properties_new (EphyBookmarks *bookmarks,
- EphyNode *bookmark)
+ EphyNode *bookmark,
+ GtkWindow *parent_window)
{
EphyBookmarkProperties *editor;
@@ -398,7 +399,11 @@ ephy_bookmark_properties_new (EphyBookmarks *bookmarks,
"bookmark", bookmark,
NULL));
- build_ui (editor);
-
+ build_ui (editor);
+
+ if (parent_window)
+ {
+ gtk_window_set_transient_for (GTK_WINDOW (editor), parent_window);
+ }
return GTK_WIDGET (editor);
}
diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 1790259ca..cd7c23a2f 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -51,7 +51,8 @@ typedef struct
GType ephy_bookmark_properties_get_type (void);
GtkWidget *ephy_bookmark_properties_new (EphyBookmarks *bookmarks,
- EphyNode *bookmark);
+ EphyNode *bookmark,
+ GtkWindow *parent_window);
G_END_DECLS
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 40027ed1c..e1c8c168d 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -287,7 +287,7 @@ cmd_bookmark_properties (EggAction *action,
for (l = selection; l; l = l->next)
{
EphyNode *node = EPHY_NODE (l->data);
- dialog = ephy_bookmark_properties_new (editor->priv->bookmarks, node);
+ dialog = ephy_bookmark_properties_new (editor->priv->bookmarks, node, GTK_WINDOW (editor));
gtk_widget_show (GTK_WIDGET (dialog));
}
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index f133e167d..6eb5d7a12 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -183,6 +183,8 @@ ephy_new_bookmark_response_cb (GtkDialog *dialog,
ephy_new_bookmark_add (new_bookmark);
break;
}
+
+ gtk_widget_destroy (GTK_WIDGET (new_bookmark));
}
static GtkWidget *
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 2e2bb9080..b66c92c31 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -162,8 +162,7 @@ popup_cmd_bookmark_link (EggAction *action,
(EPHY_NEW_BOOKMARK (new_bookmark), title);
ephy_new_bookmark_set_smarturl
(EPHY_NEW_BOOKMARK (new_bookmark), rel);
- gtk_dialog_run (GTK_DIALOG (new_bookmark));
- gtk_widget_destroy (new_bookmark);
+ gtk_widget_show (new_bookmark);
}
void
diff --git a/src/window-commands.c b/src/window-commands.c
index f9e5ecf72..a4c5844e0 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -315,8 +315,7 @@ window_cmd_file_bookmark_page (EggAction *action,
(EPHY_NEW_BOOKMARK (new_bookmark), title);
ephy_new_bookmark_set_icon
(EPHY_NEW_BOOKMARK (new_bookmark), icon);
- gtk_dialog_run (GTK_DIALOG (new_bookmark));
- gtk_widget_destroy (new_bookmark);
+ gtk_widget_show (new_bookmark);
}
void