summaryrefslogtreecommitdiff
path: root/src/openfiles.cpp
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-06 14:22:49 -0800
committerStefano Karapetsas <[email protected]>2012-11-06 14:22:49 -0800
commit684e6bb4c072f707a92ce72d85954b5790aaab53 (patch)
treee8a449764975fe5066a67c9275ea73c56a88309b /src/openfiles.cpp
parent7caef9a314fc9f1fea996d79601d4242286825b1 (diff)
parentf27253b155db8d3c06bf13801c63bdc282da4157 (diff)
downloadmate-system-monitor-684e6bb4c072f707a92ce72d85954b5790aaab53.tar.bz2
mate-system-monitor-684e6bb4c072f707a92ce72d85954b5790aaab53.tar.xz
Merge pull request #10 from NiceandGently/master
port to gsettings
Diffstat (limited to 'src/openfiles.cpp')
-rw-r--r--src/openfiles.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/openfiles.cpp b/src/openfiles.cpp
index de3e864..7bce479 100644
--- a/src/openfiles.cpp
+++ b/src/openfiles.cpp
@@ -13,7 +13,7 @@
#include "openfiles.h"
#include "proctable.h"
#include "util.h"
-#include "mateconf-keys.h"
+#include "settings-keys.h"
enum
{
@@ -215,11 +215,11 @@ static void
close_openfiles_dialog (GtkDialog *dialog, gint id, gpointer data)
{
GtkWidget *tree = static_cast<GtkWidget*>(data);
- MateConfClient *client;
+ GSettings *settings;
guint timer;
- client = static_cast<MateConfClient*>(g_object_get_data (G_OBJECT (tree), "client"));
- procman_save_tree_state (client, tree, procman::mateconf::open_files_tree_prefix.c_str());
+ settings = static_cast<GSettings*>(g_object_get_data (G_OBJECT (tree), "settings"));
+ procman_save_tree_state (settings, tree, procman::settings::open_files_tree_prefix.c_str());
timer = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (tree), "timer"));
g_source_remove (timer);
@@ -288,7 +288,8 @@ create_openfiles_tree (ProcData *procdata)
GTK_SORT_ASCENDING);*/
#endif
- procman_get_tree_state (procdata->client, tree, procman::mateconf::open_files_tree_prefix.c_str());
+ procman_get_tree_state (procdata->settings, tree, procman::settings::open_files_tree_prefix.c_str());
+
return tree;
@@ -368,7 +369,7 @@ create_single_openfiles_dialog (GtkTreeModel *model, GtkTreePath *path,
tree = create_openfiles_tree (procdata);
gtk_container_add (GTK_CONTAINER (scrolled), tree);
g_object_set_data (G_OBJECT (tree), "selected_info", info);
- g_object_set_data (G_OBJECT (tree), "client", procdata->client);
+ g_object_set_data (G_OBJECT (tree), "settings", procdata->settings);
gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolled, TRUE, TRUE, 0);
gtk_widget_show_all (scrolled);