diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-10-22 07:46:13 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-10-22 07:46:13 +0800 |
| commit | 359f14df6b76ebf2a236245f51cf69e1ae0f351e (patch) | |
| tree | 74741c4dc6a80bec3b4938a86cedf3b3d823e38d /src/pdm-dialog.c | |
| parent | f946f0f12df551e2960114e1378785ab245ae0c6 (diff) | |
| download | gsoc2013-epiphany-359f14df6b76ebf2a236245f51cf69e1ae0f351e.tar gsoc2013-epiphany-359f14df6b76ebf2a236245f51cf69e1ae0f351e.tar.gz gsoc2013-epiphany-359f14df6b76ebf2a236245f51cf69e1ae0f351e.tar.bz2 gsoc2013-epiphany-359f14df6b76ebf2a236245f51cf69e1ae0f351e.tar.lz gsoc2013-epiphany-359f14df6b76ebf2a236245f51cf69e1ae0f351e.tar.xz gsoc2013-epiphany-359f14df6b76ebf2a236245f51cf69e1ae0f351e.tar.zst gsoc2013-epiphany-359f14df6b76ebf2a236245f51cf69e1ae0f351e.zip | |
Add varargs version of ephy_dialog_get_control to get more than one
2004-10-22 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-dialog.c: (ephy_dialog_get_controls):
* lib/ephy-dialog.h:
Add varargs version of ephy_dialog_get_control to get more
than one control at a time.
* embed/downloader-view.c: (downloader_view_build_ui):
* src/pdm-dialog.c: (pdm_dialog_show_help), (pdm_dialog_init):
* src/prefs-dialog.c: (prefs_dialog_show_help),
(setup_add_language_dialog), (create_language_section),
(prefs_dialog_init):
Use that.
Diffstat (limited to 'src/pdm-dialog.c')
| -rwxr-xr-x | src/pdm-dialog.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 89876bf9b..7a45aabbe 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -191,14 +191,14 @@ pdm_dialog_show_help (PdmDialog *pd) "managing-passwords" }; - window = ephy_dialog_get_control (EPHY_DIALOG (pd), properties[PROP_WINDOW].id); - g_return_if_fail (GTK_IS_WINDOW (window)); - - notebook = ephy_dialog_get_control (EPHY_DIALOG (pd), properties[PROP_NOTEBOOK].id); - g_return_if_fail (notebook != NULL); + ephy_dialog_get_controls + (EPHY_DIALOG (pd), + properties[PROP_WINDOW].id, &window, + properties[PROP_NOTEBOOK].id, ¬ebook, + NULL); id = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)); - g_assert (id == 0 || id == 1); + g_return_if_fail (id == 0 || id == 1); ephy_gui_help (GTK_WINDOW (window), "epiphany", help_preferences[id]); } @@ -816,8 +816,11 @@ pdm_dialog_init (PdmDialog *dialog) "pdm_dialog", NULL); - window = ephy_dialog_get_control (EPHY_DIALOG (dialog), - properties[PROP_WINDOW].id); + ephy_dialog_get_controls (EPHY_DIALOG (dialog), + properties[PROP_WINDOW].id, &window, + properties[PROP_NOTEBOOK].id, ¬ebook, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (window), "web-browser"); /** @@ -861,7 +864,6 @@ pdm_dialog_init (PdmDialog *dialog) cookies->construct (cookies); passwords->construct (passwords); - notebook = ephy_dialog_get_control (EPHY_DIALOG (dialog), properties[PROP_NOTEBOOK].id); sync_notebook_tab (notebook, NULL, 0, dialog); g_signal_connect (G_OBJECT (notebook), "switch_page", G_CALLBACK (sync_notebook_tab), dialog); |