gnome-media r4042 - in trunk/grecord: . src

[kmaraas svn gnome org]

Author: kmaraas
Date: Sat Nov  8 11:39:58 2008
New Revision: 4042
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4042&view=rev

Log:
2008-09-18  Kjartan Maraas  <kmaraas gnome org>

	* src/gnome-recorder.c:
	* src/gsr-window.c: (seconds_to_full_string), (fill_record_input),
	(level_message_handler_cb), (gsr_window_init):
	Cleanups: make functions static, add prototypes, remove unused
	variables etc. Bug #552748.

Modified:
   trunk/grecord/ChangeLog
   trunk/grecord/src/gnome-recorder.c
   trunk/grecord/src/gsr-window.c

Modified: trunk/grecord/src/gnome-recorder.c
==============================================================================
--- trunk/grecord/src/gnome-recorder.c	(original)
+++ trunk/grecord/src/gnome-recorder.c	Sat Nov  8 11:39:58 2008
@@ -34,10 +34,15 @@
 
 #include "gsr-window.h"
 
+void gsr_quit (void);
+void gsr_add_recent (gchar *filename);
+GtkWidget * gsr_open_window (const char *filename);
+
 extern void gnome_media_profiles_init (GConfClient *conf);
  
 static GList *windows = NULL;
 
+/* Also used in gsr-window.c as extern GConfClient *gconf_client */
 GConfClient *gconf_client = NULL;
 
 static gboolean
@@ -52,7 +57,7 @@
 	return FALSE;
 }
 
-void
+static void
 window_destroyed (GtkWidget *window,
 		  gpointer data)
 {
@@ -121,6 +126,7 @@
 
 }
 
+/* Also referenced from gsr-window.c */
 gint gsr_sample_count = 1;
 
 GtkWidget *

Modified: trunk/grecord/src/gsr-window.c
==============================================================================
--- trunk/grecord/src/gsr-window.c	(original)
+++ trunk/grecord/src/gsr-window.c	Sat Nov  8 11:39:58 2008
@@ -173,6 +173,7 @@
 					 GTK_DIALOG_DESTROY_WITH_PARENT,
 					 GTK_MESSAGE_ERROR,
 					 GTK_BUTTONS_CLOSE,
+					 "%s",
 					 s);
 
 	if (dbg != NULL) {
@@ -283,7 +284,6 @@
 	char *time = NULL;
 	const char *minutefmt;
 	const char *hourfmt;
-	const char *dayfmt;
 	const char *secondfmt;
 
 	days    = seconds / (60 * 60 * 24);
@@ -1214,7 +1214,7 @@
 
 	if (error != NULL)
 	{
-		g_warning (error->message);
+		g_warning ("%s", error->message);
 
 		g_error_free (error);
 	}
@@ -1321,7 +1321,7 @@
 		window->priv->len_secs = 0;
 		window->priv->saved = FALSE;
 
-		g_print (priv->record_filename);
+		g_print ("%s", priv->record_filename);
 		g_object_set (G_OBJECT (priv->record->sink),
 			      "location", priv->record_filename,
 			      NULL);
@@ -1883,7 +1883,6 @@
 static void
 fill_record_input (GSRWindow *window, gchar *selected)
 {
-	GstElement *e;
 	const GList *l;
 	int i = 0;
 	GtkTreeModel *model;
@@ -1924,13 +1923,10 @@
 	gtk_widget_show (window->priv->input_label);
 }
 
-gboolean
+static gboolean
 level_message_handler_cb (GstBus * bus, GstMessage * message, GSRWindow *window)
 {
-  GSRWindowPrivate *priv;
-  GstState cur_state, pending;
-
-  priv = window->priv;
+  GSRWindowPrivate *priv = window->priv;
 
   if (message->type == GST_MESSAGE_ELEMENT) {
     const GstStructure *s = gst_message_get_structure (message);
@@ -1957,7 +1953,7 @@
 	myind = exp (peak_dB / 20);
 	if (myind > 1.0)
 		myind = 1.0;
-	gtk_progress_set_percentage (GTK_PROGRESS (window->priv->level), myind);
+	gtk_progress_set_percentage (GTK_PROGRESS (priv->level), myind);
       }
     }
   }
@@ -2235,8 +2231,6 @@
 	gchar *path;
 	GtkAction *action;
 	GtkShadowType shadow_type;
-	GstElement *source;
-
 	window->priv = GSR_WINDOW_GET_PRIVATE (window);
 	priv = window->priv;