gnome-media r3850 - in trunk: . grecord grecord/src gst-mixer/src

[jensg svn gnome org]

Author: jensg
Date: Mon Apr 21 16:31:55 2008
New Revision: 3850
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3850&view=rev

Log:
2008-04-21  Jens Granseuer  <jensgr gmx net>

	* grecord/src/gsr-window.c: (gsr_window_init):
	* gst-mixer/src/button.c: (gnome_volume_control_button_clicked):
	* gst-mixer/src/window.c: (gnome_volume_control_window_new): don't
	declare variables in the middle of a code block. Fixes build with
	older compilers (bug #529083)


Modified:
   trunk/ChangeLog
   trunk/grecord/ChangeLog
   trunk/grecord/src/gsr-window.c
   trunk/gst-mixer/src/button.c
   trunk/gst-mixer/src/window.c

Modified: trunk/grecord/src/gsr-window.c
==============================================================================
--- trunk/grecord/src/gsr-window.c	(original)
+++ trunk/grecord/src/gsr-window.c	Mon Apr 21 16:31:55 2008
@@ -2233,10 +2233,11 @@
 	GtkWidget *label;
 	GtkWidget *table;
 	GtkWidget *align;
+	GtkWidget *frame;
 	gchar *id;
 	gchar *path;
 	GtkAction *action;
-
+	GtkShadowType shadow_type;
 	GstElement *source;
 
 	window->priv = GSR_WINDOW_GET_PRIVATE (window);
@@ -2454,10 +2455,9 @@
 	gtk_widget_show (priv->statusbar);
 
 	/* hack to get the same shadow as the status bar.. */
-	GtkShadowType shadow_type;
 	gtk_widget_style_get (GTK_WIDGET (priv->statusbar), "shadow-type", &shadow_type, NULL);
 
-	GtkWidget *frame = gtk_frame_new (NULL);
+	frame = gtk_frame_new (NULL);
 	gtk_frame_set_shadow_type (GTK_FRAME (frame), shadow_type);
 	gtk_widget_show (frame);
 

Modified: trunk/gst-mixer/src/button.c
==============================================================================
--- trunk/gst-mixer/src/button.c	(original)
+++ trunk/gst-mixer/src/button.c	Mon Apr 21 16:31:55 2008
@@ -131,13 +131,14 @@
 
   if (strstr (button->active_icon, ".png")) {
     gchar *filename;
+    GdkPixbuf *pixbuf;
 
     if (button->active)
       filename = g_build_filename (PIX_DIR, button->active_icon, NULL);
     else
       filename = g_build_filename (PIX_DIR, button->inactive_icon, NULL);
    
-    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+    pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
     gtk_image_set_from_pixbuf (button->image, pixbuf);
     g_object_unref (pixbuf);
     g_free (filename);

Modified: trunk/gst-mixer/src/window.c
==============================================================================
--- trunk/gst-mixer/src/window.c	(original)
+++ trunk/gst-mixer/src/window.c	Mon Apr 21 16:31:55 2008
@@ -369,6 +369,7 @@
   GtkWidget *vbox;
   GtkWidget *menubar;
   GSList *radio_group = NULL;
+  gint active_element_num;
 
   g_return_val_if_fail (elements != NULL, NULL);
   active_element = NULL;
@@ -432,7 +433,7 @@
     count = 0;
     active_element = elements->data;
   }
-  gint active_element_num = count;
+  active_element_num = count;
 
   change_device_menu_id = gtk_ui_manager_new_merge_id (win->ui_manager);