rhythmbox r6111 - in trunk: . doc/reference plugins/visualizer po shell widgets

[jmatthew svn gnome org]

Author: jmatthew
Date: Sun Dec 21 11:08:38 2008
New Revision: 6111
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6111&view=rev

Log:
2008-12-21  Jonathan Matthew  <jonathan d14n org>

	* plugins/visualizer/rb-visualizer-plugin.c: (can_draw_on_desktop):
	Remove #ifdef for gtk<2.12.

	* doc/reference/Makefile.am:
	* shell/rb-shell.c: (construct_load_ui),
	(rb_shell_player_volume_changed_cb):
	* widgets/Makefile.am:
	* widgets/bacon-volume.h:
	* widgets/bacon-volume.c:
	GtkVolumeButton was added in gtk 2.12, so we don't need our copy of
	BaconVolumeButton or the code to use it any more.


Removed:
   trunk/widgets/bacon-volume.c
   trunk/widgets/bacon-volume.h
Modified:
   trunk/ChangeLog
   trunk/doc/reference/Makefile.am
   trunk/plugins/visualizer/rb-visualizer-plugin.c
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/shell/rb-shell.c
   trunk/widgets/Makefile.am

Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am	(original)
+++ trunk/doc/reference/Makefile.am	Sun Dec 21 11:08:38 2008
@@ -29,7 +29,6 @@
 
 # Header files to ignore when scanning.
 IGNORE_HFILES= \
-	bacon-volume.h \
 	config.h \
 	gsequence.h \
 	md5.h \

Modified: trunk/plugins/visualizer/rb-visualizer-plugin.c
==============================================================================
--- trunk/plugins/visualizer/rb-visualizer-plugin.c	(original)
+++ trunk/plugins/visualizer/rb-visualizer-plugin.c	Sun Dec 21 11:08:38 2008
@@ -356,12 +356,10 @@
 	/* if we have a compositing manager, we probably can't just
 	 * scribble on the desktop.
 	 */
-#if GTK_CHECK_VERSION(2,10,0)
 	if (gdk_screen_is_composited (gdk_display_get_screen (display, screen))) {
 		rb_debug ("screen is composited: probably can't draw on desktop");
 		return FALSE;
 	}
-#endif
 
 	selection_name = g_strdup_printf ("_NET_DESKTOP_MANAGER_S%d", screen);
 	selection_atom = gdk_atom_intern (selection_name, FALSE);

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sun Dec 21 11:08:38 2008
@@ -158,7 +158,6 @@
 sources/rb-sourcelist.c
 sources/rb-static-playlist-source.c
 sources/rb-streaming-source.c
-widgets/bacon-volume.c
 widgets/eggtrayicon.c
 widgets/rb-cell-renderer-pixbuf.c
 widgets/rb-dialog.c

Modified: trunk/shell/rb-shell.c
==============================================================================
--- trunk/shell/rb-shell.c	(original)
+++ trunk/shell/rb-shell.c	Sun Dec 21 11:08:38 2008
@@ -88,12 +88,6 @@
 #include "rb-marshal.h"
 #include "rb-missing-plugins.h"
 
-#if GTK_CHECK_VERSION(2,12,0)
-#define HAVE_GTK_VOLUME_BUTTON
-#else
-#include "bacon-volume.h"
-#endif
-
 #define PLAYING_ENTRY_NOTIFY_TIME 4
 
 static void rb_shell_class_init (RBShellClass *klass);
@@ -252,14 +246,9 @@
 static void sidebar_paned_size_allocate_cb (GtkWidget *widget,
 					    GtkAllocation *allocation,
 					    RBShell *shell);
-#ifdef HAVE_GTK_VOLUME_BUTTON
 static void rb_shell_volume_widget_changed_cb (GtkScaleButton *vol,
 					       gdouble volume,
 					       RBShell *shell);
-#else
-static void rb_shell_volume_widget_changed_cb (BaconVolumeButton *vol,
-					       RBShell *shell);
-#endif
 static void rb_shell_player_volume_changed_cb (RBShellPlayer *player,
 					       GParamSpec *arg,
 					       RBShell *shell);
@@ -1261,12 +1250,7 @@
 	toolbar = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/ToolBar");
 	gtk_box_pack_start (GTK_BOX (hbox), toolbar, TRUE, TRUE, 0);
 
-#ifdef HAVE_GTK_VOLUME_BUTTON
 	shell->priv->volume_button = gtk_volume_button_new ();
-#else
-	shell->priv->volume_button = bacon_volume_button_new (GTK_ICON_SIZE_LARGE_TOOLBAR,
-							       0.0, 1.0, 0.02);
-#endif
 	g_signal_connect (shell->priv->volume_button, "value-changed",
 			  G_CALLBACK (rb_shell_volume_widget_changed_cb),
 			  shell);
@@ -3558,7 +3542,6 @@
 	return TRUE;
 }
 
-#ifdef HAVE_GTK_VOLUME_BUTTON
 static void
 rb_shell_volume_widget_changed_cb (GtkScaleButton *vol,
 				   gdouble volume,
@@ -3569,21 +3552,6 @@
 	}
 }
 
-#else
-
-static void
-rb_shell_volume_widget_changed_cb (BaconVolumeButton *vol,
-				   RBShell *shell)
-{
-	if (!shell->priv->syncing_volume) {
-		g_object_set (shell->priv->player_shell,
-			      "volume", bacon_volume_button_get_value (vol),
-			      NULL);
-	}
-}
-
-#endif
-
 static void
 rb_shell_player_volume_changed_cb (RBShellPlayer *player,
 				   GParamSpec *arg,
@@ -3593,12 +3561,7 @@
 
 	g_object_get (player, "volume", &volume, NULL);
 	shell->priv->syncing_volume = TRUE;
-#ifdef HAVE_GTK_VOLUME_BUTTON
 	gtk_scale_button_set_value (GTK_SCALE_BUTTON (shell->priv->volume_button), volume);
-#else
-	bacon_volume_button_set_value (BACON_VOLUME_BUTTON (shell->priv->volume_button),
-				       volume);
-#endif
 	shell->priv->syncing_volume = FALSE;
 
 }

Modified: trunk/widgets/Makefile.am
==============================================================================
--- trunk/widgets/Makefile.am	(original)
+++ trunk/widgets/Makefile.am	Sun Dec 21 11:08:38 2008
@@ -16,8 +16,6 @@
 	rb-search-entry.h				\
 	rb-header.c					\
 	rb-header.h					\
-	bacon-volume.c					\
-	bacon-volume.h					\
 	eggtrayicon.c					\
 	eggtrayicon.h					\
 	rb-dialog.c					\