[Pkg-xfce-commits] r3557 - in desktop/trunk/mousepad/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Wed Oct 7 09:26:04 UTC 2009
Author: mrpouit-guest
Date: 2009-10-07 09:26:04 +0000 (Wed, 07 Oct 2009)
New Revision: 3557
Added:
desktop/trunk/mousepad/debian/patches/
desktop/trunk/mousepad/debian/patches/00_resensitize-find-button.patch
desktop/trunk/mousepad/debian/patches/01_fix-first-replace.patch
desktop/trunk/mousepad/debian/patches/series
Modified:
desktop/trunk/mousepad/debian/changelog
desktop/trunk/mousepad/debian/control
desktop/trunk/mousepad/debian/rules
Log:
* debian/patches:
- 00_resensitize-find-button.patch: re-sensitize "Find/Replace" button
when the dialog is shown up again (LP: #443302, closes: #549334)
- 01_fix-first-replace.patch: really replace the first occurrence found
with the find/Replace dialog (Xfce #4526, closes: #460440)
- series: add these patches.
* debian/control:
- build-depends on quilt (>= 0.46-7)
- bump Standards-Version to 3.8.3.
* debian/rules: enable quilt.
Modified: desktop/trunk/mousepad/debian/changelog
===================================================================
--- desktop/trunk/mousepad/debian/changelog 2009-10-07 08:53:11 UTC (rev 3556)
+++ desktop/trunk/mousepad/debian/changelog 2009-10-07 09:26:04 UTC (rev 3557)
@@ -1,3 +1,18 @@
+mousepad (0.2.16-3) UNRELEASED; urgency=low
+
+ * debian/patches:
+ - 00_resensitize-find-button.patch: re-sensitize "Find/Replace" button
+ when the dialog is shown up again (LP: #443302, closes: #549334)
+ - 01_fix-first-replace.patch: really replace the first occurrence found
+ with the find/Replace dialog (Xfce #4526, closes: #460440)
+ - series: add these patches.
+ * debian/control:
+ - build-depends on quilt (>= 0.46-7)
+ - bump Standards-Version to 3.8.3.
+ * debian/rules: enable quilt.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Wed, 07 Oct 2009 10:16:40 +0200
+
mousepad (0.2.16-2) unstable; urgency=low
* Upload to unstable.
Modified: desktop/trunk/mousepad/debian/control
===================================================================
--- desktop/trunk/mousepad/debian/control 2009-10-07 08:53:11 UTC (rev 3556)
+++ desktop/trunk/mousepad/debian/control 2009-10-07 09:26:04 UTC (rev 3557)
@@ -5,8 +5,9 @@
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>= 7), docbook-to-man,
- libxfcegui4-dev (>= 4.6.0), pkg-config, libxml-parser-perl, chrpath, intltool
-Standards-Version: 3.8.1
+ libxfcegui4-dev (>= 4.6.0), pkg-config, libxml-parser-perl, chrpath, intltool,
+ quilt (>= 0.46-7)
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/mousepad/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/
Added: desktop/trunk/mousepad/debian/patches/00_resensitize-find-button.patch
===================================================================
--- desktop/trunk/mousepad/debian/patches/00_resensitize-find-button.patch (rev 0)
+++ desktop/trunk/mousepad/debian/patches/00_resensitize-find-button.patch 2009-10-07 09:26:04 UTC (rev 3557)
@@ -0,0 +1,28 @@
+--- mousepad-0.2.16.orig/src/search.c
++++ mousepad-0.2.16/src/search.c
+@@ -210,8 +210,11 @@
+ G_CALLBACK(toggle_sensitivity), NULL);
+ g_signal_connect(G_OBJECT(entry_find), "delete-text",
+ G_CALLBACK(toggle_sensitivity), NULL);
+- if (sd->search.string_find)
++ if (sd->search.string_find) {
+ gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
++ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
++ GTK_RESPONSE_OK, TRUE);
++ }
+
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+ gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE);
+@@ -275,8 +278,11 @@
+ G_CALLBACK(toggle_sensitivity), NULL);
+ g_signal_connect(G_OBJECT(entry_find), "delete-text",
+ G_CALLBACK(toggle_sensitivity), NULL);
+- if (sd->search.string_find)
++ if (sd->search.string_find) {
+ gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
++ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
++ GTK_RESPONSE_OK, TRUE);
++ }
+ label_replace = gtk_label_new_with_mnemonic(_("Re_place with: "));
+ gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2);
Added: desktop/trunk/mousepad/debian/patches/01_fix-first-replace.patch
===================================================================
--- desktop/trunk/mousepad/debian/patches/01_fix-first-replace.patch (rev 0)
+++ desktop/trunk/mousepad/debian/patches/01_fix-first-replace.patch 2009-10-07 09:26:04 UTC (rev 3557)
@@ -0,0 +1,36 @@
+diff -Naur mousepad-svn-r29637/src/search.c mousepad/src/search.c
+--- mousepad-svn-r29637/src/search.c 2007-11-16 05:20:21.000000000 +0500
++++ mousepad/src/search.c 2009-03-01 13:03:38.000000000 +0500
+@@ -78,7 +78,7 @@
+ static gint document_replace_real(StructData *sd)
+ {
+ GtkTextIter iter, match_start, match_end;
+- GtkTextMark *mark_init = NULL;
++ GtkTextMark *mark_init = NULL, *mark_start, *mark_end;
+ gboolean res;
+ gint num = 0;
+ GtkWidget *q_dialog = NULL;
+@@ -113,6 +113,11 @@
+ if (num == 0 && q_dialog == NULL)
+ q_dialog = create_dialog_message_question(
+ gtk_widget_get_toplevel(sd->mainwin->textview), _("Replace?"));
++
++ gtk_text_buffer_get_selection_bounds(textbuffer, &match_start, &match_end);
++ mark_start = gtk_text_buffer_create_mark(textbuffer, NULL, &match_start, FALSE);
++ mark_end = gtk_text_buffer_create_mark(textbuffer, NULL, &match_end, FALSE);
++
+ switch (gtk_dialog_run(GTK_DIALOG(q_dialog))) {
+ case GTK_RESPONSE_CANCEL:
+ res = 0;
+@@ -122,6 +127,11 @@
+ case GTK_RESPONSE_NO:
+ continue;
+ }
++
++ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_start, mark_start);
++ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_end, mark_end);
++ gtk_text_buffer_move_mark_by_name(textbuffer, "selection_bound", &match_start);
++ gtk_text_buffer_move_mark_by_name(textbuffer, "insert", &match_end);
+ }
+ gtk_text_buffer_delete_selection(textbuffer, TRUE, TRUE);
+ undo_set_sequency(TRUE);
Added: desktop/trunk/mousepad/debian/patches/series
===================================================================
--- desktop/trunk/mousepad/debian/patches/series (rev 0)
+++ desktop/trunk/mousepad/debian/patches/series 2009-10-07 09:26:04 UTC (rev 3557)
@@ -0,0 +1,2 @@
+00_resensitize-find-button.patch
+01_fix-first-replace.patch
Modified: desktop/trunk/mousepad/debian/rules
===================================================================
--- desktop/trunk/mousepad/debian/rules 2009-10-07 08:53:11 UTC (rev 3556)
+++ desktop/trunk/mousepad/debian/rules 2009-10-07 09:26:04 UTC (rev 3557)
@@ -22,6 +22,7 @@
config.status: configure
dh_testdir
+ dh_quilt_patch
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --enable-final
@@ -46,6 +47,7 @@
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
+ dh_quilt_unpatch
install: build
dh_testdir
More information about the Pkg-xfce-commits
mailing list