[evolution] Replace ESpinner with GtkSpinner.



commit 3ba0b61f9f447b01c3a83bfb78ee33a45d413700
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Mar 2 13:13:56 2010 -0500

    Replace ESpinner with GtkSpinner.
    
    Also, bump our GTK+ requirement to 2.20.

 configure.ac                          |    2 +-
 plugins/caldav/caldav-browse-server.c |    4 +-
 widgets/misc/Makefile.am              |    2 -
 widgets/misc/e-activity-proxy.c       |    5 +-
 widgets/misc/e-spinner.c              |  992 ---------------------------------
 widgets/misc/e-spinner.h              |   39 --
 6 files changed, 5 insertions(+), 1039 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fe04e1e..2f43f44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl Required Packages
 m4_define([glib_minimum_version], [2.22.0])
-m4_define([gtk_minimum_version], [2.18.0])
+m4_define([gtk_minimum_version], [2.20.0])
 m4_define([eds_minimum_version], [evo_version])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
 m4_define([gnome_desktop_minimum_version], [2.26.0])
diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index ff19ff0..c1edc21 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -39,7 +39,6 @@
 #include <libedataserverui/e-passwords.h>
 
 #include <e-util/e-dialog-utils.h>
-#include <widgets/misc/e-spinner.h>
 
 #include "caldav-browse-server.h"
 
@@ -1180,7 +1179,8 @@ init_dialog (GtkDialog *dialog, GtkWidget **new_url_entry, const gchar *url, con
 
 	info_box = gtk_hbox_new (FALSE, 2);
 
-	spinner = e_spinner_new_spinning_small_shown ();
+	spinner = gtk_spinner_new ();
+	gtk_spinner_start (GTK_SPINNER (spinner));
 	gtk_box_pack_start (GTK_BOX (info_box), spinner, FALSE, FALSE, 0);
 	g_object_set_data (G_OBJECT (dialog), "caldav-spinner", spinner);
 
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index dceaab4..9a33f48 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -69,8 +69,6 @@ widgetsinclude_HEADERS =			\
 	e-signature-preview.h			\
 	e-signature-script-dialog.h		\
 	e-signature-tree-view.h			\
-	e-spinner.c				\
-	e-spinner.h				\
 	e-url-entry.h				\
 	e-web-view.h				\
 	ea-calendar-cell.h			\
diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c
index 10249b1..825aae0 100644
--- a/widgets/misc/e-activity-proxy.c
+++ b/widgets/misc/e-activity-proxy.c
@@ -22,7 +22,6 @@
 #include "e-activity-proxy.h"
 
 #include <glib/gi18n.h>
-#include <e-spinner.h>
 
 #define E_ACTIVITY_PROXY_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -277,8 +276,8 @@ activity_proxy_init (EActivityProxy *proxy)
 	proxy->priv->button = g_object_ref (widget);
 	gtk_widget_hide (widget);
 
-        /* XXX What's the rationale for killing the old spinner API? */
-	widget = e_spinner_new_spinning_small_shown ();
+	widget = gtk_spinner_new ();
+	gtk_spinner_start (GTK_SPINNER (widget));
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	proxy->priv->spinner = g_object_ref (widget);
 	gtk_widget_show (widget);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]