aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-06-23 07:03:43 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-06-23 07:03:43 +0800
commitca789c035a4c74bfaf25b52d8d73c4685d4eb91f (patch)
treec3b680c5f273a0e3d3475c0820ee33a971b79515
parent250fa48d8848faf5741544fe3e9a083119ba0309 (diff)
downloadgsoc2013-epiphany-ca789c035a4c74bfaf25b52d8d73c4685d4eb91f.tar
gsoc2013-epiphany-ca789c035a4c74bfaf25b52d8d73c4685d4eb91f.tar.gz
gsoc2013-epiphany-ca789c035a4c74bfaf25b52d8d73c4685d4eb91f.tar.bz2
gsoc2013-epiphany-ca789c035a4c74bfaf25b52d8d73c4685d4eb91f.tar.lz
gsoc2013-epiphany-ca789c035a4c74bfaf25b52d8d73c4685d4eb91f.tar.xz
gsoc2013-epiphany-ca789c035a4c74bfaf25b52d8d73c4685d4eb91f.tar.zst
gsoc2013-epiphany-ca789c035a4c74bfaf25b52d8d73c4685d4eb91f.zip
Correct translations dir (leftover from galeon)
2003-06-23 Marco Pesenti Gritti <marco@it.gnome.org> * configure.in: Correct translations dir (leftover from galeon) * embed/ephy-history.c: Lower expire to 10 days, similar to phoenix. Current interface and perf make this a better default. * lib/ephy-dialog.c: (ephy_dialog_init), (setup_default_size): Make sure to not state_add more than one time * lib/widgets/ephy-location-entry.c: (insert_text_cb): Do not show autocompletion on not focused window. This is to work around problems with gnome-entry. * src/ephy-window.c: (popup_menu_at_coords), (show_embed_popup), (tab_context_menu_cb): Do not use custom func to show mouse popups. Fix costum func to be smarter with screen limits.
-rw-r--r--ChangeLog26
-rw-r--r--configure.in2
-rw-r--r--embed/ephy-history.c2
-rw-r--r--lib/ephy-dialog.c13
-rw-r--r--lib/widgets/ephy-location-entry.c5
-rw-r--r--src/ephy-window.c34
6 files changed, 60 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 3094d2dd5..ac8b11f91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2003-06-23 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * configure.in:
+
+ Correct translations dir (leftover from galeon)
+
+ * embed/ephy-history.c:
+
+ Lower expire to 10 days, similar to phoenix. Current interface
+ and perf make this a better default.
+
+ * lib/ephy-dialog.c: (ephy_dialog_init), (setup_default_size):
+
+ Make sure to not state_add more than one time
+
+ * lib/widgets/ephy-location-entry.c: (insert_text_cb):
+
+ Do not show autocompletion on not focused window. This is to
+ work around problems with gnome-entry.
+
+ * src/ephy-window.c: (popup_menu_at_coords), (show_embed_popup),
+ (tab_context_menu_cb):
+
+ Do not use custom func to show mouse popups.
+ Fix costum func to be smarter with screen limits.
+
2003-06-22 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/mozilla-embed-single.cpp: (impl_remove_cookies):
diff --git a/configure.in b/configure.in
index d833d3907..42e5fe962 100644
--- a/configure.in
+++ b/configure.in
@@ -198,7 +198,7 @@ dnl *******************************
dnl Add the languages which your application supports here.
ALL_LINGUAS="am be ca cs da de el en_GB es fr hu ja ko li nl ms no pl pt pt_BR ru sr sr@Latn sv tr vi zh_TW"
-GETTEXT_PACKAGE=epiphany-2.0
+GETTEXT_PACKAGE=epiphany
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
AM_GLIB_GNU_GETTEXT
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index f93982aad..13890b89a 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -37,7 +37,7 @@
/* how often to save the history, in milliseconds */
#define HISTORY_SAVE_INTERVAL (60 * 5 * 1000)
-#define HISTORY_PAGE_OBSOLETE_DAYS 30
+#define HISTORY_PAGE_OBSOLETE_DAYS 10
struct EphyHistoryPrivate
{
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index 8b6baa2ca..2100eb1f6 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -105,6 +105,7 @@ struct EphyDialogPrivate
GtkWidget *container;
PropertyInfo *props;
gboolean modal;
+ gboolean has_default_size;
char *name;
int spin_item_id;
@@ -795,6 +796,7 @@ ephy_dialog_init (EphyDialog *dialog)
dialog->priv->spin_timer = NULL;
dialog->priv->name = NULL;
dialog->priv->initialized = FALSE;
+ dialog->priv->has_default_size = FALSE;
}
static void
@@ -1181,9 +1183,14 @@ impl_get_value (EphyDialog *dialog,
static void
setup_default_size (EphyDialog *dialog)
{
- ephy_state_add_window (dialog->priv->dialog,
- dialog->priv->name, -1, -1,
- EPHY_STATE_WINDOW_SAVE_SIZE);
+ if (!dialog->priv->has_default_size)
+ {
+ ephy_state_add_window (dialog->priv->dialog,
+ dialog->priv->name, -1, -1,
+ EPHY_STATE_WINDOW_SAVE_SIZE);
+ }
+
+ dialog->priv->has_default_size = TRUE;
}
static gint
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 7c79b9619..94c696ba8 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -379,6 +379,11 @@ insert_text_cb (GtkWidget *editable,
EphyLocationEntry *w)
{
EphyLocationEntryPrivate *p = w->priv;
+ GtkWidget *window;
+
+ window = gtk_widget_get_toplevel (editable);
+ g_return_if_fail (window != NULL);
+ if (!GTK_WINDOW (window)->has_focus) return;
if (p->going_to_site) return;
diff --git a/src/ephy-window.c b/src/ephy-window.c
index cf876af8b..b27cdaef3 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1031,7 +1031,7 @@ popup_menu_at_coords (GtkMenu *menu, gint *x, gint *y, gboolean *push_in,
*x = event->x;
*y = event->y;
- *push_in = FALSE;
+ *push_in = TRUE;
}
static void
@@ -1056,6 +1056,7 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
const GValue *value;
gboolean framed, has_background;
GtkWidget *widget;
+ EphyEmbedEventType type;
ephy_embed_event_get_property (event, "framed_page", &value);
framed = g_value_get_int (value);
@@ -1103,8 +1104,20 @@ show_embed_popup (EphyWindow *window, EphyTab *tab, EphyEmbedEvent *event)
g_object_set_data (G_OBJECT (window), "context_event", event);
g_signal_connect (widget, "destroy",
G_CALLBACK (popup_destroy_cb), window);
- gtk_menu_popup (GTK_MENU (widget), NULL, NULL, popup_menu_at_coords, event, 2,
- gtk_get_current_event_time ());
+
+ ephy_embed_event_get_event_type (event, &type);
+ if (type == EPHY_EMBED_EVENT_KEY)
+ {
+ gtk_menu_popup (GTK_MENU (widget), NULL, NULL,
+ popup_menu_at_coords, event, 2,
+ gtk_get_current_event_time ());
+ }
+ else
+ {
+ gtk_menu_popup (GTK_MENU (widget), NULL, NULL,
+ NULL, NULL, 2,
+ gtk_get_current_event_time ());
+ }
}
static gint
@@ -1113,7 +1126,6 @@ tab_context_menu_cb (EphyEmbed *embed,
EphyWindow *window)
{
EphyTab *tab;
- EphyEmbedEventType type;
g_return_val_if_fail (IS_EPHY_WINDOW (window), FALSE);
g_return_val_if_fail (IS_EPHY_EMBED (embed), FALSE);
@@ -1126,19 +1138,7 @@ tab_context_menu_cb (EphyEmbed *embed,
window = ephy_tab_get_window (tab);
g_return_val_if_fail (window != NULL, FALSE);
- ephy_embed_event_get_event_type (event, &type);
-
- if (type == EPHY_EMBED_EVENT_MOUSE_BUTTON3)
- {
- show_embed_popup (window, tab, event);
- }
- else
- {
- int x, y;
-
- ephy_embed_event_get_coords (event, &x, &y); // Why?
- show_embed_popup (window, tab, event);
- }
+ show_embed_popup (window, tab, event);
return FALSE;
}