cheese r770 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Thu Jun 19 12:27:07 2008
New Revision: 770
URL: http://svn.gnome.org/viewvc/cheese?rev=770&view=rev

Log:
2008-06-19  Cosimo Cecchi  <cosimoc gnome org>

	* src/cheese-countdown.c: (do_text):
	* src/cheese-thumb-view.c: (cheese_thumb_view_fill):
	* src/cheese-window.c: (cheese_window_cmd_save_as),
	(cheese_window_cmd_move_file_to_trash),
	(cheese_window_cmd_set_about_me_photo),
	(cheese_window_countdown_picture_cb), (setup_camera):
	Fix some gcc warnings. (#537490).


Modified:
   trunk/ChangeLog
   trunk/src/cheese-countdown.c
   trunk/src/cheese-thumb-view.c
   trunk/src/cheese-window.c

Modified: trunk/src/cheese-countdown.c
==============================================================================
--- trunk/src/cheese-countdown.c	(original)
+++ trunk/src/cheese-countdown.c	Thu Jun 19 12:27:07 2008
@@ -314,7 +314,7 @@
   }
 
   /* print and layout string (pango-wise) */
-  g_string_printf (pTextString, pcText);
+  g_string_printf (pTextString, "%s", pcText);
   pango_layout_set_text (pLayout, pTextString->str, -1);
   g_string_free (pTextString, TRUE);
 

Modified: trunk/src/cheese-thumb-view.c
==============================================================================
--- trunk/src/cheese-thumb-view.c	(original)
+++ trunk/src/cheese-thumb-view.c	Thu Jun 19 12:27:07 2008
@@ -316,7 +316,7 @@
     return;
 
   //read videos from the vid directory
-  while (name = g_dir_read_name (dir_videos))
+  while ((name = g_dir_read_name (dir_videos)))
   {
     if (!(g_str_has_suffix (name, VIDEO_NAME_SUFFIX)))
       continue;
@@ -330,7 +330,7 @@
   g_dir_close (dir_videos);
   
   //read photos from the photo directory
-  while (name = g_dir_read_name (dir_photos))
+  while ((name = g_dir_read_name (dir_photos)))
   {
     if (!(g_str_has_suffix (name, PHOTO_NAME_SUFFIX)))
       continue;

Modified: trunk/src/cheese-window.c
==============================================================================
--- trunk/src/cheese-window.c	(original)
+++ trunk/src/cheese-window.c	Thu Jun 19 12:27:07 2008
@@ -332,7 +332,7 @@
                                     GTK_DIALOG_MODAL |
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                     GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-                                    header);
+                                    "%s", header);
       gtk_dialog_run (GTK_DIALOG (dlg));
       gtk_widget_destroy (dlg);
       g_free (header);
@@ -361,9 +361,9 @@
 
       error_dialog = gtk_message_dialog_new (GTK_WINDOW (cheese_window->window),
                                              GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, primary);
+                                             GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", primary);
       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog),
-                                                secondary);
+                                                "%s", secondary);
       gtk_dialog_run (GTK_DIALOG (error_dialog));
       gtk_widget_destroy (error_dialog);
 
@@ -516,8 +516,8 @@
         header = g_strdup_printf (_("Could not set the Account Photo"));
         dlg = gtk_message_dialog_new (GTK_WINDOW (cheese_window->window),
                                       GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                      GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, header);
-        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), error->message);
+                                      GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", header);
+        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), "%s", error->message);
         gtk_dialog_run (GTK_DIALOG (dlg));
         gtk_widget_destroy (dlg);
         g_free (header);
@@ -846,7 +846,7 @@
   audio_play = gst_audio_play_file (file, &error);
   if (!audio_play) 
   {
-    g_warning (error ? error->message : "Unknown error");
+    g_warning ("%s", error ? error->message : "Unknown error");
     g_error_free (error);
   }
 
@@ -1393,7 +1393,7 @@
 
   if (error != NULL)
   {
-    GtkDialog *dialog;
+    GtkWidget *dialog;
 
     gdk_threads_enter ();
 
@@ -1401,13 +1401,13 @@
                                      0,
                                      GTK_MESSAGE_ERROR, 
                                      GTK_BUTTONS_OK, 
-                                     error->message);
+                                     "%s", error->message);
 
     g_error_free(error);
 
     g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
     gtk_window_set_title(GTK_WINDOW (dialog), "Critical Error");
-    gtk_dialog_run (dialog);
+    gtk_dialog_run (GTK_DIALOG (dialog));
 
     // Clean up and exit
     cheese_window_cmd_close(NULL, cheese_window);