2005-08-23 [paul] 1.9.13cvs52

	* src/addressbook.c
		fix issues with the Search field
		Patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 158bec45b167c1f364a4e2e1f3239991633c53ac..5243c0203c45ac0ad89ab39388d665083f9cf89b 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-08-23 [paul]      1.9.13cvs52
+
+       * src/addressbook.c
+               fix issues with the Search field
+               Patch by Colin
+

 2005-08-22 [paul]      1.9.13cvs51
 
        * src/folderview.c
 2005-08-22 [paul]      1.9.13cvs51
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index c59d02f2f8858e980718e7156e04477e099eb0ca..76eeb381ef7d71e37e0075775684d3c00071ca6b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -737,3 +737,4 @@
 ( cvs diff -u -r 1.150.2.39 -r 1.150.2.40 src/procmsg.c;  ) > 1.9.13cvs49.patchset
 ( cvs diff -u -r 1.60.2.6 -r 1.60.2.7 src/filtering.c;  cvs diff -u -r 1.21.2.1 -r 1.21.2.2 src/filtering.h;  cvs diff -u -r 1.75.2.8 -r 1.75.2.9 src/matcher.c;  cvs diff -u -r 1.16.2.3 -r 1.16.2.4 src/matcher_parser_lex.l;  cvs diff -u -r 1.25.2.8 -r 1.25.2.9 src/matcher_parser_parse.y;  cvs diff -u -r 1.59.2.22 -r 1.59.2.23 src/prefs_filtering.c;  ) > 1.9.13cvs50.patchset
 ( cvs diff -u -r 1.207.2.57 -r 1.207.2.58 src/folderview.c;  cvs diff -u -r 1.52.2.11 -r 1.52.2.12 src/prefs_folder_item.c;  ) > 1.9.13cvs51.patchset
 ( cvs diff -u -r 1.150.2.39 -r 1.150.2.40 src/procmsg.c;  ) > 1.9.13cvs49.patchset
 ( cvs diff -u -r 1.60.2.6 -r 1.60.2.7 src/filtering.c;  cvs diff -u -r 1.21.2.1 -r 1.21.2.2 src/filtering.h;  cvs diff -u -r 1.75.2.8 -r 1.75.2.9 src/matcher.c;  cvs diff -u -r 1.16.2.3 -r 1.16.2.4 src/matcher_parser_lex.l;  cvs diff -u -r 1.25.2.8 -r 1.25.2.9 src/matcher_parser_parse.y;  cvs diff -u -r 1.59.2.22 -r 1.59.2.23 src/prefs_filtering.c;  ) > 1.9.13cvs50.patchset
 ( cvs diff -u -r 1.207.2.57 -r 1.207.2.58 src/folderview.c;  cvs diff -u -r 1.52.2.11 -r 1.52.2.12 src/prefs_folder_item.c;  ) > 1.9.13cvs51.patchset

+( cvs diff -u -r 1.60.2.26 -r 1.60.2.27 src/addressbook.c;  ) > 1.9.13cvs52.patchset

diff --git a/configure.ac b/configure.ac
index 78ef98f57a259c74ff53b75472d1364a997a9fdf..c7a07275c52bdbfe12788628b52b92412ada758b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=51
+EXTRA_VERSION=52

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressbook.c b/src/addressbook.c
index da8dbf2cdfbbcbd3d5669a0efaa19e422110b4ad..592bd2555b120466c10c269ef6cfcf8fa8da5a4c 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -196,7 +196,6 @@ static void addressbook_person_expand_node  (GtkCTree       *ctree,
 static void addressbook_person_collapse_node   (GtkCTree       *ctree,
                                                 GList          *node,
                                                 gpointer       *data );
 static void addressbook_person_collapse_node   (GtkCTree       *ctree,
                                                 GList          *node,
                                                 gpointer       *data );

-static void addressbook_entry_gotfocus         (GtkWidget      *widget);

 
 #if 0
 static void addressbook_entry_changed          (GtkWidget      *widget);
 
 #if 0
 static void addressbook_entry_changed          (GtkWidget      *widget);


@@ -298,7 +297,7 @@ static void addressbook_move_nodes_up               (GtkCTree       *ctree,
                                                GtkCTreeNode    *node);
 static GtkCTreeNode *addressbook_find_group_node (GtkCTreeNode *parent,
                                                   ItemGroup    *group);
                                                GtkCTreeNode    *node);
 static GtkCTreeNode *addressbook_find_group_node (GtkCTreeNode *parent,
                                                   ItemGroup    *group);

-static gboolean key_pressed                    (GtkWidget      *widget,
+static gboolean addressbook_entry_key_pressed  (GtkWidget      *widget,

                                                 GdkEventKey    *event,
                                                 gpointer        data);
 static gint addressbook_treenode_compare_func  (GtkCList       *clist,
                                                 GdkEventKey    *event,
                                                 gpointer        data);
 static gint addressbook_treenode_compare_func  (GtkCList       *clist,


@@ -653,6 +652,15 @@ void addressbook_refresh( void )
        addressbook_export_to_file();
 }
 
        addressbook_export_to_file();
 }
 

+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+       if (event && event->keyval == GDK_Escape)
+               addressbook_close();
+       else if (event && event->keyval == GDK_Delete)
+               addressbook_del_clicked(NULL, NULL);
+       return FALSE;
+}
+

 /*
 * Create the address book widgets. The address book contains two CTree widgets: the
 * address index tree on the left and the address list on the right.
 /*
 * Create the address book widgets. The address book contains two CTree widgets: the
 * address index tree on the left and the address list on the right.


@@ -837,9 +845,10 @@ static void addressbook_create(void)
        gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 
        address_completion_register_entry(GTK_ENTRY(entry));
        gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 
        address_completion_register_entry(GTK_ENTRY(entry));

-       g_signal_connect(G_OBJECT(entry), "focus_in_event",
-                        G_CALLBACK(addressbook_entry_gotfocus), NULL);

 
 

+       g_signal_connect(G_OBJECT(entry), "key_press_event",
+                        G_CALLBACK(addressbook_entry_key_pressed),
+                        NULL);

 #if 0
        g_signal_connect(G_OBJECT(entry), "changed",
                         G_CALLBACK(addressbook_entry_changed), NULL);
 #if 0
        g_signal_connect(G_OBJECT(entry), "changed",
                         G_CALLBACK(addressbook_entry_changed), NULL);


@@ -1989,10 +1998,6 @@ static void addressbook_list_row_unselected( GtkCTree *ctree,
        }
 }
 
        }
 }
 

-static void addressbook_entry_gotfocus( GtkWidget *widget ) {
-       gtk_editable_select_region( GTK_EDITABLE(addrbook.entry), 0, -1 );
-}
-

 /* from gdkevents.c */
 #define DOUBLE_CLICK_TIME 250
 
 /* from gdkevents.c */
 #define DOUBLE_CLICK_TIME 250
 


@@ -3528,12 +3533,10 @@ void addressbook_export_to_file( void ) {
        }
 }
 
        }
 }
 

-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)

 {
 {

-       if (event && event->keyval == GDK_Escape)
-               addressbook_close();
-       else if (event && event->keyval == GDK_Delete)
-               addressbook_del_clicked(NULL, NULL);
+       if (event && event->keyval == GDK_Return)
+               addressbook_lup_clicked(NULL, NULL);

        return FALSE;
 }
 
        return FALSE;
 }