diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-08-02 03:28:53 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-08-02 03:28:53 +0800 |
| commit | efdde3ff63b9f0c3c3ff8c418c451be494360601 (patch) | |
| tree | 6a6c07b01fc1066c12edebee0a2047777412a5cb /src/prefs-dialog.c | |
| parent | dd0039f8b586bee1e77bddc23bc4c67107f3c14c (diff) | |
| download | gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.gz gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.bz2 gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.lz gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.xz gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.zst gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.zip | |
Now that the tab's address is always correct (isn't the typed address
2005-08-01 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-location-action.c: (get_location_cb):
* src/ephy-session.c: (write_tab):
* src/ephy-tab.c:
* src/ephy-window.c: (modal_alert_cb):
* src/prefs-dialog.c: (set_homepage_entry),
(prefs_homepage_current_button_clicked_cb):
* src/window-commands.c: (window_cmd_file_send_to),
(window_cmd_file_bookmark_page), (window_cmd_view_page_source):
Now that the tab's address is always correct (isn't the typed address
anymore), always use ephy_tab_get_address instead of
ephy_embed_get_location, since the former also gets the right address
when the page loading but still blank. Should fix bug #147840.
Diffstat (limited to 'src/prefs-dialog.c')
| -rw-r--r-- | src/prefs-dialog.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index ea2526169..42b71f257 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -1280,12 +1280,12 @@ prefs_clear_cache_button_clicked_cb (GtkWidget *button, static void set_homepage_entry (EphyDialog *dialog, - char *new_location) + const char *new_location) { GValue value = { 0, }; g_value_init (&value, G_TYPE_STRING); - g_value_take_string (&value, new_location); + g_value_set_string (&value, new_location); ephy_dialog_set_value (dialog, properties[HOMEPAGE_ENTRY_PROP].id, &value); g_value_unset (&value); } @@ -1296,8 +1296,7 @@ prefs_homepage_current_button_clicked_cb (GtkWidget *button, { EphySession *session; EphyWindow *window; - EphyEmbed *embed; - char *location; + EphyTab *tab; session = EPHY_SESSION (ephy_shell_get_session (ephy_shell_get_default ())); window = ephy_session_get_active_window (session); @@ -1305,11 +1304,10 @@ prefs_homepage_current_button_clicked_cb (GtkWidget *button, /* can't do anything in this case */ if (window == NULL) return; - embed = ephy_window_get_active_embed (window); - g_return_if_fail (embed != NULL); + tab = ephy_window_get_active_tab (window); + g_return_if_fail (tab != NULL); - location = ephy_embed_get_location (embed, TRUE); - set_homepage_entry (dialog, location); + set_homepage_entry (dialog, ephy_tab_get_address (tab)); } void |