From 17c44c20808a93220b4d32242e53a3a9ba7ec326 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 23 Aug 2009 01:33:51 +0000 Subject: [PATCH] Respect button-images setting --- button-images.patch | 474 ++------------------------------------------ gedit.spec | 9 +- 2 files changed, 30 insertions(+), 453 deletions(-) diff --git a/button-images.patch b/button-images.patch index 68b0f0f..1fad67f 100644 --- a/button-images.patch +++ b/button-images.patch @@ -1,23 +1,23 @@ -diff -up gedit-2.27.2/plugins/sort/sort.ui.button-images gedit-2.27.2/plugins/sort/sort.ui ---- gedit-2.27.2/plugins/sort/sort.ui.button-images 2009-07-16 13:54:14.208338015 -0400 -+++ gedit-2.27.2/plugins/sort/sort.ui 2009-07-16 13:56:25.653333726 -0400 -@@ -9,6 +9,10 @@ - 0 - 1 - -+ -+ gtk-sort-ascending +diff -up gedit-2.27.4/plugins/docinfo/docinfo.ui.button-images gedit-2.27.4/plugins/docinfo/docinfo.ui +--- gedit-2.27.4/plugins/docinfo/docinfo.ui.button-images 2009-08-22 21:24:45.878430797 -0400 ++++ gedit-2.27.4/plugins/docinfo/docinfo.ui 2009-08-22 21:26:27.996679948 -0400 +@@ -1,6 +1,10 @@ + + + ++ ++ gtk-refresh + 4 + - - Sort - GTK_WINDOW_TOPLEVEL -@@ -50,66 +54,9 @@ + + 5 + Document Statistics +@@ -44,66 +48,9 @@ True GTK_RELIEF_NORMAL True - -- +- - True - 0.5 - 0.5 @@ -28,14 +28,14 @@ diff -up gedit-2.27.2/plugins/sort/sort.ui.button-images gedit-2.27.2/plugins/so - 0 - 0 - -- +- - True - False - 2 - -- +- - True -- gtk-sort-ascending +- gtk-refresh - 4 - 0.5 - 0.5 @@ -49,9 +49,9 @@ diff -up gedit-2.27.2/plugins/sort/sort.ui.button-images gedit-2.27.2/plugins/so - - - -- +- - True -- _Sort +- _Update - True - False - GTK_JUSTIFY_LEFT @@ -76,439 +76,9 @@ diff -up gedit-2.27.2/plugins/sort/sort.ui.button-images gedit-2.27.2/plugins/so - - - -+ sort_image -+ _Sort ++ update_image ++ _Update + True - -diff -up gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c.button-images gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c ---- gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c.button-images 2009-07-16 13:51:51.765583774 -0400 -+++ gedit-2.27.2/plugins/spell/gedit-spell-checker-dialog.c 2009-07-16 13:48:42.535583423 -0400 -@@ -223,12 +223,18 @@ create_dialog (GeditSpellCheckerDialog * - GtkTreeViewColumn *column; - GtkCellRenderer *cell; - GtkTreeSelection *selection; -- gboolean ret; -- gchar *ui_file; - gchar *root_objects[] = { - "content", -+ "check_word_image", -+ "add_word_image", -+ "ignore_image", -+ "change_image", -+ "ignore_all_image", -+ "change_all_image", - NULL - }; -+ gboolean ret; -+ gchar *ui_file; - - g_return_if_fail (dlg != NULL); - -diff -up gedit-2.27.2/plugins/spell/spell-checker.ui.button-images gedit-2.27.2/plugins/spell/spell-checker.ui ---- gedit-2.27.2/plugins/spell/spell-checker.ui.button-images 2009-07-16 13:08:59.501579700 -0400 -+++ gedit-2.27.2/plugins/spell/spell-checker.ui 2009-07-16 13:48:08.324355869 -0400 -@@ -1,6 +1,30 @@ - - - -+ -+ gtk-spell-check -+ 4 -+ -+ -+ gtk-add -+ 4 -+ -+ -+ gtk-go-down -+ 4 -+ -+ -+ gtk-convert -+ 4 -+ -+ -+ gtk-goto-bottom -+ 4 -+ -+ -+ gtk-convert -+ 4 -+ - - True - Check spelling -@@ -121,58 +145,9 @@ - True - True - GTK_RELIEF_NORMAL -- -- -- True -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- True -- False -- 2 -- -- -- True -- gtk-spell-check -- 4 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- True -- Check _Word -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- -+ check_word_image -+ Check _Word -+ True - - - 0 -@@ -272,58 +247,9 @@ - True - True - GTK_RELIEF_NORMAL -- -- -- True -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- True -- False -- 2 -- -- -- True -- gtk-go-down -- 4 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- True -- _Ignore -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- -+ ignore_image -+ _Ignore -+ True - - - 0 -@@ -338,58 +264,9 @@ - True - True - GTK_RELIEF_NORMAL -- -- -- True -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- True -- False -- 2 -- -- -- True -- gtk-convert -- 4 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- True -- Cha_nge -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- -+ change_image -+ Cha_nge -+ True - - - 0 -@@ -404,58 +281,9 @@ - True - True - GTK_RELIEF_NORMAL -- -- -- True -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- True -- False -- 2 -- -- -- True -- gtk-goto-bottom -- 4 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- True -- Ignore _All -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- -+ ignore_all_image -+ Ignore _All -+ True - - - 1 -@@ -470,58 +298,9 @@ - True - True - GTK_RELIEF_NORMAL -- -- -- True -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- True -- False -- 2 -- -- -- True -- gtk-convert -- 4 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- True -- Change A_ll -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- -+ change_all_image -+ Change A_ll -+ True - - - 1 -@@ -573,58 +352,9 @@ - True - True - GTK_RELIEF_NORMAL -- -- -- True -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- True -- False -- 2 -- -- -- True -- gtk-add -- 4 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- True -- Add w_ord -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- -+ add_word_image -+ Add w_ord -+ True - - - 0 + diff --git a/gedit.spec b/gedit.spec index 6963e07..f510722 100644 --- a/gedit.spec +++ b/gedit.spec @@ -18,7 +18,7 @@ Summary: Text editor for the GNOME desktop Name: gedit Version: 2.27.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: Applications/Editors @@ -48,6 +48,9 @@ Patch2: gedit-2.25.5-fix-python-path.patch # http://bugzilla.gnome.org/show_bug.cgi?id=587053 Patch3: print-to-file.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=592766 +Patch4: button-images.patch + BuildRequires: gnome-common BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -114,6 +117,7 @@ Install gedit-devel if you want to write plugins for gedit. %patch2 -p1 -b .fix-python-path %patch3 -p1 -b .print-to-file +%patch4 -p1 -b .button-images %build autoreconf -f -i @@ -229,6 +233,9 @@ fi %changelog +* Sat Aug 22 2009 Matthias Clasen - 1:2.27.4-2 +- Respect button-images setting + * Tue Aug 11 2009 Matthias Clasen - 1:2.27.4-1 - Update to 2.27.4