aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-02-15 18:08:03 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-02-15 18:08:03 +0800
commit22e63760412a7fc434dff68ea8c4347b1cd13c9c (patch)
tree1e745f4a72c669f4c43e094150c8a6054ccfd5b5
parentc6797825d807211a8d0c187bf2c299aabb1becef (diff)
downloadgsoc2013-epiphany-22e63760412a7fc434dff68ea8c4347b1cd13c9c.tar
gsoc2013-epiphany-22e63760412a7fc434dff68ea8c4347b1cd13c9c.tar.gz
gsoc2013-epiphany-22e63760412a7fc434dff68ea8c4347b1cd13c9c.tar.bz2
gsoc2013-epiphany-22e63760412a7fc434dff68ea8c4347b1cd13c9c.tar.lz
gsoc2013-epiphany-22e63760412a7fc434dff68ea8c4347b1cd13c9c.tar.xz
gsoc2013-epiphany-22e63760412a7fc434dff68ea8c4347b1cd13c9c.tar.zst
gsoc2013-epiphany-22e63760412a7fc434dff68ea8c4347b1cd13c9c.zip
*** empty log message ***
-rw-r--r--data/glade/epiphany.glade3
-rw-r--r--data/ui/epiphany-ui.xml.in2
-rwxr-xr-xembed/find-dialog.c97
3 files changed, 47 insertions, 55 deletions
diff --git a/data/glade/epiphany.glade b/data/glade/epiphany.glade
index 773bc0334..160615ef5 100644
--- a/data/glade/epiphany.glade
+++ b/data/glade/epiphany.glade
@@ -547,8 +547,7 @@
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
<property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- <signal name="activate" handler="find_entry_activate_cb"/>
+ <property name="activates_default">True</property>
<signal name="changed" handler="find_entry_changed_cb"/>
</widget>
</child>
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index 761ecd8b5..e1ced423a 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -91,8 +91,6 @@
<menuitem name="GoForwardDP" verb="GoForward"/>
<menuitem name="GoReloadDP" verb="ViewReload"/>
<separator name="DPSep1"/>
- <menuitem name="EditCutIP" verb="EditCut"/>
-
<menuitem name="SavePageAsDP" verb="FileSaveAs"/>
<menuitem name="SaveBackgroundAsDP" verb="SaveBackgroundAs"/>
<menuitem name="BookmarkPageDP" verb="FileBookmarkPage"/>
diff --git a/embed/find-dialog.c b/embed/find-dialog.c
index 7b96e86c1..d16b3733a 100755
--- a/embed/find-dialog.c
+++ b/embed/find-dialog.c
@@ -43,7 +43,6 @@ impl_show (EphyDialog *dialog);
void find_close_button_clicked_cb (GtkWidget *button, EphyDialog *dialog);
void find_next_button_clicked_cb (GtkWidget *button, EphyDialog *dialog);
void find_prev_button_clicked_cb (GtkWidget *button, EphyDialog *dialog);
-void find_entry_activate_cb (GtkWidget *editable, EphyDialog *dialog);
void find_entry_changed_cb (GtkWidget *editable, EphyDialog *dialog);
void find_check_toggled_cb (GtkWidget *toggle, EphyDialog *dialog);
@@ -204,6 +203,51 @@ impl_destruct (EphyDialog *dialog)
}
static void
+find_get_info (EphyDialog *dialog)
+{
+ EmbedFindInfo *properties;
+ char *search_string;
+ GValue word = {0, };
+ GValue match_case = {0, };
+ GValue wrap = {0, };
+ FindDialog *find_dialog = FIND_DIALOG(dialog);
+
+ /* get the search string from the entry field */
+ ephy_dialog_get_value (dialog, WORD_PROP, &word);
+ search_string = g_strdup(g_value_get_string (&word));
+ g_value_unset (&word);
+
+ /* don't do null searches */
+ if (search_string[0] == '\0')
+ {
+ find_dialog->priv->can_go_prev = FALSE;
+ find_dialog->priv->can_go_next = FALSE;
+ return;
+ }
+
+ if (find_dialog->priv->properties != NULL)
+ {
+ g_free (find_dialog->priv->properties->search_string);
+ g_free (find_dialog->priv->properties);
+ }
+
+ /* build search structure */
+ properties = g_new0 (EmbedFindInfo,1);
+ properties->search_string = search_string;
+
+ ephy_dialog_get_value (dialog, MATCH_CASE_PROP, &match_case);
+ properties->match_case = g_value_get_boolean (&match_case);
+
+ ephy_dialog_get_value (dialog, AUTOWRAP_PROP, &wrap);
+ properties->wrap = g_value_get_boolean (&wrap);
+
+ properties->entire_word = FALSE;
+ properties->search_frames = TRUE;
+
+ find_dialog->priv->properties = properties;
+}
+
+static void
impl_show (EphyDialog *dialog)
{
FindDialog *find_dialog = FIND_DIALOG(dialog);
@@ -211,6 +255,7 @@ impl_show (EphyDialog *dialog)
find_dialog->priv->can_go_prev = TRUE;
find_dialog->priv->can_go_next = TRUE;
+ find_get_info (dialog);
find_update_nav (dialog);
/* Focus the text entry. This will correctly select or leave
@@ -331,48 +376,6 @@ find_dialog_go_prev (FindDialog *dialog,
find_update_nav (EPHY_DIALOG(dialog));
}
-static void
-find_get_info (EphyDialog *dialog)
-{
- EmbedFindInfo *properties;
- char *search_string;
- GValue word = {0, };
- GValue match_case = {0, };
- GValue wrap = {0, };
- FindDialog *find_dialog = FIND_DIALOG(dialog);
-
- /* get the search string from the entry field */
- ephy_dialog_get_value (dialog, WORD_PROP, &word);
- search_string = g_strdup(g_value_get_string (&word));
-
- /* don't do null searches */
- if (search_string[0] == '\0')
- {
- return;
- }
-
- if (find_dialog->priv->properties != NULL)
- {
- g_free (find_dialog->priv->properties->search_string);
- g_free (find_dialog->priv->properties);
- }
-
- /* build search structure */
- properties = g_new0 (EmbedFindInfo,1);
- properties->search_string = search_string;
-
- ephy_dialog_get_value (dialog, MATCH_CASE_PROP, &match_case);
- properties->match_case = g_value_get_boolean (&match_case);
-
- ephy_dialog_get_value (dialog, AUTOWRAP_PROP, &wrap);
- properties->wrap = g_value_get_boolean (&wrap);
-
- properties->entire_word = FALSE;
- properties->search_frames = TRUE;
-
- find_dialog->priv->properties = properties;
-}
-
void
find_close_button_clicked_cb (GtkWidget *button,
EphyDialog *dialog)
@@ -395,14 +398,6 @@ find_prev_button_clicked_cb (GtkWidget *button,
}
void
-find_entry_activate_cb (GtkWidget *editable,
- EphyDialog *dialog)
-{
- find_dialog_go_next (FIND_DIALOG(dialog), TRUE);
- find_update_nav (dialog);
-}
-
-void
find_entry_changed_cb (GtkWidget *editable,
EphyDialog *dialog)
{