Commit ea33a4ed authored by Jonh Wendell's avatar Jonh Wendell
Browse files

Use GtkSpinner instead of our own copy of GeditSpinner

Closes #608244. Thanks to Stéphane Maniaci for the patch.
parent cadf5869
......@@ -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
......
......@@ -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 \
......
......@@ -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 */
......
This diff is collapsed.
/*
* vinagre-spinner.h
* This file is part of vinagre
*
* Copyright (C) 2005 - Paolo Maggi
* Copyright (C) 2000 - Eazel, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* This widget was originally written by Andy Hertzfeld <andy@eazel.com> for
* Nautilus.
*/
#ifndef __VINAGRE_SPINNER_H__
#define __VINAGRE_SPINNER_H__
#include <gtk/gtk.h>
G_BEGIN_DECLS
/*
* Type checking and casting macros
*/
#define VINAGRE_TYPE_SPINNER (vinagre_spinner_get_type ())
#define VINAGRE_SPINNER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), VINAGRE_TYPE_SPINNER, VinagreSpinner))
#define VINAGRE_SPINNER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), VINAGRE_TYPE_SPINNER, VinagreSpinnerClass))
#define VINAGRE_IS_SPINNER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), VINAGRE_TYPE_SPINNER))
#define VINAGRE_IS_SPINNER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), VINAGRE_TYPE_SPINNER))
#define VINAGRE_SPINNER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), VINAGRE_TYPE_SPINNER, VinagreSpinnerClass))
/* Private structure type */
typedef struct _VinagreSpinnerPrivate VinagreSpinnerPrivate;
/*
* Main object structure
*/
typedef struct _VinagreSpinner VinagreSpinner;
struct _VinagreSpinner
{
GtkWidget parent;
/*< private >*/
VinagreSpinnerPrivate *priv;
};
/*
* Class definition
*/
typedef struct _VinagreSpinnerClass VinagreSpinnerClass;
struct _VinagreSpinnerClass
{
GtkWidgetClass parent_class;
};
/*
* Public methods
*/
GType vinagre_spinner_get_type (void) G_GNUC_CONST;
GtkWidget *vinagre_spinner_new (void);
void vinagre_spinner_start (VinagreSpinner *throbber);
void vinagre_spinner_stop (VinagreSpinner *throbber);
void vinagre_spinner_set_size (VinagreSpinner *spinner,
GtkIconSize size);
G_END_DECLS
#endif /* __VINAGRE_SPINNER_H__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment