2010-07-11 [iwkse] 3.7.6cvs18

	* src/gtk/quicksearch.c
		Add SMALL_LAYOUT to quicksearch_relayout

diff --git a/ChangeLog b/ChangeLog
index d42680721f9c23434f52787d3559481bdddd8a5b..75645a91aa648568ac2187da74c26bc48da487af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-11 [iwkse]     3.7.6cvs18
+
+       * src/gtk/quicksearch.c
+               Add SMALL_LAYOUT to quicksearch_relayout
+
 2010-07-10 [iwkse]     3.7.6cvs17
 
        * src/mainwindow.h

diff --git a/PATCHSETS b/PATCHSETS
index 0f860e9a4320a524cb13de5baf47d04d399ee11e..7996bbc366d180ed76252847727653fe43114781 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4013,3 +4013,4 @@
 ( cvs diff -u -r 1.39.2.57 -r 1.39.2.58 src/mainwindow.h;  cvs diff -u -r 1.274.2.311 -r 1.274.2.312 src/mainwindow.c;  ) > 3.7.6cvs15.patchset
 ( cvs diff -u -r 1.274.2.312 -r 1.274.2.313 src/mainwindow.c;  cvs diff -u -r 1.1.2.93 -r 1.1.2.94 src/gtk/quicksearch.c;  ) > 3.7.6cvs16.patchset
 ( cvs diff -u -r 1.39.2.58 -r 1.39.2.59 src/mainwindow.h;  ) > 3.7.6cvs17.patchset
+( cvs diff -u -r 1.1.2.94 -r 1.1.2.95 src/gtk/quicksearch.c;  ) > 3.7.6cvs18.patchset

diff --git a/configure.ac b/configure.ac
index c4fd02e35747bd11bd4516b3ab91b8c9ad85d644..85c10afc11ea0186c82c891efce4349be427a587 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index f68408f168a3497ca3ee0b82cba898d1bfac3774..513d0a2c835419e622d0ef18c2406b50d9bbc06a 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -718,7 +718,6 @@ QuickSearch *quicksearch_new()
        gtk_widget_show(search_string_entry);
 
        search_hbox = gtk_hbox_new(FALSE, 5);
-
        clear_search = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
        gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
                           FALSE, FALSE, 0);
@@ -802,6 +801,7 @@ void quicksearch_relayout(QuickSearch *quicksearch)
                quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit"));
                quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("_Clear"));
                break;
+       case SMALL_LAYOUT:
        case VERTICAL_LAYOUT:
                quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, "");
                quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, "");