applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added missing entries stored in gnome-config rather than .xscreensaver

Browse source 
2000-08-16  Bradford Hovinen  <hovinen@helixcode.com>

	* preferences.c (preferences_write_xml):
	(preferences_read_xml): Added missing entries stored in
	gnome-config rather than .xscreensaver
	(screensaver_read_xml): Disable screensaver by default
	(preferences_write_xml): Cast values to ints before passing to
	g_strdup_printf
This commit is contained in:
Bradford Hovinen 2000-08-16 23:00:31 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent d24a6c7b67
commit e8f3f6efef
2 changed files with 42 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/screensaver/ChangeLog
View file

@ -1,5 +1,12 @@
2000-08-16 Bradford Hovinen <hovinen@helixcode.com> 2000-08-16 Bradford Hovinen <hovinen@helixcode.com>
* preferences.c (preferences_write_xml):
(preferences_read_xml): Added missing entries stored in
gnome-config rather than .xscreensaver
(screensaver_read_xml): Disable screensaver by default
(preferences_write_xml): Cast values to ints before passing to
g_strdup_printf
* rc-parse.c (write_screensaver_list): Don't try to write string * rc-parse.c (write_screensaver_list): Don't try to write string
if the screensaver has no command line if the screensaver has no command line

39
capplets/screensaver/preferences.c
View file

@ -283,6 +283,16 @@ preferences_read_xml (xmlDocPtr xml_doc)
prefs->cycle = xml_get_number (node); prefs->cycle = xml_get_number (node);
else if (!strcmp (node->name, "programs")) else if (!strcmp (node->name, "programs"))
prefs->screensavers = xml_get_programs_list (node); prefs->screensavers = xml_get_programs_list (node);
else if (!strcmp (node->name, "selection-mode"))
prefs->selection_mode = xml_get_number (node);
else if (!strcmp (node->name, "use-dpms"))
prefs->power_management = TRUE;
else if (!strcmp (node->name, "standby-time"))
prefs->standby_time = xml_get_number (node);
else if (!strcmp (node->name, "suspend-time"))
prefs->suspend_time = xml_get_number (node);
else if (!strcmp (node->name, "shutdown-time"))
prefs->power_down_time = xml_get_number (node);
} }
return prefs; return prefs;
@ -337,20 +347,39 @@ preferences_write_xml (Preferences *prefs)
xmlNewChild (node, NULL, "nice", tmp); xmlNewChild (node, NULL, "nice", tmp);
g_free (tmp); g_free (tmp);
tmp = g_strdup_printf ("%d", prefs->timeout); tmp = g_strdup_printf ("%d", (int) prefs->timeout);
xmlNewChild (node, NULL, "timeout", tmp); xmlNewChild (node, NULL, "timeout", tmp);
g_free (tmp); g_free (tmp);
tmp = g_strdup_printf ("%d", prefs->lock_timeout); tmp = g_strdup_printf ("%d", (int) prefs->lock_timeout);
xmlNewChild (node, NULL, "lock-timeout", tmp); xmlNewChild (node, NULL, "lock-timeout", tmp);
g_free (tmp); g_free (tmp);
tmp = g_strdup_printf ("%d", prefs->cycle); tmp = g_strdup_printf ("%d", (int) prefs->cycle);
xmlNewChild (node, NULL, "cycle", tmp); xmlNewChild (node, NULL, "cycle", tmp);
g_free (tmp); g_free (tmp);
xmlAddChild (node, xml_write_programs_list (prefs->screensavers)); xmlAddChild (node, xml_write_programs_list (prefs->screensavers));
tmp = g_strdup_printf ("%d", prefs->selection_mode);
xmlNewChild (node, NULL, "selection-mode", tmp);
g_free (tmp);
if (prefs->power_management)
xmlNewChild (node, NULL, "use-dpms", NULL);
tmp = g_strdup_printf ("%d", prefs->standby_time);
xmlNewChild (node, NULL, "standby-time", tmp);
g_free (tmp);
tmp = g_strdup_printf ("%d", prefs->suspend_time);
xmlNewChild (node, NULL, "suspend-time", tmp);
g_free (tmp);
tmp = g_strdup_printf ("%d", prefs->power_down_time);
xmlNewChild (node, NULL, "shutdown-time", tmp);
g_free (tmp);
xmlDocSetRootElement (doc, node); xmlDocSetRootElement (doc, node);
return doc; return doc;
@ -423,6 +452,7 @@ screensaver_read_xml (xmlNodePtr saver_node)
return NULL; return NULL;
saver = screensaver_new (); saver = screensaver_new ();
saver->enabled = FALSE;
for (node = saver_node->childs; node; node = node->next) { for (node = saver_node->childs; node; node = node->next) {
if (!strcmp (node->name, "name")) if (!strcmp (node->name, "name"))
@ -468,7 +498,8 @@ screensaver_get_desc (Screensaver *saver)
screensaver_get_desc_from_xrdb (saver); screensaver_get_desc_from_xrdb (saver);
if (!saver->description) if (!saver->description)
saver->description = g_strdup (_("Custom screensaver. No description available")); saver->description = g_strdup
(_("Custom screensaver. No description available"));
return saver->description; return saver->description;
} }