[vinagre] Use GtkSpinner instead of our own copy of GeditSpinner



commit ea33a4ed76bb76e08e729091c322d5e48622a8f7
Author: Jonh Wendell <jwendell gnome org>
Date:   Sat Jun 5 11:36:19 2010 -0300

    Use GtkSpinner instead of our own copy of GeditSpinner
    
    Closes #608244. Thanks to Stéphane Maniaci for the patch.

 configure.ac               |    2 +-
 vinagre/Makefile.am        |    3 -
 vinagre/vinagre-notebook.c |    9 +-
 vinagre/vinagre-spinner.c  |  983 --------------------------------------------
 vinagre/vinagre-spinner.h  |   89 ----
 5 files changed, 4 insertions(+), 1082 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6fa6d40..ea2a383 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ GNOME_DOC_INIT
 #*******************************************************************************
 
 GLIB_REQUIRED=2.17.0
-GTK_REQUIRED=2.13.1
+GTK_REQUIRED=2.20.0
 GCONF_REQUIRED=2.16.0
 GTHREAD_REQUIRED=2.0.0
 GTK_VNC_REQUIRED=0.3.10
diff --git a/vinagre/Makefile.am b/vinagre/Makefile.am
index 844a91a..63c43d0 100644
--- a/vinagre/Makefile.am
+++ b/vinagre/Makefile.am
@@ -27,7 +27,6 @@ NOINST_H_FILES = \
   vinagre-plugin-dialog.h \
   vinagre-plugins-engine.h \
   vinagre-window-private.h \
-  vinagre-spinner.h \
   pty_open.h \
   $(NULL)
 
@@ -94,7 +93,6 @@ handwritten_sources = \
   vinagre-tab.c \
   vinagre-utils.c \
   vinagre-window.c \
-  vinagre-spinner.c \
   pty_open.c \
   vinagre-ssh.c \
   vinagre-cache-prefs.c \
@@ -193,7 +191,6 @@ vinagre_applet_SOURCES =					\
 	vinagre-dirs.h vinagre-dirs.c \
 	vinagre-fav.h vinagre-fav.c \
 	vinagre-connect.h vinagre-connect.c \
-	vinagre-spinner.h vinagre-spinner.c \
 	vinagre-marshal.h vinagre-marshal.c \
 	pty_open.h pty_open.c \
 	vinagre-ssh.h vinagre-ssh.c \
diff --git a/vinagre/vinagre-notebook.c b/vinagre/vinagre-notebook.c
index d8f5f61..f781fec 100644
--- a/vinagre/vinagre-notebook.c
+++ b/vinagre/vinagre-notebook.c
@@ -24,11 +24,9 @@
 
 #include <glib/gi18n.h>
 
-#include "vinagre-notebook.h"
 #include "vinagre-utils.h"
 #include "vinagre-dnd.h"
 #include "vinagre-prefs.h"
-#include "vinagre-spinner.h"
 
 #define VINAGRE_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookPrivate))
 
@@ -224,14 +222,14 @@ vinagre_notebook_update_ui_sentitivity (VinagreNotebook *nb)
       if (vinagre_tab_get_state (VINAGRE_TAB (nb->priv->active_tab)) == VINAGRE_TAB_STATE_CONNECTED)
 	{
 	  gtk_widget_hide (spinner);
-	  vinagre_spinner_stop (VINAGRE_SPINNER (spinner));
+	  gtk_spinner_stop (GTK_SPINNER (spinner));
 	  gtk_widget_show (icon);
 	}
       else
 	{
 	  gtk_widget_hide (icon);
 	  gtk_widget_show (spinner);
-	  vinagre_spinner_start (VINAGRE_SPINNER (spinner));
+	  gtk_spinner_start (GTK_SPINNER (spinner));
 	}
     }
 }
@@ -558,8 +556,7 @@ build_tab_label (VinagreNotebook *nb,
 		    tab);
 
   /* setup spinner */
-  spinner = vinagre_spinner_new ();
-  vinagre_spinner_set_size (VINAGRE_SPINNER (spinner), GTK_ICON_SIZE_MENU);
+  spinner = gtk_spinner_new();
   gtk_box_pack_start (GTK_BOX (label_hbox), spinner, FALSE, FALSE, 0);
 
   /* setup site icon */



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