[Xfce4-commits] r26397 - in xfce4-session/trunk: . engines/balou engines/simple

[Benedikt Meurer]

Author: benny
Date: 2007-11-28 20:05:51 +0000 (Wed, 28 Nov 2007)
New Revision: 26397

Modified:
   xfce4-session/trunk/ChangeLog
   xfce4-session/trunk/engines/balou/config.c
   xfce4-session/trunk/engines/simple/simple.c
Log:
2007-11-28	Benedikt Meurer <benny at xfce.org>

	* engines/balou/config.c, engines/simple/simple.c: Use
	  GtkFileChooser instead of XfceFileChooser. Bug #3492.




Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog	2007-11-28 19:48:23 UTC (rev 26396)
+++ xfce4-session/trunk/ChangeLog	2007-11-28 20:05:51 UTC (rev 26397)
@@ -1,3 +1,8 @@
+2007-11-28	Benedikt Meurer <benny at xfce.org>
+
+	* engines/balou/config.c, engines/simple/simple.c: Use
+	  GtkFileChooser instead of XfceFileChooser. Bug #3492.
+
 2007-07-20	Benedikt Meurer <benny at xfce.org>
 
 	* xfce4-session/shutdown.c: Fix typo. Bug #3381.

Modified: xfce4-session/trunk/engines/balou/config.c
===================================================================
--- xfce4-session/trunk/engines/balou/config.c	2007-11-28 19:48:23 UTC (rev 26396)
+++ xfce4-session/trunk/engines/balou/config.c	2007-11-28 20:05:51 UTC (rev 26397)
@@ -318,15 +318,15 @@
 
   treeview = GTK_TREE_VIEW (g_object_get_data (G_OBJECT (menu), "tree-view"));
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (treeview));
-  chooser = xfce_file_chooser_new (_("Choose theme file to install..."),
-                                   GTK_WINDOW (toplevel),
-                                   XFCE_FILE_CHOOSER_ACTION_OPEN,
-                                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                   GTK_STOCK_OPEN, GTK_RESPONSE_OK,
-                                   NULL);
+  chooser = gtk_file_chooser_dialog_new (_("Choose theme file to install..."),
+                                         GTK_WINDOW (toplevel),
+                                         GTK_FILE_CHOOSER_ACTION_OPEN,
+                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                         GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+                                         NULL);
   if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK)
     {
-      file = xfce_file_chooser_get_filename (XFCE_FILE_CHOOSER (chooser));
+      file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
 
       if (!config_do_install_theme (file, treeview))
         {

Modified: xfce4-session/trunk/engines/simple/simple.c
===================================================================
--- xfce4-session/trunk/engines/simple/simple.c	2007-11-28 19:48:23 UTC (rev 26396)
+++ xfce4-session/trunk/engines/simple/simple.c	2007-11-28 20:05:51 UTC (rev 26397)
@@ -312,28 +312,29 @@
 config_browse (GtkWidget *button, GtkWidget *entry)
 {
   const gchar *filename;
+  gchar       *new_filename;
   GtkWidget   *chooser;
   GtkWidget   *toplevel;
 
   toplevel = gtk_widget_get_toplevel (button);
-  chooser = xfce_file_chooser_new (_("Choose image..."),
-                                   GTK_WINDOW (toplevel),
-                                   XFCE_FILE_CHOOSER_ACTION_OPEN,
-                                   GTK_STOCK_OPEN,
-                                   GTK_RESPONSE_OK,
-                                   GTK_STOCK_CANCEL,
-                                   GTK_RESPONSE_CANCEL,
-                                   NULL);
+  chooser = gtk_file_chooser_dialog_new (_("Choose image..."),
+                                         GTK_WINDOW (toplevel),
+                                         GTK_FILE_CHOOSER_ACTION_OPEN,
+                                         GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                         NULL);
 
   filename = gtk_entry_get_text (GTK_ENTRY (entry));
   if (filename != NULL)
-    xfce_file_chooser_set_filename (XFCE_FILE_CHOOSER (chooser), filename);
-  xfce_file_chooser_set_select_multiple (XFCE_FILE_CHOOSER (chooser), FALSE);
+    gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (chooser), filename);
 
+  gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), FALSE);
+
   if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK)
     {
-      filename = xfce_file_chooser_get_filename (XFCE_FILE_CHOOSER (chooser));
-      gtk_entry_set_text (GTK_ENTRY (entry), filename);
+      new_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+      gtk_entry_set_text (GTK_ENTRY (entry), new_filename);
+      g_free (new_filename);
     }
 
   gtk_widget_destroy (chooser);