Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > 937e954a3c9276a262ca9d15b34bed30 > files > 5

xfce-session-4.4.1-11mdv2008.0.src.rpm

diff -Naur xfce4-session-4.4.1/engines/balou/config.c xfce4-session-4.4.1.tpg/engines/balou/config.c
--- xfce4-session-4.4.1/engines/balou/config.c	2007-04-09 17:06:31.000000000 +0000
+++ xfce4-session-4.4.1.tpg/engines/balou/config.c	2007-09-04 18:08:19.000000000 +0000
@@ -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))
         {
diff -Naur xfce4-session-4.4.1/engines/simple/simple.c xfce4-session-4.4.1.tpg/engines/simple/simple.c
--- xfce4-session-4.4.1/engines/simple/simple.c	2007-04-09 17:06:34.000000000 +0000
+++ xfce4-session-4.4.1.tpg/engines/simple/simple.c	2007-09-04 18:08:19.000000000 +0000
@@ -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);