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

fix passing and parsing of command line args

Browse source 
2007-06-10  Jens Granseuer  <jensgr@gmx.net>

	* appearance-main.c: (init_appearance_data), (main):
	* appearance.h: fix passing and parsing of command line args

	* appearance-style.c: (update_color_buttons_from_settings),
	(check_color_schemes_enabled): fix leaks

	* appearance.glade: revert response_id sillyness from last commit

svn path=/trunk/; revision=7711
This commit is contained in:
Jens Granseuer 2007-06-10 17:37:00 +00:00 • committed by Jens Granseuer
parent 19cfd08b3d
commit a5189eddb9
5 changed files with 22 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

10
capplets/appearance/ChangeLog
View file

@ -1,3 +1,13 @@
2007-06-10 Jens Granseuer <jensgr@gmx.net>
* appearance-main.c: (init_appearance_data), (main):
* appearance.h: fix passing and parsing of command line args
* appearance-style.c: (update_color_buttons_from_settings),
(check_color_schemes_enabled): fix leaks
* appearance.glade: revert response_id sillyness from last commit
2007-06-09 Denis Washington <denisw@svn.gnome.org>
* appearance.glade:

10
capplets/appearance/appearance-main.c
View file

@ -34,15 +34,15 @@
/* ---------------------------------- */
static AppearanceData *
init_appearance_data (int argc, char **argv)
init_appearance_data (int *argc, char ***argv)
{
AppearanceData *data = NULL;
gchar *gladefile;
GladeXML *ui;
g_thread_init (NULL);
theme_thumbnail_factory_init (argc, argv);
gtk_init (&argc, &argv);
theme_thumbnail_factory_init (*argc, *argv);
gtk_init (argc, argv);
gnome_vfs_init ();
activate_settings_daemon ();
@ -55,8 +55,6 @@ init_appearance_data (int argc, char **argv)
data = g_new (AppearanceData, 1);
data->client = gconf_client_get_default ();
data->xml = ui;
data->argc = argc;
data->argv = argv;
}
return data;
@ -89,7 +87,7 @@ main (int argc, char **argv)
GnomeProgram *program;
/* init */
data = init_appearance_data (argc, argv);
data = init_appearance_data (&argc, &argv);
if (!data)
return 1;

10
capplets/appearance/appearance-style.c
View file

@ -399,13 +399,13 @@ update_color_buttons_from_settings (GtkSettings *settings,
theme = gconf_client_get_string (data->client, gconf_keys[COLOR_SCHEME], NULL);
if (theme == NULL || strcmp (theme, "") == 0)
{
g_free (theme);
gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), FALSE);
g_object_get (G_OBJECT (settings), "gtk-color-scheme", &theme, NULL);
}
update_color_buttons_from_string (theme, data);
g_free (theme);
}
static void
@ -426,16 +426,22 @@ check_color_schemes_enabled (GtkSettings *settings,
gboolean fg, bg, base, text, fg_s, bg_s, enable_colors;
g_object_get (G_OBJECT (settings), "gtk-theme-name", &theme, NULL);
filename = gtkrc_find_named (theme);
g_free (theme);
gtkrc_get_details (filename, &engines, &symbolic_colors);
g_free (filename);
fg = (g_slist_find_custom (symbolic_colors, "fg_color", g_str_equal) != NULL);
bg = (g_slist_find_custom (symbolic_colors, "bg_color", g_str_equal) != NULL);
base = (g_slist_find_custom (symbolic_colors, "base_color", g_str_equal) != NULL);
text = (g_slist_find_custom (symbolic_colors, "text_color", g_str_equal) != NULL);
fg_s = (g_slist_find_custom (symbolic_colors, "selected_fg_color", g_str_equal) != NULL);
bg_s = (g_slist_find_custom (symbolic_colors, "selected_bg_color", g_str_equal) != NULL);
g_slist_foreach (symbolic_colors, (GFunc) g_free, NULL);
g_slist_free (symbolic_colors);
g_slist_foreach (engines, (GFunc) g_free, NULL);
g_slist_free (engines);
enable_colors = (fg && bg && base && text && fg_s && bg_s);

45
capplets/appearance/appearance.glade
View file

@ -101,7 +101,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_None</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@ -137,7 +136,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">Gra_yscale</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">antialias_none_radio</property>
</widget>
@ -176,7 +174,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">Sub_pixel (LCDs)</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">antialias_none_radio</property>
</widget>
@ -245,7 +242,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">N_one</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@ -278,7 +274,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Slight</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">hint_none_radio</property>
</widget>
@ -317,7 +312,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Medium</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">hint_none_radio</property>
</widget>
@ -356,7 +350,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Full</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">hint_none_radio</property>
</widget>
@ -430,7 +423,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_RGB</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
</child>
@ -457,7 +449,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_BGR</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">subpixel_rgb_radio</property>
</widget>
@ -490,7 +481,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">_VRGB</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">subpixel_rgb_radio</property>
</widget>
@ -523,7 +513,6 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">VB_GR</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">subpixel_rgb_radio</property>
</widget>
@ -672,7 +661,6 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Install...</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
</child>
<child>
@ -682,7 +670,6 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-delete</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="position">1</property>
@ -695,7 +682,6 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">C_ustom...</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="position">2</property>
@ -834,7 +820,6 @@ Tiled</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Add...</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
@ -849,7 +834,6 @@ Tiled</property>
<property name="can_focus">True</property>
<property name="label">gtk-remove</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="expand">False</property>
@ -940,7 +924,6 @@ Vertical gradient</property>
<widget class="GtkColorButton" id="wp_pcpicker">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<accessibility>
<atkproperty name="AtkObject::accessible_description" translatable="yes">Open a dialog to specify the color</atkproperty>
</accessibility>
@ -954,7 +937,6 @@ Vertical gradient</property>
<child>
<widget class="GtkColorButton" id="wp_scpicker">
<property name="can_focus">True</property>
<property name="response_id">0</property>
<accessibility>
<atkproperty name="AtkObject::accessible_description" translatable="yes">Open a dialog to specify the color</atkproperty>
</accessibility>
@ -1007,7 +989,6 @@ Vertical gradient</property>
<widget class="GtkFontButton" id="document_font">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="use_font">True</property>
</widget>
<packing>
@ -1037,7 +1018,6 @@ Vertical gradient</property>
<widget class="GtkFontButton" id="desktop_font">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="use_font">True</property>
</widget>
<packing>
@ -1053,7 +1033,6 @@ Vertical gradient</property>
<widget class="GtkFontButton" id="window_title_font">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="use_font">True</property>
</widget>
<packing>
@ -1069,7 +1048,6 @@ Vertical gradient</property>
<widget class="GtkFontButton" id="monospace_font">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="use_font">True</property>
</widget>
<packing>
@ -1130,7 +1108,6 @@ Vertical gradient</property>
<widget class="GtkFontButton" id="application_font">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
<property name="use_font">True</property>
</widget>
<packing>
@ -1194,7 +1171,6 @@ Vertical gradient</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Sub_pixel smoothing (LCDs)</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">monochrome_radio</property>
</widget>
@ -1234,7 +1210,6 @@ Vertical gradient</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Best co_ntrast</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">monochrome_radio</property>
</widget>
@ -1272,7 +1247,6 @@ Vertical gradient</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Best _shapes</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">monochrome_radio</property>
</widget>
@ -1310,7 +1284,6 @@ Vertical gradient</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Monochrome</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@ -1357,7 +1330,6 @@ Vertical gradient</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">D_etails...</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
</child>
</widget>
@ -1428,7 +1400,6 @@ Vertical gradient</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Show _icons in menus</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@ -1443,7 +1414,6 @@ Vertical gradient</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Editable menu shortcut keys</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@ -1880,7 +1850,6 @@ Text only</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Install...</property>
<property name="response_id">0</property>
</widget>
</child>
<child>
@ -1891,7 +1860,6 @@ Text only</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">gtk-delete</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="position">1</property>
@ -2026,7 +1994,6 @@ Text only</property>
<widget class="GtkColorButton" id="bg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -2041,7 +2008,6 @@ Text only</property>
<widget class="GtkColorButton" id="base_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -2056,7 +2022,6 @@ Text only</property>
<widget class="GtkColorButton" id="selected_bg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -2084,7 +2049,6 @@ Text only</property>
<widget class="GtkColorButton" id="fg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">2</property>
@ -2099,7 +2063,6 @@ Text only</property>
<widget class="GtkColorButton" id="text_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">2</property>
@ -2114,7 +2077,6 @@ Text only</property>
<widget class="GtkColorButton" id="selected_fg_colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="left_attach">2</property>
@ -2143,7 +2105,6 @@ Text only</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Reset To Defaults</property>
<property name="response_id">0</property>
</widget>
</child>
</widget>
@ -2209,7 +2170,6 @@ Text only</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Install...</property>
<property name="response_id">0</property>
</widget>
</child>
<child>
@ -2220,7 +2180,6 @@ Text only</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">gtk-delete</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="position">1</property>
@ -2289,7 +2248,6 @@ Text only</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Install...</property>
<property name="response_id">0</property>
</widget>
</child>
<child>
@ -2300,7 +2258,6 @@ Text only</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">gtk-delete</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="position">1</property>
@ -2369,7 +2326,6 @@ Text only</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Install...</property>
<property name="response_id">0</property>
</widget>
</child>
<child>
@ -2380,7 +2336,6 @@ Text only</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">gtk-delete</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="position">1</property>

2
capplets/appearance/appearance.h
View file

@ -31,8 +31,6 @@
typedef struct {
GConfClient *client;
int argc;
char **argv;
GladeXML *xml;
/* desktop */