[Xfce4-commits] <parole:master> Backport fix for bug #10269: Remember playlist option in GUI not working

[Sean Davis]

Updating branch refs/heads/master
         to e47216fcd793e87850701c5229ebd36b38312bb3 (commit)
       from 266bf7aead6e22d12d7def9dd70d195355bf02d3 (commit)

commit e47216fcd793e87850701c5229ebd36b38312bb3
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Oct 9 07:34:49 2013 -0400

    Backport fix for bug #10269: Remember playlist option in GUI not working

 src/parole-conf-dialog.c |   11 +++++++++++
 src/parole-medialist.c   |   10 +++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 35c3224..c1c4e59 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -409,6 +409,17 @@ parole_conf_dialog_set_defaults_playlist (ParoleConfDialog  *self, GtkBuilder *b
 		  NULL);
 		  
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), option);
+    
+     /**
+     * Remember playlist
+     **/
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "remember-playlist"));
+    
+    g_object_get (G_OBJECT (self->priv->conf),
+                  "remember-playlist", &option,
+                  NULL);
+          
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), option);
 }
 
 /* Load the multimedia-button default settings */
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 5f699d7..85aad22 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -1180,12 +1180,12 @@ remember_playlist_activated_cb (GtkWidget *mi, ParoleConf *conf)
     gchar *playlist_filename;
     GFile *playlist_file;
     g_object_set (G_OBJECT (conf),
-		  "remember-playlist", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
-		  NULL);
+                  "remember-playlist", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
+                  NULL);
     if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi))) {
-        playlist_filename = xfce_resource_save_location (XFCE_RESOURCE_DATA, 
-                                                     PAROLE_AUTO_SAVED_PLAYLIST, 
-                                                     FALSE);
+        playlist_filename = xfce_resource_save_location (XFCE_RESOURCE_DATA,
+                                                         PAROLE_AUTO_SAVED_PLAYLIST,
+                                                         FALSE);
         playlist_file = g_file_new_for_path(playlist_filename);
         g_file_delete(playlist_file, NULL, NULL);
         g_free(playlist_filename);