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

Fix call to location_store_xml

Browse source 
2001-03-12  Bradford Hovinen  <hovinen@ximian.com>

	* main.c (store_archive_data): Fix call to location_store_xml
This commit is contained in:
Bradford Hovinen 2001-03-13 03:16:08 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent a4d3d1b934
commit 45c0705006
8 changed files with 1093 additions and 1057 deletions
Download patch file Download diff file Expand all files Collapse all files

216
capplets/background/background-properties.glade
View file

@ -17,7 +17,7 @@
<widget> <widget>
<class>GtkWindow</class> <class>GtkWindow</class>
<name>window1</name> <name>window1</name>
<title>window1</title> <title>window2</title>
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
@ -26,24 +26,13 @@
<auto_shrink>False</auto_shrink> <auto_shrink>False</auto_shrink>
<widget> <widget>
<class>GtkVBox</class> <class>GtkTable</class>
<name>prefs_widget</name> <name>prefs_widget</name>
<rows>4</rows>
<columns>2</columns>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<spacing>0</spacing> <row_spacing>5</row_spacing>
<column_spacing>5</column_spacing>
<widget>
<class>GtkEventBox</class>
<name>monitor_frame</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>Placeholder</class>
</widget>
</widget>
<widget> <widget>
<class>GtkCheckButton</class> <class>GtkCheckButton</class>
@ -58,23 +47,21 @@
<active>True</active> <active>True</active>
<draw_indicator>True</draw_indicator> <draw_indicator>True</draw_indicator>
<child> <child>
<padding>0</padding> <left_attach>0</left_attach>
<expand>False</expand> <right_attach>1</right_attach>
<fill>False</fill> <top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child> </child>
</widget> </widget>
<widget>
<class>GtkHBox</class>
<name>hbox2</name>
<homogeneous>False</homogeneous>
<spacing>4</spacing>
<child>
<padding>4</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<widget> <widget>
<class>GtkFrame</class> <class>GtkFrame</class>
<name>color_frame</name> <name>color_frame</name>
@ -82,9 +69,18 @@
<label_xalign>0</label_xalign> <label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child> <child>
<padding>0</padding> <left_attach>0</left_attach>
<expand>False</expand> <right_attach>1</right_attach>
<fill>True</fill> <top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child> </child>
<widget> <widget>
@ -126,8 +122,8 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label6</name> <name>label6</name>
<label>Color 1</label> <label>Primary color</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0</xalign> <xalign>0</xalign>
<yalign>0.5</yalign> <yalign>0.5</yalign>
@ -151,8 +147,8 @@
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label7</name> <name>color2_label</name>
<label>Color 2</label> <label>Right or bottom color</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0</xalign> <xalign>0</xalign>
@ -258,6 +254,34 @@ Horizontal Gradient
</widget> </widget>
</widget> </widget>
<widget>
<class>GtkCheckButton</class>
<name>auto_apply</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>auto_apply_toggled_cb</handler>
<last_modification_time>Thu, 21 Dec 2000 19:52:25 GMT</last_modification_time>
</signal>
<label>Apply changes automatically</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
<left_attach>0</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget> <widget>
<class>GtkFrame</class> <class>GtkFrame</class>
<name>wallpaper_frame</name> <name>wallpaper_frame</name>
@ -265,16 +289,25 @@ Horizontal Gradient
<label_xalign>0</label_xalign> <label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child> <child>
<padding>0</padding> <left_attach>0</left_attach>
<expand>True</expand> <right_attach>2</right_attach>
<fill>True</fill> <top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child> </child>
<widget> <widget>
<class>GtkTable</class> <class>GtkTable</class>
<name>table3</name> <name>table3</name>
<border_width>4</border_width> <border_width>4</border_width>
<rows>2</rows> <rows>4</rows>
<columns>3</columns> <columns>3</columns>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<row_spacing>4</row_spacing> <row_spacing>4</row_spacing>
@ -309,7 +342,7 @@ Horizontal Gradient
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label4</name> <name>label4</name>
<label>Effect</label> <label>Display Style</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0</xalign> <xalign>0</xalign>
@ -340,7 +373,6 @@ Horizontal Gradient
Centered Centered
Scaled (keep aspect ratio) Scaled (keep aspect ratio)
Stretched (change aspect ratio) Stretched (change aspect ratio)
Embossed
</items> </items>
<initial_choice>0</initial_choice> <initial_choice>0</initial_choice>
<child> <child>
@ -369,6 +401,7 @@ Embossed
<last_modification_time>Fri, 08 Dec 2000 21:55:52 GMT</last_modification_time> <last_modification_time>Fri, 08 Dec 2000 21:55:52 GMT</last_modification_time>
</signal> </signal>
<label>Browse...</label> <label>Browse...</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child> <child>
<left_attach>2</left_attach> <left_attach>2</left_attach>
<right_attach>3</right_attach> <right_attach>3</right_attach>
@ -408,9 +441,6 @@ Embossed
<yfill>False</yfill> <yfill>False</yfill>
</child> </child>
</widget> </widget>
</widget>
</widget>
</widget>
<widget> <widget>
<class>GtkCheckButton</class> <class>GtkCheckButton</class>
@ -421,13 +451,22 @@ Embossed
<handler>adjust_opacity_toggled_cb</handler> <handler>adjust_opacity_toggled_cb</handler>
<last_modification_time>Thu, 21 Dec 2000 19:54:21 GMT</last_modification_time> <last_modification_time>Thu, 21 Dec 2000 19:54:21 GMT</last_modification_time>
</signal> </signal>
<label>Adjust wallpaper's opacity</label> <label>Adjust wallpaper's transparency</label>
<active>False</active> <active>False</active>
<draw_indicator>True</draw_indicator> <draw_indicator>True</draw_indicator>
<child> <child>
<padding>0</padding> <left_attach>0</left_attach>
<expand>False</expand> <right_attach>3</right_attach>
<fill>False</fill> <top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child> </child>
</widget> </widget>
@ -437,28 +476,19 @@ Embossed
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<spacing>4</spacing> <spacing>4</spacing>
<child> <child>
<padding>0</padding> <left_attach>0</left_attach>
<expand>False</expand> <right_attach>3</right_attach>
<fill>False</fill> <top_attach>3</top_attach>
</child> <bottom_attach>4</bottom_attach>
<widget>
<class>GtkLabel</class>
<name>label10</name>
<width>16</width>
<label></label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
<child> <xexpand>False</xexpand>
<padding>0</padding> <yexpand>True</yexpand>
<expand>False</expand> <xshrink>False</xshrink>
<fill>False</fill> <yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child> </child>
</widget>
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
@ -487,10 +517,10 @@ Embossed
<policy>GTK_UPDATE_CONTINUOUS</policy> <policy>GTK_UPDATE_CONTINUOUS</policy>
<value>0</value> <value>0</value>
<lower>0</lower> <lower>0</lower>
<upper>0</upper> <upper>256</upper>
<step>0</step> <step>2.56</step>
<page>0</page> <page>25.6</page>
<page_size>0</page_size> <page_size>25.6</page_size>
<child> <child>
<padding>0</padding> <padding>0</padding>
<expand>True</expand> <expand>True</expand>
@ -515,24 +545,34 @@ Embossed
</child> </child>
</widget> </widget>
</widget> </widget>
</widget>
</widget>
<widget> <widget>
<class>GtkCheckButton</class> <class>GtkFrame</class>
<name>auto_apply</name> <name>monitor_frame</name>
<can_focus>True</can_focus> <width>210</width>
<signal> <height>170</height>
<name>toggled</name> <label_xalign>0</label_xalign>
<handler>auto_apply_toggled_cb</handler> <shadow_type>GTK_SHADOW_NONE</shadow_type>
<last_modification_time>Thu, 21 Dec 2000 19:52:25 GMT</last_modification_time>
</signal>
<label>Apply changes automatically</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child> <child>
<padding>0</padding> <left_attach>1</left_attach>
<expand>False</expand> <right_attach>2</right_attach>
<fill>False</fill> <top_attach>0</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child> </child>
<widget>
<class>Placeholder</class>
</widget>
</widget> </widget>
</widget> </widget>
</widget> </widget>

39
capplets/background/background-properties.glade.h
View file

@ -1,33 +1,30 @@
/*n * Fil med oversettbare strenger generert av Glade. /*
* Legg till denne filen i ditt prosjekts POTFILES.in. * Translatable strings file generated by Glade.
* IKKE kompiler den som en del av applikasjonen din. * Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/ */
gchar *s = N_("window1"); gchar *s = N_("window2");
gchar *s = N_("Use GNOME for setting background"); gchar *s = N_("Use GNOME for setting background");
gchar *s = N_("Colors"); gchar *s = N_("Colors");
gchar *s = N_("Effect"); gchar *s = N_("Effect");
gchar *s = N_("Color 1"); gchar *s = N_("Primary color");
gchar *s = N_("Color 2"); gchar *s = N_("Right or bottom color");
gchar *s = N_("Pick a color"); gchar *s = N_("Pick a color");
gchar *s = N_("Pick a color"); gchar *s = N_("Pick a color");
gchar *s = N_("Solid Color\n" gchar *s = N_("Solid Color");
"Vertical Gradient\n" gchar *s = N_("Vertical Gradient");
"Horizontal Gradient\n" gchar *s = N_("Horizontal Gradient");
""); gchar *s = N_("Apply changes automatically");
gchar *s = N_("Wallpaper"); gchar *s = N_("Wallpaper");
gchar *s = N_("File"); gchar *s = N_("File");
gchar *s = N_("Effect"); gchar *s = N_("Display Style");
gchar *s = N_("Tiled\n" gchar *s = N_("Tiled");
"Centered\n" gchar *s = N_("Centered");
"Scaled (keep aspect ratio)\n" gchar *s = N_("Scaled (keep aspect ratio)");
"Stretched (change aspect ratio)\n" gchar *s = N_("Stretched (change aspect ratio)");
"Embossed\n"
"");
gchar *s = N_("Browse..."); gchar *s = N_("Browse...");
gchar *s = N_("(None)\n" gchar *s = N_("(None)");
""); gchar *s = N_("Adjust wallpaper's transparency");
gchar *s = N_("Adjust wallpaper's opacity");
gchar *s = N_("More Transparent"); gchar *s = N_("More Transparent");
gchar *s = N_("More Solid"); gchar *s = N_("More Solid");
gchar *s = N_("Apply changes automatically");

2
capplets/background/main.c
View file

@ -59,7 +59,7 @@ store_archive_data (void)
location = archive_get_current_location (archive); location = archive_get_current_location (archive);
xml_doc = preferences_write_xml (prefs); xml_doc = preferences_write_xml (prefs);
location_store_xml (location, "background-properties-capplet", location_store_xml (location, "background-properties-capplet",
xml_doc); xml_doc, STORE_MASK_PREVIOUS);
xmlFreeDoc (xml_doc); xmlFreeDoc (xml_doc);
archive_close (archive); archive_close (archive);
} }

16
capplets/background/preferences.c
View file

@ -210,12 +210,14 @@ preferences_load (Preferences *prefs)
gnome_config_get_int ("/Background/Default/wallpaperAlign=0"); gnome_config_get_int ("/Background/Default/wallpaperAlign=0");
prefs->wallpaper_filename = prefs->wallpaper_filename =
gnome_config_get_string ("/Background/Default/wallpaper=(None)"); gnome_config_get_string
("/Background/Default/wallpaper=(None)");
prefs->wallpaper_sel_path = prefs->wallpaper_sel_path =
gnome_config_get_string gnome_config_get_string
("/Background/Default/wallpapers_dir=./"); ("/Background/Default/wallpapers_dir=./");
prefs->auto_apply = gnome_config_get_bool ("/Background/Default/autoApply=true"); prefs->auto_apply =
gnome_config_get_bool ("/Background/Default/autoApply=true");
if (!g_strcasecmp (prefs->wallpaper_filename, "(None)")) { if (!g_strcasecmp (prefs->wallpaper_filename, "(None)")) {
g_free(prefs->wallpaper_filename); g_free(prefs->wallpaper_filename);
@ -232,15 +234,19 @@ preferences_load (Preferences *prefs)
wp1 = gnome_config_get_string (wp); wp1 = gnome_config_get_string (wp);
g_free (wp); g_free (wp);
if (!wp1) continue; if (wp1 == NULL) continue;
prefs->wallpapers = g_slist_prepend (prefs->wallpapers, wp1); prefs->wallpapers = g_slist_prepend (prefs->wallpapers, wp1);
} }
prefs->wallpapers = g_slist_reverse (prefs->wallpapers); prefs->wallpapers = g_slist_reverse (prefs->wallpapers);
prefs->adjust_opacity = gnome_config_get_bool ("/Background/Default/adjustOpacity=true"); prefs->adjust_opacity =
gnome_config_get_bool
("/Background/Default/adjustOpacity=true");
prefs->opacity = gnome_config_get_int ("/Background/Default/opacity=255"); prefs->opacity =
gnome_config_get_int ("/Background/Default/opacity=255");
} }
void void

1143
capplets/background/prefs-widget.c
View file

File diff suppressed because it is too large Load diff

4
capplets/screensaver/ChangeLog
View file

@ -1,3 +1,7 @@
2001-03-12 Bradford Hovinen <hovinen@ximian.com>
* main.c (store_archive_data): Fix call to location_store_xml
2001-01-25 Bradford Hovinen <hovinen@ximian.com> 2001-01-25 Bradford Hovinen <hovinen@ximian.com>
* main.c (store_archive_data): Implement; copy from * main.c (store_archive_data): Implement; copy from

2
capplets/screensaver/main.c
View file

@ -62,7 +62,7 @@ store_archive_data (void)
location = archive_get_current_location (archive); location = archive_get_current_location (archive);
xml_doc = preferences_write_xml (prefs); xml_doc = preferences_write_xml (prefs);
location_store_xml (location, "screensaver-properties-capplet", location_store_xml (location, "screensaver-properties-capplet",
xml_doc); xml_doc, STORE_MASK_PREVIOUS);
xmlFreeDoc (xml_doc); xmlFreeDoc (xml_doc);
archive_close (archive); archive_close (archive);
} }