gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2006-12-14 [wwp] 2.6.1cvs32

Browse source 
* src/mainwindow.c
	* src/summaryview.c
	* src/summaryview.h
	* src/gtk/quicksearch.c
		fix quicksearch 'magnify' button status when QS is closed
		using the Escape key, thanks to Colin.
This commit is contained in:
Tristan Chabredier 2006-12-14 08:38:09 +00:00
parent 8927ed5e52
commit 71814851ef
7 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ChangeLog
View file

@ -1,3 +1,21 @@
2006-12-14 [wwp] 2.6.1cvs32
* src/mainwindow.c
* src/summaryview.c
* src/summaryview.h
* src/gtk/quicksearch.c
fix quicksearch 'magnify' button status when QS is closed
using the Escape key, thanks to Colin.
2006-12-14 [wwp] 2.6.1cvs31
* src/mainwindow.c
* src/summaryview.c
* src/summaryview.h
* src/gtk/quicksearch.c
fix quicksearch 'magnify' button status when QS is closed
using the Escape key, thanks to Colin.
2006-12-13 [colin] 2.6.1cvs30
* src/ldapquery.c

2
PATCHSETS
View file

@ -2138,3 +2138,5 @@
( cvs diff -u -r 1.115.2.118 -r 1.115.2.119 src/main.c; ) > 2.6.1cvs28.patchset
( cvs diff -u -r 1.60.2.39 -r 1.60.2.40 po/es.po; ) > 2.6.1cvs29.patchset
( cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/ldapquery.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/ldaputil.c; cvs diff -u -r -1.16.2.5 -r -1.16.2.6 src/syldap.c; cvs diff -u -r -1.9.2.3 -r -1.9.2.4 src/syldap.h; ) > 2.6.1cvs30.patchset
( cvs diff -u -r 1.274.2.157 -r 1.274.2.158 src/mainwindow.c; cvs diff -u -r 1.395.2.270 -r 1.395.2.271 src/summaryview.c; cvs diff -u -r 1.68.2.29 -r 1.68.2.30 src/summaryview.h; cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/gtk/quicksearch.c; ) > 2.6.1cvs31.patchset
( cvs diff -u -r 1.274.2.157 -r 1.274.2.158 src/mainwindow.c; cvs diff -u -r 1.395.2.270 -r 1.395.2.271 src/summaryview.c; cvs diff -u -r 1.68.2.29 -r 1.68.2.30 src/summaryview.h; cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/gtk/quicksearch.c; ) > 2.6.1cvs32.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=30
EXTRA_VERSION=32
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

4
src/gtk/quicksearch.c
View file

@ -220,7 +220,9 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
/* If the string entry is empty -> hide quicksearch bar. If not -> empty it */
if (!*str) {
quicksearch_hide(quicksearch);
summaryview_activate_quicksearch(
mainwindow_get_mainwindow()->summaryview,
FALSE);
} else {
quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
gtk_widget_grab_focus(

3
src/mainwindow.c
View file

@ -3143,8 +3143,7 @@ static void search_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
static void mainwindow_quicksearch(MainWindow *mainwin, guint action, GtkWidget *widget)
{
prefs_common.show_searchbar = TRUE;
summaryview_activate_quicksearch(mainwin->summaryview);
summaryview_activate_quicksearch(mainwin->summaryview, TRUE);
}
static void toggle_folder_cb(MainWindow *mainwin, guint action,

11
src/summaryview.c
View file

@ -5407,12 +5407,17 @@ static void tog_searchbar_cb(GtkWidget *w, gpointer data)
}
}
void summaryview_activate_quicksearch(SummaryView *summaryview)
void summaryview_activate_quicksearch(SummaryView *summaryview, gboolean show)
{
prefs_common.show_searchbar = show;
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(summaryview->toggle_search),
TRUE);
quicksearch_show(summaryview->quicksearch);
show);
if (show) {
quicksearch_show(summaryview->quicksearch);
} else {
quicksearch_hide(summaryview->quicksearch);
}
}
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)

2
src/summaryview.h
View file

@ -299,6 +299,6 @@ gint summaryview_export_mbox_list (SummaryView *summaryview);
void summaryview_lock(SummaryView *summaryview, FolderItem *item);
void summaryview_unlock(SummaryView *summaryview, FolderItem *item);
void summary_reflect_prefs(void);
void summaryview_activate_quicksearch(SummaryView *summaryview);
void summaryview_activate_quicksearch(SummaryView *summaryview, gboolean show);
void summary_set_menu_sensitive (SummaryView *summaryview);
#endif /* __SUMMARY_H__ */