rhythmbox r5831 - in trunk: . lib plugins/cd-recorder shell

[jmatthew svn gnome org]

Author: jmatthew
Date: Thu Jul 31 11:06:27 2008
New Revision: 5831
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5831&view=rev

Log:
2008-07-31  Jonathan Matthew  <jonathan d14n org>

	patch by:  Sebastien Bacher  <seb128 debian org>

	* lib/rb-file-helpers.c: (rb_dot_dir):
	* plugins/cd-recorder/rb-playlist-source-recorder.c:
	(error_dialog):
	* shell/rb-shell-preferences.c: (help_cb):
	* shell/rb-shell.c: (rb_shell_create_mount_op_cb):
	Various compile fixes, some in code I never even compiled before I
	checked it in.  oops.


Modified:
   trunk/ChangeLog
   trunk/lib/rb-file-helpers.c
   trunk/plugins/cd-recorder/rb-playlist-source-recorder.c
   trunk/shell/rb-shell-preferences.c
   trunk/shell/rb-shell.c

Modified: trunk/lib/rb-file-helpers.c
==============================================================================
--- trunk/lib/rb-file-helpers.c	(original)
+++ trunk/lib/rb-file-helpers.c	Thu Jul 31 11:06:27 2008
@@ -30,6 +30,7 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <stdio.h>
 #include <string.h>
 #include <config.h>
@@ -90,7 +91,7 @@
 					    GNOME_DOT_GNOME,
 					    "rhythmbox",
 					    NULL);
-		if (mkdir (dot_dir, 0750) == -1)
+		if (g_mkdir (dot_dir, 0750) == -1)
 			rb_debug ("unable to create Rhythmbox's dot dir");
 	}
 	

Modified: trunk/plugins/cd-recorder/rb-playlist-source-recorder.c
==============================================================================
--- trunk/plugins/cd-recorder/rb-playlist-source-recorder.c	(original)
+++ trunk/plugins/cd-recorder/rb-playlist-source-recorder.c	Thu Jul 31 11:06:27 2008
@@ -437,7 +437,7 @@
                                          GTK_DIALOG_DESTROY_WITH_PARENT,
                                          GTK_MESSAGE_ERROR,
                                          GTK_BUTTONS_CLOSE,
-                                         primary);
+                                         "%s", primary);
 
         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                                   "%s", text);

Modified: trunk/shell/rb-shell-preferences.c
==============================================================================
--- trunk/shell/rb-shell-preferences.c	(original)
+++ trunk/shell/rb-shell-preferences.c	Thu Jul 31 11:06:27 2008
@@ -157,7 +157,7 @@
 	GError *error = NULL;
 
 #if GTK_CHECK_VERSION(2,13,1)
-	gtk_show_uri (gtk_widget_get_display (widget),
+	gtk_show_uri (gtk_widget_get_screen (widget),
 		      "ghelp:rhythmbox",
 		      gtk_get_current_event_time (),
 		      &error);

Modified: trunk/shell/rb-shell.c
==============================================================================
--- trunk/shell/rb-shell.c	(original)
+++ trunk/shell/rb-shell.c	Thu Jul 31 11:06:27 2008
@@ -992,7 +992,7 @@
 {
 	/* create a gtk mount operation if possible, otherwise don't use one at all */
 #if GTK_CHECK_VERSION(2,13,1)
-	return gtk_mount_operation_new (shell->priv->window);
+	return gtk_mount_operation_new (GTK_WINDOW (shell->priv->window));
 #else
 	return NULL;
 #endif