r21518 - in /desktop/experimental/epiphany-webkit/debian: ./ patches/
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Thu Sep 24 19:24:43 UTC 2009
Author: kov
Date: Thu Sep 24 19:24:43 2009
New Revision: 21518
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21518
Log:
Drop obsolete/applied patches, update patch that was newer in gecko epiphany
Removed:
desktop/experimental/epiphany-webkit/debian/patches/08_load_on_new_tab.patch
desktop/experimental/epiphany-webkit/debian/patches/09_download_dialog.patch
desktop/experimental/epiphany-webkit/debian/patches/11_fix_crash_in_profile_migration.patch
desktop/experimental/epiphany-webkit/debian/patches/13_ignore_padlength_nss_error.patch
desktop/experimental/epiphany-webkit/debian/patches/16_request_nss_master_password_if_needed.patch
Modified:
desktop/experimental/epiphany-webkit/debian/changelog
desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch
desktop/experimental/epiphany-webkit/debian/patches/series
Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=21518&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog [utf-8] Thu Sep 24 19:24:43 2009
@@ -1,6 +1,15 @@
epiphany-webkit (2.28.0-1) UNRELEASED; urgency=low
* New upstream release
+ * debian/patches/10_smart_bookmarks.patch:
+ - updated form gecko's epiphany-browser package
+ * debian/patches/08_load_on_new_tab.patch,
+ debian/patches/09_download_dialog.patch:
+ - dropped; obsolete
+ * debian/patches/11_fix_crash_in_profile_migration.patch,
+ debian/patches/13_ignore_padlength_nss_error.patch,
+ debian/patches/16_request_nss_master_password_if_needed.patch:
+ - applied upstream
-- Gustavo Noronha Silva <kov at debian.org> Thu, 24 Sep 2009 16:17:39 -0300
Modified: desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch?rev=21518&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/10_smart_bookmarks.patch [utf-8] Thu Sep 24 19:24:43 2009
@@ -1,122 +1,14 @@
GNOME #571794
-Index: epiphany-webkit-2.27.0~svn.8837/src/bookmarks/ephy-bookmark-action.c
+Index: epiphany-2.26.3/src/bookmarks/ephy-bookmark-action.c
===================================================================
---- epiphany-webkit-2.27.0~svn.8837.orig/src/bookmarks/ephy-bookmark-action.c 2009-02-02 22:18:56.000000000 -0200
-+++ epiphany-webkit-2.27.0~svn.8837/src/bookmarks/ephy-bookmark-action.c 2009-03-03 11:20:35.000000000 -0300
-@@ -71,6 +71,7 @@
- GObject *weak_ptr;
- GtkWidget *entry;
- EphyLinkFlags flags;
-+ gboolean activate;
- } ClipboardCtx;
-
- G_DEFINE_TYPE (EphyBookmarkAction, ephy_bookmark_action, EPHY_TYPE_LINK_ACTION)
-@@ -80,12 +81,12 @@
- const char *text,
- ClipboardCtx *ctx)
- {
-- if (ctx->weak_ptr != NULL && text != NULL)
-+ if (ctx->weak_ptr != NULL && (ctx->activate || text != NULL))
- {
- /* This is to avoid middle-clicking on a non-empty smart bookmark
- * triggering another search.
- */
-- if (strcmp (text, gtk_entry_get_text (GTK_ENTRY (ctx->entry))) != 0)
-+ if (text != NULL && strcmp (text, gtk_entry_get_text (GTK_ENTRY (ctx->entry))) != 0)
- {
- gtk_entry_set_text (GTK_ENTRY (ctx->entry), text);
- }
-@@ -93,6 +94,11 @@
-
- if (ctx->weak_ptr != NULL)
- {
-+ if (ctx->activate)
-+ {
-+ ephy_bookmark_action_activate (EPHY_BOOKMARK_ACTION (ctx->weak_ptr),
-+ ctx->entry, ctx->flags);
-+ }
- GObject **object = &(ctx->weak_ptr);
- g_object_remove_weak_pointer (G_OBJECT (ctx->weak_ptr),
- (gpointer *)object);
-@@ -101,6 +107,33 @@
- g_slice_free (ClipboardCtx, ctx);
- }
-
-+static void
-+request_clipboard (GtkWidget *entry,
-+ EphyBookmarkAction *action,
-+ gboolean activate)
-+{
-+ ClipboardCtx *ctx;
-+ GObject **object;
-+
-+ ctx = g_slice_new (ClipboardCtx);
-+ ctx->flags = EPHY_LINK_NEW_TAB | EPHY_LINK_JUMP_TO;
-+ ctx->entry = entry;
-+ ctx->activate = activate;
-+
-+ /* We need to make sure we know if the action is destroyed between
-+ * requesting the clipboard contents, and receiving them.
-+ */
-+
-+ ctx->weak_ptr = G_OBJECT (action);
-+ object = &(ctx->weak_ptr);
-+ g_object_add_weak_pointer (ctx->weak_ptr, (gpointer *)object);
-+
-+ gtk_clipboard_request_text
-+ (gtk_widget_get_clipboard (entry, GDK_SELECTION_PRIMARY),
-+ (GtkClipboardTextReceivedFunc) clipboard_text_received_cb,
-+ ctx);
-+}
-+
- static gboolean
- entry_button_press_event_cb (GtkWidget *entry,
- GdkEventButton *event,
-@@ -108,25 +141,7 @@
- {
- if (event->button == 2) /* middle click */
- {
-- ClipboardCtx *ctx;
-- GObject **object;
--
-- ctx = g_slice_new (ClipboardCtx);
-- ctx->flags = EPHY_LINK_NEW_TAB | EPHY_LINK_JUMP_TO;
-- ctx->entry = entry;
--
-- /* We need to make sure we know if the action is destroyed between
-- * requesting the clipboard contents, and receiving them.
-- */
--
-- ctx->weak_ptr = G_OBJECT (action);
-- object = &(ctx->weak_ptr);
-- g_object_add_weak_pointer (ctx->weak_ptr, (gpointer *)object);
--
-- gtk_clipboard_request_text
-- (gtk_widget_get_clipboard (entry, GDK_SELECTION_PRIMARY),
-- (GtkClipboardTextReceivedFunc) clipboard_text_received_cb,
-- ctx);
-+ request_clipboard (entry, EPHY_BOOKMARK_ACTION (action), FALSE);
- return TRUE;
- }
-
-@@ -383,6 +398,7 @@
- EphyBookmarkAction *action)
- {
- gboolean control = FALSE;
-+ gboolean is_middle_click;
- GdkEvent *event;
-
- event = gtk_get_current_event ();
-@@ -393,12 +409,30 @@
- {
- control = (event->key.state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK;
- }
--
+--- epiphany-2.26.3.orig/src/bookmarks/ephy-bookmark-action.c 2009-05-28 21:26:22.000000000 +0200
++++ epiphany-2.26.3/src/bookmarks/ephy-bookmark-action.c 2009-08-10 15:44:49.860542930 +0200
+@@ -398,6 +398,18 @@ activate_cb (GtkWidget *widget,
gdk_event_free (event);
}
-+ /* If we are clicking on the button, use the entry instead */
++ /* If we are clicking on the button, activate the entry instead */
+ if (!GTK_IS_EDITABLE (widget))
+ {
+ GtkWidget *otherwidget = gtk_widget_get_parent (widget);
@@ -128,16 +20,6 @@
+ widget = otherwidget;
+ }
+
-+ is_middle_click = ephy_gui_is_middle_click ();
-+ if (is_middle_click && GTK_IS_EDITABLE (widget))
-+ {
-+ request_clipboard (widget, action, TRUE);
-+ return;
-+ }
-+
ephy_bookmark_action_activate
-- (action, widget, (control || ephy_gui_is_middle_click ()) ? EPHY_LINK_NEW_TAB : 0);
-+ (action, widget, (control || is_middle_click) ? EPHY_LINK_NEW_TAB : 0);
+ (action, widget, (control || ephy_gui_is_middle_click ()) ? EPHY_LINK_NEW_TAB : 0);
}
-
- static gboolean
Modified: desktop/experimental/epiphany-webkit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/series?rev=21518&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/series [utf-8] Thu Sep 24 19:24:43 2009
@@ -5,13 +5,9 @@
04_avoid_using_newer_gtk.patch
05_libexecdir.patch
07_bookmarks.patch
-09_download_dialog.patch
10_smart_bookmarks.patch
-11_fix_crash_in_profile_migration.patch
12_safetypes.patch
-13_ignore_padlength_nss_error.patch
14_webkit_temporary_gconf_rename.patch
15_webkit_temporary_gettext_domain_rename.patch
-16_request_nss_master_password_if_needed.patch
99_autoreconf.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list