gnome-utils r8506 - in trunk: . gsearchtool

[dcransto svn gnome org]

Author: dcransto
Date: Tue Mar 17 02:11:57 2009
New Revision: 8506
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8506&view=rev

Log:
2009-03-16  Dennis Cranston <dennis_cranston yahoo com>

        * configure.ac: remove the gnome-vfs requirement



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gsearchtool/gsearchtool-spinner.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 17 02:11:57 2009
@@ -80,7 +80,6 @@
 LIBGNOME_REQUIRED=2.13.2
 LIBGNOMEUI_REQUIRED=2.13.7
 LIBGLADE_REQUIRED=2.3.0
-GNOMEVFS_REQUIRED=2.8.4
 LIBPANEL_APPLET_REQUIRED=2.13.4
 LIBGTOP_REQUIRED=2.12.0
 
@@ -181,15 +180,6 @@
 AC_SUBST(HAL_LIBS)
 
 dnl *********************************************
-dnl gnome-vfs/mime-data is need for gsearchtool
-dnl *********************************************
-
-PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED dnl
-                            gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED)
-AC_SUBST(GNOMEVFS_CFLAGS)
-AC_SUBST(GNOMEVFS_LIBS)
-
-dnl *********************************************
 dnl gnome-desktop is need for gsearchtool
 dnl *********************************************
 

Modified: trunk/gsearchtool/gsearchtool-spinner.c
==============================================================================
--- trunk/gsearchtool/gsearchtool-spinner.c	(original)
+++ trunk/gsearchtool/gsearchtool-spinner.c	Tue Mar 17 02:11:57 2009
@@ -194,7 +194,7 @@
 
 	/* Load the animation */
 	icon_info = gtk_icon_theme_lookup_icon (data->icon_theme,
-						"gnome-searchtool-animation", -1, 0);
+						"process-working", -1, 0);
 	if (icon_info == NULL)
 	{
 		g_warning ("Throbber animation not found\n");
@@ -245,37 +245,23 @@
 	images->images = g_list_reverse (images->images);
 
 	gtk_icon_info_free (icon_info);
-	g_object_unref (icon_pixbuf);
-
-	/* Load the rest icon */
-	icon_info = gtk_icon_theme_lookup_icon (data->icon_theme,
-						"gnome-searchtool-animation-rest", -1, 0);
-	if (icon_info == NULL)
-	{
-		g_warning ("Throbber rest icon not found\n");
-		return;
-	}
-
-	size = gtk_icon_info_get_base_size (icon_info);
-	icon = gtk_icon_info_get_filename (icon_info);
-	g_return_if_fail (icon != NULL);
 
-	icon_pixbuf = gdk_pixbuf_new_from_file (icon, NULL);
-	gtk_icon_info_free (icon_info);
+	pixbuf = extract_frame (icon_pixbuf, 0, 0, size);
 
-	if (icon_pixbuf == NULL)
+	if (pixbuf == NULL)
 	{
 		g_warning ("Could not load spinner rest icon\n");
 		gsearch_spinner_images_free (images);
 		return;
 	}
 
-	images->quiescent_pixbuf = icon_pixbuf;
+	images->quiescent_pixbuf = pixbuf;
 
-	w = gdk_pixbuf_get_width (icon_pixbuf);
-	h = gdk_pixbuf_get_height (icon_pixbuf);
+	w = gdk_pixbuf_get_width (pixbuf);
+	h = gdk_pixbuf_get_height (pixbuf);
 	images->width = MAX (images->width, w);
 	images->height = MAX (images->height, h);
+	g_object_unref (icon_pixbuf);
 }
 
 static GSearchSpinnerCacheData *
@@ -474,7 +460,7 @@
 
 /* Spinner implementation */
 
-#define SPINNER_TIMEOUT 175 /* ms */
+#define SPINNER_TIMEOUT 50 /* ms */
 
 #define GSEARCH_SPINNER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GSEARCH_TYPE_SPINNER, GSearchSpinnerDetails))
 
@@ -685,7 +671,7 @@
 	}
 	else
 	{
-		frame = g_list_first (frame);
+		frame = g_list_first (frame)->next;
 	}
 
 	details->current_image = frame;