[cheese] use GtkSpinner instead of our own
- From: Daniel G. Siegel <dgsiegel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [cheese] use GtkSpinner instead of our own
- Date: Tue, 1 Dec 2009 00:37:52 +0000 (UTC)
commit 28d240acc2d26b99c4787dcd1b07078a762889ff
Author: daniel g. siegel <siegel in tum de>
Date: Tue Dec 1 01:36:40 2009 +0100
use GtkSpinner instead of our own
fixes bug #598445, GTK dependency was bumped to 2.19.2
configure.ac | 2 +-
src/Makefile.am | 2 -
src/cheese-window.c | 8 +-
src/ephy-spinner.c | 973 ---------------------------------------------------
src/ephy-spinner.h | 69 ----
5 files changed, 4 insertions(+), 1050 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1ee7ff9..8839bf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ GNOME_DOC_INIT
GLIB_REQUIRED=2.16.0
GOBJECT_REQUIRED=2.12.0
GIO_REQUIRED=2.16.0
-GTK_REQUIRED=2.17.4
+GTK_REQUIRED=2.19.2
GDK_REQUIRED=2.14.0
LIBGNOMEDESKTOP_REQUIRED=2.26.0
GCONF_REQUIRED=2.16.0
diff --git a/src/Makefile.am b/src/Makefile.am
index 97a4787..94219ef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,8 +34,6 @@ cheese_SOURCES = \
eog-thumbnail.h \
eog-thumb-nav.c \
eog-thumb-nav.h \
- ephy-spinner.c \
- ephy-spinner.h \
cheese-no-camera.c \
cheese-no-camera.h \
cheese-prefs-widget.h \
diff --git a/src/cheese-window.c b/src/cheese-window.c
index 4c1f388..fdce896 100644
--- a/src/cheese-window.c
+++ b/src/cheese-window.c
@@ -51,7 +51,6 @@
#include "cheese-thumb-view.h"
#include "eog-thumb-nav.h"
#include "cheese-window.h"
-#include "ephy-spinner.h"
#include "cheese-no-camera.h"
#include "cheese-prefs-dialog.h"
#include "cheese-flash.h"
@@ -1806,8 +1805,7 @@ cheese_window_create_window (CheeseWindow *cheese_window)
gtk_container_add (GTK_CONTAINER (cheese_window->effect_frame), cheese_window->effect_chooser);
g_free (gconf_effects);
- cheese_window->throbber = ephy_spinner_new ();
- ephy_spinner_set_size (EPHY_SPINNER (cheese_window->throbber), GTK_ICON_SIZE_DIALOG);
+ cheese_window->throbber = gtk_spinner_new ();
gtk_container_add (GTK_CONTAINER (cheese_window->throbber_frame), cheese_window->throbber);
gtk_widget_show (cheese_window->throbber);
@@ -2085,7 +2083,7 @@ setup_camera (CheeseWindow *cheese_window)
cheese_camera_play (cheese_window->camera);
gdk_threads_enter ();
gtk_notebook_set_current_page (GTK_NOTEBOOK (cheese_window->notebook), 0);
- ephy_spinner_stop (EPHY_SPINNER (cheese_window->throbber));
+ gtk_spinner_stop (GTK_SPINNER (cheese_window->throbber));
if (cheese_camera_get_num_camera_devices (cheese_window->camera) == 0)
{
info_bar = cheese_no_camera_info_bar_new ();
@@ -2129,7 +2127,7 @@ cheese_window_init (char *hal_dev_udi, CheeseDbus *dbus_server, gboolean startup
cheese_window_create_window (cheese_window);
gtk_action_group_set_sensitive (cheese_window->actions_effects, FALSE);
- ephy_spinner_start (EPHY_SPINNER (cheese_window->throbber));
+ gtk_spinner_start (GTK_SPINNER (cheese_window->throbber));
gtk_notebook_set_current_page (GTK_NOTEBOOK (cheese_window->notebook), 2);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]