diff --git a/find-dialog.ui b/find-dialog.ui new file mode 100644 index 0000000..884f06a --- /dev/null +++ b/find-dialog.ui @@ -0,0 +1,221 @@ + + + + + 5 + True + Find + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + gtk-find + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + + + True + False + 2 + + + True + GTK_BUTTONBOX_END + + + True + True + gtk-close + True + GTK_RELIEF_NORMAL + False + + + + + True + True + True + True + gtk-find + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + 5 + True + False + 6 + + + True + False + 12 + + + True + _Search for: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + search-entry + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + True + False + True + True + + + 0 + True + True + + + + + 0 + True + True + + + + + True + True + _Match case + True + GTK_RELIEF_NORMAL + False + False + False + True + + + 0 + False + False + + + + + True + True + Match _entire word only + True + GTK_RELIEF_NORMAL + False + False + False + True + + + 0 + False + False + + + + + True + True + Match as _regular expression + True + GTK_RELIEF_NORMAL + False + False + False + True + + + 0 + False + False + + + + + True + True + Search _backwards + True + GTK_RELIEF_NORMAL + False + True + False + True + + + 0 + False + False + + + + + True + True + _Wrap around + True + GTK_RELIEF_NORMAL + False + True + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + + button-close + button-find + + + diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 4fd13c0..be24a1c 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -9,7 +9,7 @@ Summary: Terminal emulator for GNOME Name: gnome-terminal Version: 2.33.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and GFDL Group: User Interface/Desktops URL: http://www.gnome.org/ @@ -17,6 +17,7 @@ URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/gnome-terminal/2.33/gnome-terminal-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=588732 Source1: profile-new-dialog.ui +Source2: find-dialog.ui # gconftool-2 Requires(pre): GConf2 >= %{gconf_version} @@ -45,6 +46,7 @@ clickable URLs. %prep %setup -q +%patch0 -p1 -b .find-dialog autoreconf -i -f @@ -54,7 +56,7 @@ autoreconf -i -f make %{?_smp_mflags} #cp %{SOURCE1} src - +cp %{SOURCE2} src %install export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 @@ -91,6 +93,9 @@ desktop-file-install --vendor gnome --delete-original \ %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas %changelog +* Wed Jan 12 2011 Matthias Clasen - 2.33.4-2 +- Make the find dialog work again + * Tue Jan 11 2011 Matthias Clasen - 2.33.4-1 - Update to 2.33.4 diff --git a/terminal-search.patch b/terminal-search.patch new file mode 100644 index 0000000..57e520e --- /dev/null +++ b/terminal-search.patch @@ -0,0 +1,16 @@ +diff --git a/src/terminal-search-dialog.c b/src/terminal-search-dialog.c +index 81e3317..e299ae9 100644 +--- a/src/terminal-search-dialog.c ++++ b/src/terminal-search-dialog.c +@@ -108,7 +108,11 @@ terminal_search_dialog_new (GtkWindow *parent) + priv->store = store = gtk_list_store_new (1, G_TYPE_STRING); + g_object_set (G_OBJECT (priv->search_entry), + "model", store, ++#if GTK_CHECK_VERSION (2, 91, 0) ++ "entry-text-column", 0, ++#else + "text-column", 0, ++#endif + NULL); + + priv->completion = completion = gtk_entry_completion_new ();