anjuta r4496 - in trunk: . plugins/search plugins/sourceview

[jhs svn gnome org]

Author: jhs
Date: Sun Dec 28 09:57:13 2008
New Revision: 4496
URL: http://svn.gnome.org/viewvc/anjuta?rev=4496&view=rev

Log:
2008-12-28  Adam Dingle  <adam medovina org>
 
 	* plugins/search/search-replace_backend.c (search_entry_compare),
 	(create_search_entries):
 	Fixed #565014 â sort Find in Files output by filename 

Modified:
   trunk/ChangeLog
   trunk/plugins/search/search-replace_backend.c
   trunk/plugins/sourceview/anjuta-view.c

Modified: trunk/plugins/search/search-replace_backend.c
==============================================================================
--- trunk/plugins/search/search-replace_backend.c	(original)
+++ trunk/plugins/search/search-replace_backend.c	Sun Dec 28 09:57:13 2008
@@ -666,6 +666,13 @@
 		get_next_utf8_match(fb, direction, s);
 }
 
+static gint search_entry_compare(gconstpointer a, gconstpointer b)
+{
+	gchar* a_path = ((SearchEntry *) a)->path;
+	gchar* b_path = ((SearchEntry *) b)->path;
+	return strcmp(a_path, b_path);
+}
+
 /* Create list of search entries */
 GList *
 create_search_entries (Search *s)
@@ -811,7 +818,7 @@
 				entries = g_list_prepend(entries, se);
 			}
 			}
-			entries = g_list_reverse(entries);
+			entries = g_list_sort(entries, search_entry_compare);
 			g_list_free (editors);
 			break;
 		case SR_FILES:
@@ -851,7 +858,7 @@
 					entries = g_list_prepend(entries, se);
 				}
 				g_list_free(files);
-				entries = g_list_reverse(entries);
+				entries = g_list_sort(entries, search_entry_compare);
 			}
 			g_free(dir);
 			g_free(dir_uri);

Modified: trunk/plugins/sourceview/anjuta-view.c
==============================================================================
--- trunk/plugins/sourceview/anjuta-view.c	(original)
+++ trunk/plugins/sourceview/anjuta-view.c	Sun Dec 28 09:57:13 2008
@@ -162,7 +162,6 @@
 anjuta_view_class_init (AnjutaViewClass *klass)
 {
 	GObjectClass     *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass   *gtkobject_class = GTK_OBJECT_CLASS (klass);
 	GtkTextViewClass *textview_class = GTK_TEXT_VIEW_CLASS (klass);
 	GtkWidgetClass   *widget_class = GTK_WIDGET_CLASS (klass);
 	GtkBindingSet    *binding_set;
@@ -317,8 +316,9 @@
 	AnjutaView *view;
 
 	view = ANJUTA_VIEW (object);
-
-	g_source_remove (view->priv->scroll_idle);
+	
+	if (view->priv->scroll_idle > 0)
+				g_source_remove (view->priv->scroll_idle);
 		
 	(* G_OBJECT_CLASS (anjuta_view_parent_class)->dispose) (object);
 }