Oops, added back one line, swallowed by 3.12.0-36, fixing address completion

[claws.git] / src / addr_compl.c

diff --git a/src/addr_compl.c b/src/addr_compl.c
index b35a8bd9a4c8b7d723a870b7013640b99c0edcef..ad1840b5e1d11d6b80d0d71c9ac7a76e70a55060 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -183,7 +183,7 @@ static gint addr_completion_func(const gchar *needle, const gchar *haystack,
  */
 static gint weight_addr_match(const address_entry* addr)
 {
-       gint    n_weight = strlen(addr->name);
+       gint    n_weight = addr->name ? strlen(addr->name): 0;
        gint    a_weight = addr->address ? strlen(addr->address) : n_weight;
        gchar*  match = NULL;
 
@@ -191,7 +191,7 @@ static gint weight_addr_match(const address_entry* addr)
        if (match != NULL) {
                if (match == addr->name)
                        n_weight = -4;
-               else if (*(match - 1) == ' ')
+               else if (match > addr->name && *(match - 1) == ' ')
                        n_weight = -3;
                else
                        n_weight = match - addr->name;
@@ -205,7 +205,8 @@ static gint weight_addr_match(const address_entry* addr)
                        else
                                a_weight = match - addr->address;
 
-                       if (*(match + strlen(g_completion_prefix)) == '@')
+                       if (strlen(match) > strlen(g_completion_prefix)
+                        && *(match + strlen(g_completion_prefix)) == '@')
                                a_weight--;
                }
        }
@@ -213,7 +214,7 @@ static gint weight_addr_match(const address_entry* addr)
        if (n_weight == -4 && a_weight < 0)
                n_weight = -5;
 
-       return a_weight < n_weight ? a_weight : n_weight;
+       return MIN(a_weight, n_weight);
 }
 
 static gint addr_comparison_func(gconstpointer a, gconstpointer b)
@@ -229,8 +230,8 @@ static gint addr_comparison_func(gconstpointer a, gconstpointer b)
        else if (a_weight > b_weight)
                return 1;
        else {
-           cmp = strcmp(a_ref->name, b_ref->name);
-           return cmp ? cmp :  strcmp(a_ref->address, b_ref->address);
+               cmp = strcmp(a_ref->name, b_ref->name);
+               return cmp ? cmp : g_strcmp0(a_ref->address, b_ref->address);
        }
 }
 
@@ -949,14 +950,7 @@ static void addrcompl_resize_window( CompletionWindow *cw ) {
        gdk_window_get_geometry( gtk_widget_get_window( cw->window ), &x, &y, &width, &height );
 #endif
 
-       /* simple _hide breaks size requisition !? */
-#if !GTK_CHECK_VERSION(3, 0, 0)
-       gtk_widget_hide_all( cw->window );
-       gtk_widget_show_all( cw->window );
-#else
-       gtk_widget_hide( cw->window );
-       gtk_widget_show( cw->window );
-#endif
+       gtk_widget_queue_resize_no_redraw(cw->list_view);
        gtk_widget_size_request( cw->list_view, &r );
 
        /* Adjust window height to available screen space */
@@ -1594,7 +1588,7 @@ static gboolean completion_window_key_press(GtkWidget *widget,
                        (GTK_TREE_VIEW(list_view),
                         event->keyval == GDK_KEY_Down ||
                         event->keyval == GDK_KEY_Page_Down ? TRUE : FALSE);
-               return FALSE;
+               return TRUE;
        }               
 
        /* make tab move to next field */