2006-04-07 [wwp] 2.1.0cvs15

	* src/summary_search.c
	* .cvsignore
		Bugfix: stop button was sticky when searching in an empty folder.
		Applied curly brackets code style to the whole file (summary_search.c).
		More files to ignore.

diff --git a/.cvsignore b/.cvsignore
index a794d13d4f6a087864c52a0fa904e56f6a25d187..db06074fc4c23a4a43555781f9164221ca2391ef 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -22,3 +22,4 @@ TAGS
 depcomp
 sylpheed-claws.pc
 patches
 depcomp
 sylpheed-claws.pc
 patches

+commitHelper.tmp

diff --git a/ChangeLog b/ChangeLog
index b7257249ab7daaebdbc71a2af760a00204271834..3056cee73fe54930b7c84eb3ddd15ec952c693ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-07 [wwp]       2.1.0cvs15
+
+       * src/summary_search.c
+       * .cvsignore
+               Bugfix: stop button was sticky when searching in an empty folder.
+               Applied curly brackets code style to the whole file (summary_search.c).
+               More files to ignore.
+

 2006-04-07 [wwp]       2.1.0cvs14
 
        * src/message_search.c
 2006-04-07 [wwp]       2.1.0cvs14
 
        * src/message_search.c

diff --git a/PATCHSETS b/PATCHSETS
index c49325d7cde4cd87d962db4864f311ef3d6f4174..bd4a4675c5ec777d1fa23d0f2cc8bb5a4d732f58 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1386,3 +1386,4 @@
 ( cvs diff -u -r 1.15.2.26 -r 1.15.2.27 src/summary_search.c;  ) > 2.1.0cvs12.patchset
 ( cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/plugins/dillo_viewer/dillo_prefs.c;  ) > 2.1.0cvs13.patchset
 ( cvs diff -u -r 1.3.12.14 -r 1.3.12.15 src/message_search.c;  cvs diff -u -r 1.15.2.27 -r 1.15.2.28 src/summary_search.c;  ) > 2.1.0cvs14.patchset
 ( cvs diff -u -r 1.15.2.26 -r 1.15.2.27 src/summary_search.c;  ) > 2.1.0cvs12.patchset
 ( cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/plugins/dillo_viewer/dillo_prefs.c;  ) > 2.1.0cvs13.patchset
 ( cvs diff -u -r 1.3.12.14 -r 1.3.12.15 src/message_search.c;  cvs diff -u -r 1.15.2.27 -r 1.15.2.28 src/summary_search.c;  ) > 2.1.0cvs14.patchset

+( cvs diff -u -r 1.15.2.28 -r 1.15.2.29 src/summary_search.c;  cvs diff -u -r 1.8.2.2 -r 1.8.2.3 .cvsignore;  ) > 2.1.0cvs15.patchset

diff --git a/configure.ac b/configure.ac
index 2ad225d5a35a91705d30e332b19087946227223a..dbfe416cb60d0a1ece8060cc01b9cfbcf334fc16 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=14
+EXTRA_VERSION=15

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summary_search.c b/src/summary_search.c
index ef8dad3b92b45d841ff0f86a5689e24c9e149d07..0803f7ce1c3a8add2d21b7e9ab1e7f18bfb5ae6f 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -118,10 +118,11 @@ static gboolean key_pressed               (GtkWidget      *widget,
 
 void summary_search(SummaryView *summaryview)
 {
 
 void summary_search(SummaryView *summaryview)
 {

-       if (!search_window.window)
+       if (!search_window.window) {

                summary_search_create();
                summary_search_create();

-       else
+       } else {

                gtk_widget_hide(search_window.window);
                gtk_widget_hide(search_window.window);

+       }

 
        search_window.summaryview = summaryview;
 
 
        search_window.summaryview = summaryview;
 


@@ -395,7 +396,9 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
        const gchar *body_str = NULL, *adv_condition = NULL;
        StrFindFunc str_find_func = NULL;
 
        const gchar *body_str = NULL, *adv_condition = NULL;
        StrFindFunc str_find_func = NULL;
 

-       if (summary_is_locked(summaryview)) return;
+       if (summary_is_locked(summaryview)) {
+               return;
+       }

        summary_lock(summaryview);
 
        adv_search = gtk_toggle_button_get_active
        summary_lock(summaryview);
 
        adv_search = gtk_toggle_button_get_active


@@ -423,10 +426,11 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                case_sens = gtk_toggle_button_get_active
                        (GTK_TOGGLE_BUTTON(search_window.case_checkbtn));
 
                case_sens = gtk_toggle_button_get_active
                        (GTK_TOGGLE_BUTTON(search_window.case_checkbtn));
 

-               if (case_sens)
+               if (case_sens) {

                        str_find_func = str_find;
                        str_find_func = str_find;

-               else
+               } else {

                        str_find_func = str_case_find;
                        str_find_func = str_case_find;

+               }

 
                from_str    = gtk_entry_get_text(GTK_ENTRY(search_window.from_entry));
                to_str      = gtk_entry_get_text(GTK_ENTRY(search_window.to_entry));
 
                from_str    = gtk_entry_get_text(GTK_ENTRY(search_window.from_entry));
                to_str      = gtk_entry_get_text(GTK_ENTRY(search_window.to_entry));


@@ -455,24 +459,28 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
                backward = FALSE;
        } else if (!summaryview->selected) {
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
                backward = FALSE;
        } else if (!summaryview->selected) {

-               if (backward)
+               if (backward) {

                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);

-               else
+               } else {

                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);

+               }

 
                if (!node) {
                        search_window.is_searching = FALSE;
 
                if (!node) {
                        search_window.is_searching = FALSE;

+                       gtk_widget_hide(search_window.stop_btn);
+                       gtk_widget_show(search_window.close_btn);

                        main_window_cursor_normal(summaryview->mainwin);
                        summary_unlock(summaryview);
                        return;
                }
        } else {
                        main_window_cursor_normal(summaryview->mainwin);
                        summary_unlock(summaryview);
                        return;
                }
        } else {

-               if (backward)
+               if (backward) {

                        node = gtkut_ctree_node_prev
                                (ctree, summaryview->selected);
                        node = gtkut_ctree_node_prev
                                (ctree, summaryview->selected);

-               else
+               } else {

                        node = gtkut_ctree_node_next
                                (ctree, summaryview->selected);
                        node = gtkut_ctree_node_next
                                (ctree, summaryview->selected);

+               }

        }
 
        for (; search_window.is_searching;) {
        }
 
        for (; search_window.is_searching;) {


@@ -500,18 +508,20 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                        val = alertpanel(_("Search finished"), str,
                                         GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
                        if (G_ALERTALTERNATE == val) {
                        val = alertpanel(_("Search finished"), str,
                                         GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
                        if (G_ALERTALTERNATE == val) {

-                               if (backward)
+                               if (backward) {

                                        node = GTK_CTREE_NODE
                                                (GTK_CLIST(ctree)->row_list_end);
                                        node = GTK_CTREE_NODE
                                                (GTK_CLIST(ctree)->row_list_end);

-                               else
+                               } else {

                                        node = GTK_CTREE_NODE
                                                (GTK_CLIST(ctree)->row_list);
                                        node = GTK_CTREE_NODE
                                                (GTK_CLIST(ctree)->row_list);

+                               }

 
                                all_searched = TRUE;
 
                                manage_window_focus_in(search_window.window, NULL, NULL);
 
                                all_searched = TRUE;
 
                                manage_window_focus_in(search_window.window, NULL, NULL);

-                       } else
+                       } else {

                                break;
                                break;

+                       }

                }
 
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
                }
 
                msginfo = gtk_ctree_node_get_row_data(ctree, node);


@@ -524,42 +534,50 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                                matched = TRUE;
                                if (*from_str) {
                                        if (!msginfo->from ||
                                matched = TRUE;
                                if (*from_str) {
                                        if (!msginfo->from ||

-                                       !str_find_func(msginfo->from, from_str))
+                                       !str_find_func(msginfo->from, from_str)) {

                                                matched = FALSE;
                                                matched = FALSE;

+                                       }

                                }
                                if (matched && *to_str) {
                                        if (!msginfo->to ||
                                }
                                if (matched && *to_str) {
                                        if (!msginfo->to ||

-                                       !str_find_func(msginfo->to, to_str))
+                                       !str_find_func(msginfo->to, to_str)) {

                                                matched = FALSE;
                                                matched = FALSE;

+                                       }

                                }
                                if (matched && *subject_str) {
                                        if (!msginfo->subject ||
                                }
                                if (matched && *subject_str) {
                                        if (!msginfo->subject ||

-                                       !str_find_func(msginfo->subject, subject_str))
+                                       !str_find_func(msginfo->subject, subject_str)) {

                                                matched = FALSE;
                                                matched = FALSE;

+                                       }

                                }
                                if (matched && *body_str) {
                                        if (procmime_find_string(msginfo, body_str,
                                }
                                if (matched && *body_str) {
                                        if (procmime_find_string(msginfo, body_str,

-                                                                str_find_func))
+                                                                str_find_func)) {

                                                body_matched = TRUE;
                                                body_matched = TRUE;

-                                       else
+                                       } else {

                                                matched = FALSE;
                                                matched = FALSE;

+                                       }

                                }
                                if (matched && !*from_str && !*to_str &&
                                }
                                if (matched && !*from_str && !*to_str &&

-                               !*subject_str && !*body_str)
+                               !*subject_str && !*body_str) {

                                        matched = FALSE;
                                        matched = FALSE;

+                               }

                        } else {
                                matched = FALSE;
                                if (*from_str && msginfo->from) {
                        } else {
                                matched = FALSE;
                                if (*from_str && msginfo->from) {

-                                       if (str_find_func(msginfo->from, from_str))
+                                       if (str_find_func(msginfo->from, from_str)) {

                                                matched = TRUE;
                                                matched = TRUE;

+                                       }

                                }
                                if (!matched && *to_str && msginfo->to) {
                                }
                                if (!matched && *to_str && msginfo->to) {

-                                       if (str_find_func(msginfo->to, to_str))
+                                       if (str_find_func(msginfo->to, to_str)) {

                                                matched = TRUE;
                                                matched = TRUE;

+                                       }

                                }
                                if (!matched && *subject_str && msginfo->subject) {
                                }
                                if (!matched && *subject_str && msginfo->subject) {

-                                       if (str_find_func(msginfo->subject, subject_str))
+                                       if (str_find_func(msginfo->subject, subject_str)) {

                                                matched = TRUE;
                                                matched = TRUE;

+                                       }

                                }
                                if (!matched && *body_str) {
                                        if (procmime_find_string(msginfo, body_str,
                                }
                                if (!matched && *body_str) {
                                        if (procmime_find_string(msginfo, body_str,


@@ -572,9 +590,9 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                }
 
                if (matched) {
                }
 
                if (matched) {

-                       if (search_all)
+                       if (search_all) {

                                gtk_ctree_select(ctree, node);
                                gtk_ctree_select(ctree, node);

-                       else {
+                       } else {

                                if (messageview_is_visible
                                        (summaryview->messageview)) {
                                        summary_unlock(summaryview);
                                if (messageview_is_visible
                                        (summaryview->messageview)) {
                                        summary_unlock(summaryview);


@@ -654,8 +672,9 @@ static void adv_condition_btn_done(MatcherList * matchers)
        g_return_if_fail(
                        mainwindow_get_mainwindow()->summaryview->quicksearch != NULL);
 
        g_return_if_fail(
                        mainwindow_get_mainwindow()->summaryview->quicksearch != NULL);
 

-       if (matchers == NULL)
+       if (matchers == NULL) {

                return;
                return;

+       }

 
        str = matcherlist_to_string(matchers);
 
 
        str = matcherlist_to_string(matchers);
 


@@ -688,8 +707,9 @@ static void adv_condition_btn_clicked(GtkButton *button, gpointer data)
 
        prefs_matcher_open(matchers, adv_condition_btn_done);
 
 
        prefs_matcher_open(matchers, adv_condition_btn_done);
 

-       if (matchers != NULL)
+       if (matchers != NULL) {

                matcherlist_free(matchers);
                matcherlist_free(matchers);

+       }

 };
 
 static void from_activated(void)
 };
 
 static void from_activated(void)