After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 626017 - Convert lockdown to GSettings
Convert lockdown to GSettings
Status: RESOLVED FIXED
Product: nautilus
Classification: Core
Component: Preferences
2.31.x
Other Linux
: Normal normal
: ---
Assigned To: Nautilus Maintainers
Nautilus Maintainers
Depends on:
Blocks: 622558
 
 
Reported: 2010-08-04 12:25 UTC by Tomas Bzatek
Modified: 2010-08-05 14:16 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Convert disable-command-line lockdown to gsettings (7.40 KB, patch)
2010-08-04 12:25 UTC, Tomas Bzatek 		reviewed Details | Review
Require gsettings-desktop-schemas (982 bytes, patch)
2010-08-04 12:25 UTC, Tomas Bzatek 		committed Details | Review
Convert disable-command-line lockdown to gsettings (7.28 KB, patch)
2010-08-04 16:38 UTC, Tomas Bzatek 		committed Details | Review

Description Tomas Bzatek 2010-08-04 12:25:30 UTC 
Created attachment 167106 [details] [review]
Convert disable-command-line lockdown to gsettings

Continuation of removing remaining traces of GConf. This patch makes use of recently released gsettings-desktop-schemas, which includes lockdown schemas as well as desktop background stuff.
Comment 1 Tomas Bzatek 2010-08-04 12:25:57 UTC 
Created attachment 167107 [details] [review]
Require gsettings-desktop-schemas
Comment 2 Cosimo Cecchi 2010-08-04 12:47:52 UTC 
Review of attachment 167106 [details] [review]:

Looks good, except for a minor comment here.

::: src/file-manager/fm-desktop-icon-view.c
@@ +619,3 @@
+	g_signal_connect_swapped (gnome_lockdown_preferences,
+				  "changed::" NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE,
+				  G_CALLBACK (lockdown_disable_command_line_changed_callback),

Can't you just connect_swapped() to fm_directory_view_update_menus() and remove 	lockdown_disable_command_line_changed_callback() altogether?

::: src/file-manager/fm-directory-view.c
@@ +2003,3 @@
 				  G_CALLBACK(sort_directories_first_changed_callback), view);
+	g_signal_connect_swapped (gnome_lockdown_preferences,
+				  "changed::" NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE,

Same, for schedule_update_menus()
Comment 3 Cosimo Cecchi 2010-08-04 12:49:25 UTC 
Review of attachment 167107 [details] [review]:

Looks good, please commit when you push another patch that requires the desktop schemas.
Comment 4 Tomas Bzatek 2010-08-04 16:38:45 UTC 
Created attachment 167125 [details] [review]
Convert disable-command-line lockdown to gsettings

(In reply to comment #2)
> Can't you just connect_swapped() to fm_directory_view_update_menus() and remove
>     lockdown_disable_command_line_changed_callback() altogether?

You're right, this can be easily simplified. Attached is an updated patch.
Comment 5 Cosimo Cecchi 2010-08-05 07:50:18 UTC 
Review of attachment 167125 [details] [review]:

Thanks, please commit to master.
Comment 6 Tomas Bzatek 2010-08-05 14:16:37 UTC 
commit 9e219b3750a2cf60897bcd6213957cb9635dc05f
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:   Thu Aug 5 16:13:27 2010 +0200

    Require gsettings-desktop-schemas

commit 3c8b43bf6c10e83d0bd8fd97e0dae7032339ba72
Author: Tomas Bzatek <tbzatek@redhat.com>
Date:   Thu Aug 5 16:12:39 2010 +0200

    Convert disable-command-line lockdown to gsettings