diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-11-17 19:26:11 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-11-17 19:26:11 +0800 |
| commit | c59be23acf60d721f2aa2b37e242656a22ce29ff (patch) | |
| tree | d5196c3f9adaa500df7d8144879af05729db1dfe /embed/mozilla/GtkNSSKeyPairDialogs.cpp | |
| parent | 5af8580728d5074c39d007cf008bc3be3a9a2149 (diff) | |
| download | gsoc2013-epiphany-c59be23acf60d721f2aa2b37e242656a22ce29ff.tar gsoc2013-epiphany-c59be23acf60d721f2aa2b37e242656a22ce29ff.tar.gz gsoc2013-epiphany-c59be23acf60d721f2aa2b37e242656a22ce29ff.tar.bz2 gsoc2013-epiphany-c59be23acf60d721f2aa2b37e242656a22ce29ff.tar.lz gsoc2013-epiphany-c59be23acf60d721f2aa2b37e242656a22ce29ff.tar.xz gsoc2013-epiphany-c59be23acf60d721f2aa2b37e242656a22ce29ff.tar.zst gsoc2013-epiphany-c59be23acf60d721f2aa2b37e242656a22ce29ff.zip | |
Resync with galeon.
2003-11-17 Marco Pesenti Gritti <marco@gnome.org>
* configure.in:
* embed/mozilla/GtkNSSDialogs.cpp:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
Resync with galeon.
* embed/mozilla/mozilla-embed-single.cpp:
Header name change
Diffstat (limited to 'embed/mozilla/GtkNSSKeyPairDialogs.cpp')
| -rw-r--r-- | embed/mozilla/GtkNSSKeyPairDialogs.cpp | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index 8f81c68ea..941bcebe3 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -55,8 +55,9 @@ #include "gtk/gtklabel.h" #include "gtk/gtkhbox.h" #include "gtk/gtkvbox.h" +#include "gtk/gtkmain.h" -#include <glib/gi18n.h> +#include <libgnome/gnome-i18n.h> #include "GtkNSSKeyPairDialogs.h" @@ -106,6 +107,25 @@ NS_IMETHODIMP KeyPairHelperWindow::Close() } /* ------------------------------------------------------------ */ +static void +begin_busy (GtkWidget *widget) +{ + static GdkCursor *cursor = NULL; + + if (cursor == NULL) cursor = gdk_cursor_new (GDK_WATCH); + + if (!GTK_WIDGET_REALIZED (widget)) gtk_widget_realize (GTK_WIDGET(widget)); + + gdk_window_set_cursor (GTK_WIDGET (widget)->window, cursor); + while (gtk_events_pending ()) gtk_main_iteration (); +} + +static void +end_busy (GtkWidget *widget) +{ + gdk_window_set_cursor (GTK_WIDGET(widget)->window, NULL); +} + struct KeyPairInfo { @@ -177,6 +197,7 @@ GtkNSSKeyPairDialogs::DisplayGeneratingKeypairInfo (nsIInterfaceRequestor *ctx, gtk_widget_show_all (dialog); gtk_widget_hide (GTK_DIALOG (dialog)->action_area); + begin_busy (dialog); runnable->StartKeyGeneration (helper); int res = gtk_dialog_run (GTK_DIALOG (dialog)); if (res != GTK_RESPONSE_OK && helper->close_called == FALSE) @@ -189,6 +210,7 @@ GtkNSSKeyPairDialogs::DisplayGeneratingKeypairInfo (nsIInterfaceRequestor *ctx, } g_source_remove (timeout_id); + end_busy (dialog); gtk_widget_destroy (dialog); delete helper; return NS_OK; @@ -561,6 +583,7 @@ NS_IMETHODIMP KeyPairHelperWindow::UpdateCommands(const nsAString & action) MOZ_NOT_IMPLEMENTED } +#if MOZILLA_SNAPSHOT <= 12 /* DOMString escape (in DOMString str); */ NS_IMETHODIMP KeyPairHelperWindow::Escape(const nsAString & str, nsAString & _retval) { @@ -572,6 +595,7 @@ NS_IMETHODIMP KeyPairHelperWindow::Unescape(const nsAString & str, nsAString & _ { MOZ_NOT_IMPLEMENTED } +#endif /* [noscript] boolean find (in DOMString str, in boolean caseSensitive, in boolean backwards, in boolean wrapAround, in boolean wholeWord, in boolean searchInFrames, in boolean showDialog); */ NS_IMETHODIMP KeyPairHelperWindow::Find(const nsAString & str, PRBool caseSensitive, PRBool backwards, PRBool wrapAround, PRBool wholeWord, PRBool searchInFrames, PRBool showDialog, PRBool *_retval) |