diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-04-02 02:48:50 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-04-02 02:48:50 +0800 |
| commit | 1bf392262548cf4c6779e1bc6c550b3605aba733 (patch) | |
| tree | cf7ef737a899cb44d44d4270a788b5a7ebdcc964 /src/prefs-dialog.c | |
| parent | a040bc3b4be4f80ae661b7f2a88c78d29c480e65 (diff) | |
| download | gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.gz gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.bz2 gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.lz gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.xz gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.tar.zst gsoc2013-epiphany-1bf392262548cf4c6779e1bc6c550b3605aba733.zip | |
Use EggEditableToolbar. Update to latest versions (not EggMenuMerge, we
2003-04-01 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/egg/Makefile.am:
* lib/egg/egg-accel-dialog.c:
* lib/egg/egg-action-group.c:
* lib/egg/egg-action.c:
* lib/egg/egg-editable-toolbar.c:
* lib/egg/egg-editable-toolbar.h:
* lib/egg/egg-radio-action.c:
* lib/egg/egg-toggle-action.c:
* lib/egg/egg-toolbars-group.c:
* lib/egg/egg-toolbars-group.h:
* lib/egg/eggintl.h:
* lib/egg/eggtoolbar.c:
* lib/egg/eggtoolbutton.c:
* lib/egg/update-from-egg.sh:
Use EggEditableToolbar.
Update to latest versions (not EggMenuMerge, we still need patches).
WARNING: it's no more possible to drag bookmarks in the toolbar,
if you depend on that feature please wait the weekend to update cvs.
* lib/egg/egg-markup.c:
* lib/egg/egg-markup.h:
Remove, not used.
* lib/widgets/Makefile.am:
* lib/widgets/ephy-editable-toolbar.c:
* lib/widgets/ephy-editable-toolbar.h:
* lib/widgets/ephy-toolbars-group.c:
* lib/widgets/ephy-toolbars-group.h:
Remove.
* src/prefs-dialog.c: (prefs_dialog_show_help),
(prefs_dialog_response_cb):
Fix a warning.
* src/toolbar.c: (toolbar_get_type), (toolbar_get_action_name),
(toolbar_get_action), (toolbar_class_init), (toolbar_init):
* src/toolbar.h:
* src/window-commands.c: (window_cmd_edit_toolbar):
Update to use the egg api.
Diffstat (limited to 'src/prefs-dialog.c')
| -rw-r--r-- | src/prefs-dialog.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 70097f76c..28d32b564 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -238,7 +238,7 @@ prefs_dialog_show_page (PrefsDialog *pd, gtk_notebook_set_current_page (GTK_NOTEBOOK (pd->priv->notebook), id); } -static void +static void prefs_dialog_show_help (PrefsDialog *pd) { GError *err; @@ -258,17 +258,17 @@ prefs_dialog_show_help (PrefsDialog *pd) { GtkWidget *err_dialog; err_dialog = gtk_message_dialog_new ( - GTK_WINDOW (pd), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, + GTK_WINDOW (pd), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - _("Could not display help: %s"), + _("Could not display help: %s"), err->message); - g_signal_connect (G_OBJECT (err_dialog), "response", + g_signal_connect (G_OBJECT (err_dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL); - gtk_window_set_resizable (GTK_WINDOW (err_dialog), + gtk_window_set_resizable (GTK_WINDOW (err_dialog), FALSE); gtk_widget_show (err_dialog); g_error_free (err); @@ -278,18 +278,15 @@ prefs_dialog_show_help (PrefsDialog *pd) static void prefs_dialog_response_cb (GtkDialog *dialog, gint response_id, gpointer data) { - GError *err; - if (response_id == GTK_RESPONSE_CLOSE) { gtk_widget_destroy (GTK_WIDGET(dialog)); - } + } else if (response_id == GTK_RESPONSE_HELP) { PrefsDialog *pd = (PrefsDialog *)data; - prefs_dialog_show_help (pd); + prefs_dialog_show_help (pd); } - } static void |