Attachment #191586 for bug #236062

View | Details | Raw Unified | Return to bug 236062
Collapse All | Expand All





	while (*cdir)
	{
		gchar	*path;

		path = g_strconcat(*cdir, "/", dir, NULL);
		if (exists(path))

 * The return values may be NULL - use built-in defaults.
 * g_free() the result.
 */
gchar *choices_find_path_load(char *leaf, char *dir)
{
	gchar	**cdir = dir_list;


 *
 * g_free() the result.
 */
gchar *choices_find_path_save(char *leaf, char *dir, gboolean create)
{
	gchar	*path, *retval;
	

Lines 12-18 Link Here

(-)src-old/choices.h (-2 / +2 lines)
12	void choices_init (void);	12	void choices_init (void);
13	GPtrArray choices_list_dirs (char dir);	13	GPtrArray choices_list_dirs (char dir);
14	void choices_free_list (GPtrArray *list);	14	void choices_free_list (GPtrArray *list);
15	guchar choices_find_path_load(char leaf, char *dir);	15	gchar choices_find_path_load(char leaf, char *dir);
16	guchar choices_find_path_save(char leaf, char *dir, gboolean create);	16	gchar choices_find_path_save(char leaf, char *dir, gboolean create);
17		17
18	#endif /* _CHOICES_H */	18	#endif /* _CHOICES_H */





	if (!DPMSQueryExtension(dpy, &event, &error))
	{
		g_warning("%s", _("DPMS extension not supported"));
		return FALSE;
	}
	if (!DPMSCapable(dpy))
	{
		g_warning("%s", _("Display not capable of DPMS"));
		return FALSE;
	}
	return TRUE;


	if (standby < 10 || suspend < 10 || off < 10)
	{
		g_warning("%s", _("DPMS timeout under 10 seconds, rounding up"));
		if (standby < 10) standby = 10;
		if (suspend < 10) suspend = 10;
		if (off < 10) off = 10;
	}
	if (!DPMSGetTimeouts(dpy, &old_standby, &old_suspend, &old_off))
	{
		g_warning("%s", _("Unable to read previous DPMS timeouts"));
		old_standby = old_suspend = old_off = 0;
	}
	if (old_standby != standby || old_suspend != suspend || old_off != off)
	{
		if (!DPMSSetTimeouts(dpy, standby, suspend, off))
			g_warning("%s", _("Unable to set DPMS timeouts"));
	}
}


		return;
	if (!DPMSInfo(dpy, &old_power, &old_enabled))
	{
		g_warning("%s", _("Unable to get DPMS state"));
		old_enabled = ! enable;
	}
	if (old_enabled != enable)
	{
		if (!(enable ? DPMSEnable(dpy) : DPMSDisable(dpy)))
			g_warning("%s", _("Unable to set DPMS state"));
	}
}





static GtkWidget *i18n_message = NULL;

/* Static Prototypes */
static void set_trans(const gchar *lang);
static void trans_changed(void);
static GList *build_i18n_message(Option *option, xmlNode *node, gchar *label);

/****************************************************************
 *			EXTERNAL INTERFACE			*

/* Load the 'Messages/<name>.gmo' translation.
 * Special values 'None' and 'From LANG' are also allowed.
 */
static void set_trans(const gchar *lang)
{
	struct stat info;
	gchar	*path;
	gchar	*lang2 = NULL;

	g_return_if_fail(lang != NULL);

	g_free(path);
}

static GList *build_i18n_message(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget *hbox, *image, *align;





			 GdkInputCondition condition);
static gint log_clicked(GtkWidget *text, GdkEventButton *bev, gpointer data);
static void log_msg(const gchar *text, gint len);
static GList *show_log(Option *option, xmlNode *node, gchar *label);
void show_message_log(void);
static void log_own_errors(const gchar *log_domain,
			   GLogLevelFlags log_level,

	g_print("%s\n", message);
}

static void write_stderr(gchar *buffer, int len)
{
	int	pos = 0, sent;


			 gint source,
			 GdkInputCondition condition)
{
	gchar	buffer[BUFFER_SIZE];
	int	got;

	got = read(source, buffer, BUFFER_SIZE);

	return 1;
}

static GList *show_log(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget *button, *align;





};
#endif

gchar *app_dir;

int main(int argc, char **argv)
{
	gboolean		wait_mode = FALSE;
	gboolean		messages = FALSE;
	gboolean		no_xkb = FALSE;
	gchar			*rc_file;

	app_dir = g_strdup(getenv("APP_DIR"));


void login_failure(int error)
{
	GString		*message;
	gchar		*login;

	login = choices_find_path_load("Login", "ROX-Session");
	if (!login)

Lines 9-15 Link Here

(-)src-old/main.h (-1 / +1 lines)
9	#define _MAIN_H	9	#define _MAIN_H
10		10
11	extern int number_of_windows;	11	extern int number_of_windows;
12	extern guchar *app_dir;	12	extern gchar *app_dir;
13	extern gboolean test_mode;	13	extern gboolean test_mode;
14		14
15	/* Prototypes */	15	/* Prototypes */




static void load_options(xmlDoc *doc);
static gboolean check_anything_changed(void);

static GList *build_label(Option *option, xmlNode *node, gchar *label);
static GList *build_spacer(Option *option, xmlNode *node, gchar *label);
static GList *build_frame(Option *option, xmlNode *node, gchar *label);

static GList *build_toggle(Option *option, xmlNode *node, gchar *label);
static GList *build_slider(Option *option, xmlNode *node, gchar *label);
static GList *build_entry(Option *option, xmlNode *node, gchar *label);
static GList *build_numentry(Option *option, xmlNode *node, gchar *label);
static GList *build_radio_group(Option *option, xmlNode *node, gchar *label);
static GList *build_colour(Option *option, xmlNode *node, gchar *label);
static GList *build_menu(Option *option, xmlNode *node, gchar *label);
static GList *build_font(Option *option, xmlNode *node, gchar *label);

/****************************************************************
 *			EXTERNAL INTERFACE			*

 */
void option_check_widget(Option *option)
{
	gchar		*new = NULL;

	if (updating_widgets)
		return;		/* Not caused by the user... */

/* These are used during parsing... */
static xmlDocPtr options_doc = NULL;

#define DATA(node) (gchar*)(xmlNodeListGetString(options_doc, node->xmlChildrenNode, 1))

static void may_add_tip(GtkWidget *widget, xmlNode *element)
{
	gchar	*data, *tip;

	data = DATA(element);
	if (!data)

}

/* Returns zero if attribute is not present */
static int get_int(xmlNode *node, gchar *attr)
{
	gchar *txt;
	int	retval;
	guchar* my_attr = (guchar *)attr;

	txt = (gchar*)xmlGetProp(node, my_attr);
	if (!txt)
		return 0;


	g_return_if_fail(node != NULL);
	g_return_if_fail(widget != NULL);

	name = xmlGetProp(node, (xmlChar*)"sizegroup");
	if (!name)
		return;


{
	GtkWidget	*button;
	GtkRadioButton	*prev_button = (GtkRadioButton *) prev;
	gchar		*label;

	label = (gchar*)xmlGetProp(radio, (xmlChar*)"label");

	button = gtk_radio_button_new_with_label(
			prev_button ? gtk_radio_button_get_group(prev_button)

	may_add_tip(button, radio);

	g_object_set_data(G_OBJECT(button), "value",
			  xmlGetProp(radio, (xmlChar*)"value"));

	return button;
}

static void build_menu_item(xmlNode *node, GtkWidget *option_menu)
{
	GtkWidget	*item, *menu;
	gchar		*label;

	g_return_if_fail(strcmp((gchar*)node->name, "item") == 0);

	label = (gchar*)xmlGetProp(node, (xmlChar*)"label");
	item = gtk_menu_item_new_with_label(_(label));
	g_free(label);


	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
	gtk_widget_show_all(menu);

	g_object_set_data(G_OBJECT(item), "value", xmlGetProp(node, (xmlChar*)"value"));
}

static void build_widget(xmlNode *widget, GtkWidget *box)
{
	const char *name = (gchar*)widget->name;
	OptionBuildFn builder;
	gchar	*oname;
	Option	*option;
	gchar	*label;

	label = (gchar*)xmlGetProp(widget, (xmlChar*)"label");

	if (strcmp(name, "hbox") == 0 || strcmp(name, "vbox") == 0)
	{

		return;
	}

	oname = (gchar*)xmlGetProp(widget, (xmlChar*)"name");

	if (oname)
	{

static void build_section(xmlNode *section, GtkWidget *notebook,
			  GtkTreeStore *tree_store, GtkTreeIter *parent)
{
	gchar 		*title = NULL;
	GtkWidget   	*page;
	GtkTreeIter	iter;
	xmlNode		*widget;

	title = (gchar*)xmlGetProp(section, (xmlChar*)"title");
	page = gtk_vbox_new(FALSE, 4);
	gtk_container_set_border_width(GTK_CONTAINER(page), 4);
	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, NULL);

	{
		if (widget->type == XML_ELEMENT_NODE)
		{
			if (strcmp((gchar*)widget->name, "section") == 0)
				build_section(widget, notebook,
						tree_store, &iter);
			else

	g_free(path);

	options = xmlDocGetRootElement(options_doc);
	if (strcmp((gchar*)options->name, "options") == 0)
	{
		GtkTreePath *treepath;


/* Given the last radio button in the group, select whichever
 * radio button matches the given value.
 */
static void radio_group_set_value(GtkRadioButton *last, gchar *value)
{	
	GSList	*next;

	for (next = gtk_radio_button_get_group(last); next; next = next->next)
	{
		GtkToggleButton *button = (GtkToggleButton *) next->data;
		gchar	*val;

		val = g_object_get_data(G_OBJECT(button), "value");
		g_return_if_fail(val != NULL);

/* Given the last radio button in the group, return a copy of the
 * value for the selected radio item.
 */
static gchar *radio_group_get_value(GtkRadioButton *last)
{
	GSList	*next;



		if (gtk_toggle_button_get_active(button))
		{
			gchar	*val;

			val = g_object_get_data(G_OBJECT(button), "value");
			g_return_val_if_fail(val != NULL, NULL);

}

/* Select this item with this value */
static void option_menu_set(GtkOptionMenu *om, gchar *value)
{
	GtkWidget *menu;
	GList	  *list, *next;

	for (next = list; next; next = next->next)
	{
		GObject	*item = (GObject *) next->data;
		gchar	*data;

		data = g_object_get_data(item, "value");
		g_return_if_fail(data != NULL);

}

/* Get the value (static) of the selected item */
static gchar *option_menu_get(GtkOptionMenu *om)
{
	GtkWidget *menu, *item;


	Option *option = (Option *) value;
	xmlNodePtr tree;

	tree = xmlNewTextChild(doc, NULL, (xmlChar*)"Option", (xmlChar*)option->value);
	xmlSetProp(tree, (xmlChar*)"name", (guchar *) key);
}

static void save_options(void)
{
	xmlDoc	*doc;
	GList	*next;
	gchar	*save, *save_new;

	save = choices_find_path_save("Options", PROJECT, TRUE);
	if (!save)


	save_new = g_strconcat(save, ".new", NULL);

	doc = xmlNewDoc((xmlChar*)"1.0");
	xmlDocSetRootElement(doc, xmlNewDocNode(doc, NULL, (xmlChar*)"Options", NULL));

	g_hash_table_foreach(option_hash, write_option,
				xmlDocGetRootElement(doc));

	
	gtk_label_set_text(GTK_LABEL(option->widget),
			   have_font ? option->value
				     : _("(use default)"));
}

static void update_colour(Option *option)

 * from the widget.
 */

static gchar *read_toggle(Option *option)
{
	GtkToggleButton *toggle = GTK_TOGGLE_BUTTON(option->widget);

	return g_strdup_printf("%d", gtk_toggle_button_get_active(toggle));
}

static gchar *read_entry(Option *option)
{
	return gtk_editable_get_chars(GTK_EDITABLE(option->widget), 0, -1);
}

static gchar *read_numentry(Option *option)
{
	return g_strdup_printf("%d", (int)
		gtk_spin_button_get_value(GTK_SPIN_BUTTON(option->widget)));
}

static gchar *read_slider(Option *option)
{
	return g_strdup_printf("%d", (int)
		gtk_range_get_adjustment(GTK_RANGE(option->widget))->value);
}

static gchar *read_radio_group(Option *option)
{
	return radio_group_get_value(GTK_RADIO_BUTTON(option->widget));
}

static gchar *read_menu(Option *option)
{
	return g_strdup(option_menu_get(GTK_OPTION_MENU(option->widget)));
}

static gchar *read_font(Option *option)
{
	GtkToggleButton *active;


	return g_strdup(gtk_label_get_text(GTK_LABEL(option->widget)));
}

static gchar *read_colour(Option *option)
{
	GtkStyle *style = GTK_BIN(option->widget)->child->style;



/* Builders for decorations (no corresponding option) */

static GList *build_label(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget *widget;
	gchar *text;
	int help;

	g_return_val_if_fail(option == NULL, NULL);

	return g_list_append(NULL, widget);
}

static GList *build_spacer(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget *eb;


	return g_list_append(NULL, eb);
}

static GList *build_frame(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget *nbox, *frame, *label_widget;
	xmlNode	  *hw;

 * callbacks.
 */

static GList *build_toggle(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget	*toggle;


	return g_list_append(NULL, toggle);
}

static GList *build_slider(Option *option, xmlNode *node, gchar *label)
{
	GtkAdjustment *adj;
	GtkWidget *hbox, *slide, *label_wid;
	int	min, max;
	int	fixed;
	int	showvalue;
	gchar	*end;

	g_return_val_if_fail(option != NULL, NULL);


		add_to_size_group(node, label_wid);
	}

	end = (gchar*)xmlGetProp(node, (xmlChar*)"end");
	if (end)
	{
		gtk_box_pack_end(GTK_BOX(hbox), gtk_label_new(_(end)),

	return g_list_append(NULL, hbox);
}

static GList *build_entry(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget	*hbox;
	GtkWidget	*entry;

	return g_list_append(NULL, hbox);
}

static GList *build_numentry(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget	*hbox;
	GtkWidget	*spin;
	GtkWidget	*label_wid;
	gchar		*unit;
	int		min, max, step, width;

	g_return_val_if_fail(option != NULL, NULL);

	max = get_int(node, "max");
	step = get_int(node, "step");
	width = get_int(node, "width");
	unit = (gchar*)xmlGetProp(node, (xmlChar*)"unit");
	
	hbox = gtk_hbox_new(FALSE, 4);


	return g_list_append(NULL, hbox);
}

static GList *build_radio_group(Option *option, xmlNode *node, gchar *label)
{
	GList		*list = NULL;
	GtkWidget	*button = NULL;

	return list;
}

static GList *build_colour(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget	*hbox, *da, *button, *label_wid;
	

	return g_list_append(NULL, hbox);
}

static GList *build_menu(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget	*hbox, *om, *option_menu, *label_wid;
	xmlNode		*item;

	return g_list_append(NULL, hbox);
}

static GList *build_font(Option *option, xmlNode *node, gchar *label)
{
	GtkWidget	*hbox, *button;
	GtkWidget	*active = NULL;


	root = xmlDocGetRootElement(doc);
	
	g_return_if_fail(strcmp((const gchar*)root->name, "Options") == 0);

	for (node = root->xmlChildrenNode; node; node = node->next)
	{
		gchar *name;
		gchar *value;

		if (node->type != XML_ELEMENT_NODE)
			continue;
		if (strcmp((gchar*)node->name, "Option") != 0)
			continue;
		name = (gchar*)xmlGetProp(node, (xmlChar*)"name");
		if (!name)
			continue;

		value = (gchar*)xmlNodeGetContent(node);

		if (g_hash_table_lookup(loading, name))
			g_warning("Duplicate option found!");




#include <gtk/gtk.h>

typedef void OptionNotify(void);
typedef GList * (*OptionBuildFn)(Option *option, xmlNode *node, gchar *label);

struct _Option {
	gchar		*value;
	long		int_value;
	gboolean	has_changed;

	gchar		*backup;	/* Copy of value to Revert to */

	GtkWidget	*widget;		/* NULL => No UI yet */
	void		(*update_widget)(Option *option);
	gchar *		(*read_widget)(Option *option);
};

/* Prototypes */




		{
			if (child->type != XML_ELEMENT_NODE)
				continue;
			if (strcmp((gchar*)child->name, "Setting") != 0)
				continue;

			set_from_xml(child);

	}
	else
	{
		settings_doc = xmlNewDoc((xmlChar*)"1.0");
		xmlDocSetRootElement(settings_doc,
				xmlNewDocNode(settings_doc, NULL, (xmlChar*)"Settings", NULL));
		if (manage_xsettings.int_value)
		{
			/* Override annoying defaults... */

	xmlNode *node;

	node = get_node(name, TRUE);
	xmlSetProp(node, (xmlChar*)"value", (xmlChar*)value);
	xmlSetProp(node, (xmlChar*)"type", (xmlChar*)"string");

	set_from_xml(node);
	activate_changes();


		if (child->type != XML_ELEMENT_NODE)
			continue;
		if (strcmp((gchar*)child->name, "Setting") != 0)
			continue;
		attr_name = (gchar*)xmlGetProp(child, (xmlChar*)"name");
		if (!attr_name)
		{
			g_warning("Malformed <Setting>");

	if (!create_if_missing)
		return NULL;

	child = xmlNewDocNode(settings_doc, NULL, (xmlChar*)"Setting", NULL);
	xmlSetProp(child, (xmlChar*)"name", (xmlChar*)name);
	xmlAddChild(root, child);
	return child;
}

	str = g_strdup_printf("%d", value);

	node = get_node(name, TRUE);
	xmlSetProp(node, (xmlChar*)"value", (xmlChar*)str);
	xmlSetProp(node, (xmlChar*)"type", (xmlChar*)"int");

	g_free(str);
	

				ROX_XSETTINGS_NS, "GetSetting"))
	{
		DBusMessage *reply;
		guchar *type, *value;
		xmlNode *node;

		if (!dbus_message_get_args(message, error,

			return dbus_message_new_error(message, MISSING_SETTING_ERROR,
					"Missing setting");

		type = xmlGetProp(node, (xmlChar*)"type");
		value = xmlGetProp(node, (xmlChar*)"value");
		if (type && value)
		{
			reply = dbus_message_new_method_return(message);

	g_warning("ROX-Session is no longer the XSETTINGS manager!");
}

static void set_setting(gchar *name, gchar *value, gchar *type)
{
	g_return_if_fail(name && type && value);



static void set_from_xml(xmlNode *setting)
{
	gchar *name, *value, *type;

	g_return_if_fail(!manage_xsettings.int_value || xsettings_manager != NULL);

	name = (gchar*)xmlGetProp(setting, (xmlChar*)"name");
	type = (gchar*)xmlGetProp(setting, (xmlChar*)"type");
	value = (gchar*)xmlGetProp(setting, (xmlChar*)"value");

	set_setting(name, value, type);





		if (delay <= 0) delay = 1;
		if (!XkbSetAutoRepeatRate(GDK_DISPLAY(), XkbUseCoreKbd,
					delay, interval))
			g_warning("%s", _("Failed to set auto repeat rate/interval"));
	}
	else
	{


	/* get key state using XKB */
	if (XkbGetIndicatorState (GDK_DISPLAY(), XkbUseCoreKbd, &states) != Success)
		g_warning ("%s", _("error in reading keyboard indicator states"));

	return (states & code) ? TRUE : FALSE;
}

		KeyCode code = XKeysymToKeycode(GDK_DISPLAY(), keysym);
		if (!XTestFakeKeyEvent (GDK_DISPLAY(), code, True, CurrentTime) ||
			!XTestFakeKeyEvent (GDK_DISPLAY(), code, False, CurrentTime)) 
			g_warning ("%s", _("error while sending fake key events"));
	}
}


Return to bug 236062

Lines 89-95 Link Here

(-)src-old/choices.c (-3 / +3 lines)
89		89
90	while (*cdir)	90	while (*cdir)
91	{	91	{
92	guchar *path;	92	gchar *path;
93		93
94	path = g_strconcat(*cdir, "/", dir, NULL);	94	path = g_strconcat(*cdir, "/", dir, NULL);
95	if (exists(path))	95	if (exists(path))
Lines 123-129 Link Here
123	* The return values may be NULL - use built-in defaults.	123	* The return values may be NULL - use built-in defaults.
124	* g_free() the result.	124	* g_free() the result.
125	*/	125	*/
126	guchar choices_find_path_load(char leaf, char *dir)	126	gchar choices_find_path_load(char leaf, char *dir)
127	{	127	{
128	gchar **cdir = dir_list;	128	gchar **cdir = dir_list;
129		129
Lines 153-159 Link Here
153	*	153	*
154	* g_free() the result.	154	* g_free() the result.
155	*/	155	*/
156	guchar choices_find_path_save(char leaf, char *dir, gboolean create)	156	gchar choices_find_path_save(char leaf, char *dir, gboolean create)
157	{	157	{
158	gchar path, retval;	158	gchar path, retval;
159		159

Lines 32-43 Link Here

(-)src-old/dpms.c (-7 / +7 lines)
32		32
33	if (!DPMSQueryExtension(dpy, &event, &error))	33	if (!DPMSQueryExtension(dpy, &event, &error))
34	{	34	{
35	g_warning(_("DPMS extension not supported"));	35	g_warning("%s", _("DPMS extension not supported"));
36	return FALSE;	36	return FALSE;
37	}	37	}
38	if (!DPMSCapable(dpy))	38	if (!DPMSCapable(dpy))
39	{	39	{
40	g_warning(_("Display not capable of DPMS"));	40	g_warning("%s", _("Display not capable of DPMS"));
41	return FALSE;	41	return FALSE;
42	}	42	}
43	return TRUE;	43	return TRUE;
Lines 52-71 Link Here
52		52
53	if (standby < 10 \|\| suspend < 10 \|\| off < 10)	53	if (standby < 10 \|\| suspend < 10 \|\| off < 10)
54	{	54	{
55	g_warning(_("DPMS timeout under 10 seconds, rounding up"));	55	g_warning("%s", _("DPMS timeout under 10 seconds, rounding up"));
56	if (standby < 10) standby = 10;	56	if (standby < 10) standby = 10;
57	if (suspend < 10) suspend = 10;	57	if (suspend < 10) suspend = 10;
58	if (off < 10) off = 10;	58	if (off < 10) off = 10;
59	}	59	}
60	if (!DPMSGetTimeouts(dpy, &old_standby, &old_suspend, &old_off))	60	if (!DPMSGetTimeouts(dpy, &old_standby, &old_suspend, &old_off))
61	{	61	{
62	g_warning(_("Unable to read previous DPMS timeouts"));	62	g_warning("%s", _("Unable to read previous DPMS timeouts"));
63	old_standby = old_suspend = old_off = 0;	63	old_standby = old_suspend = old_off = 0;
64	}	64	}
65	if (old_standby != standby \|\| old_suspend != suspend \|\| old_off != off)	65	if (old_standby != standby \|\| old_suspend != suspend \|\| old_off != off)
66	{	66	{
67	if (!DPMSSetTimeouts(dpy, standby, suspend, off))	67	if (!DPMSSetTimeouts(dpy, standby, suspend, off))
68	g_warning(_("Unable to set DPMS timeouts"));	68	g_warning("%s", _("Unable to set DPMS timeouts"));
69	}	69	}
70	}	70	}
71		71
Lines 78-90 Link Here
78	return;	78	return;
79	if (!DPMSInfo(dpy, &old_power, &old_enabled))	79	if (!DPMSInfo(dpy, &old_power, &old_enabled))
80	{	80	{
81	g_warning(_("Unable to get DPMS state"));	81	g_warning("%s", _("Unable to get DPMS state"));
82	old_enabled = ! enable;	82	old_enabled = ! enable;
83	}	83	}
84	if (old_enabled != enable)	84	if (old_enabled != enable)
85	{	85	{
86	if (!(enable ? DPMSEnable(dpy) : DPMSDisable(dpy)))	86	if (!(enable ? DPMSEnable(dpy) : DPMSDisable(dpy)))
87	g_warning(_("Unable to set DPMS state"));	87	g_warning("%s", _("Unable to set DPMS state"));
88	}	88	}
89	}	89	}
90		90

Lines 46-54 Link Here

(-)src-old/i18n.c (-5 / +5 lines)
46	static GtkWidget *i18n_message = NULL;	46	static GtkWidget *i18n_message = NULL;
47		47
48	/* Static Prototypes */	48	/* Static Prototypes */
49	static void set_trans(const guchar *lang);	49	static void set_trans(const gchar *lang);
50	static void trans_changed(void);	50	static void trans_changed(void);
51	static GList build_i18n_message(Option option, xmlNode node, guchar label);	51	static GList build_i18n_message(Option option, xmlNode node, gchar label);
52		52
53	/****************************************************************	53	/****************************************************************
54	* EXTERNAL INTERFACE *	54	* EXTERNAL INTERFACE *
Lines 88-97 Link Here
88	/* Load the 'Messages/<name>.gmo' translation.	88	/* Load the 'Messages/<name>.gmo' translation.
89	* Special values 'None' and 'From LANG' are also allowed.	89	* Special values 'None' and 'From LANG' are also allowed.
90	*/	90	*/
91	static void set_trans(const guchar *lang)	91	static void set_trans(const gchar *lang)
92	{	92	{
93	struct stat info;	93	struct stat info;
94	guchar *path;	94	gchar *path;
95	gchar *lang2 = NULL;	95	gchar *lang2 = NULL;
96		96
97	g_return_if_fail(lang != NULL);	97	g_return_if_fail(lang != NULL);
Lines 124-130 Link Here
124	g_free(path);	124	g_free(path);
125	}	125	}
126		126
127	static GList build_i18n_message(Option option, xmlNode node, guchar label)	127	static GList build_i18n_message(Option option, xmlNode node, gchar label)
128	{	128	{
129	GtkWidget hbox, image, *align;	129	GtkWidget hbox, image, *align;
130		130

Lines 75-81 Link Here

(-)src-old/log.c (-4 / +4 lines)
75	GdkInputCondition condition);	75	GdkInputCondition condition);
76	static gint log_clicked(GtkWidget text, GdkEventButton bev, gpointer data);	76	static gint log_clicked(GtkWidget text, GdkEventButton bev, gpointer data);
77	static void log_msg(const gchar *text, gint len);	77	static void log_msg(const gchar *text, gint len);
78	static GList show_log(Option option, xmlNode node, guchar label);	78	static GList show_log(Option option, xmlNode node, gchar label);
79	void show_message_log(void);	79	void show_message_log(void);
80	static void log_own_errors(const gchar *log_domain,	80	static void log_own_errors(const gchar *log_domain,
81	GLogLevelFlags log_level,	81	GLogLevelFlags log_level,
Lines 366-372 Link Here
366	g_print("%s\n", message);	366	g_print("%s\n", message);
367	}	367	}
368		368
369	static void write_stderr(guchar *buffer, int len)	369	static void write_stderr(gchar *buffer, int len)
370	{	370	{
371	int pos = 0, sent;	371	int pos = 0, sent;
372		372
Lines 391-397 Link Here
391	gint source,	391	gint source,
392	GdkInputCondition condition)	392	GdkInputCondition condition)
393	{	393	{
394	guchar buffer[BUFFER_SIZE];	394	gchar buffer[BUFFER_SIZE];
395	int got;	395	int got;
396		396
397	got = read(source, buffer, BUFFER_SIZE);	397	got = read(source, buffer, BUFFER_SIZE);
Lines 503-509 Link Here
503	return 1;	503	return 1;
504	}	504	}
505		505
506	static GList show_log(Option option, xmlNode node, guchar label)	506	static GList show_log(Option option, xmlNode node, gchar label)
507	{	507	{
508	GtkWidget button, align;	508	GtkWidget button, align;
509		509

Lines 103-116 Link Here

(-)src-old/main.c (-3 / +3 lines)
103	};	103	};
104	#endif	104	#endif
105		105
106	guchar *app_dir;	106	gchar *app_dir;
107		107
108	int main(int argc, char **argv)	108	int main(int argc, char **argv)
109	{	109	{
110	gboolean wait_mode = FALSE;	110	gboolean wait_mode = FALSE;
111	gboolean messages = FALSE;	111	gboolean messages = FALSE;
112	gboolean no_xkb = FALSE;	112	gboolean no_xkb = FALSE;
113	guchar *rc_file;	113	gchar *rc_file;
114		114
115	app_dir = g_strdup(getenv("APP_DIR"));	115	app_dir = g_strdup(getenv("APP_DIR"));
116		116
Lines 227-233 Link Here
227	void login_failure(int error)	227	void login_failure(int error)
228	{	228	{
229	GString *message;	229	GString *message;
230	guchar *login;	230	gchar *login;
231		231
232	login = choices_find_path_load("Login", "ROX-Session");	232	login = choices_find_path_load("Login", "ROX-Session");
233	if (!login)	233	if (!login)

Lines 11-28 Link Here

(-)src-old/options.h (-4 / +4 lines)
11	#include <gtk/gtk.h>	11	#include <gtk/gtk.h>
12		12
13	typedef void OptionNotify(void);	13	typedef void OptionNotify(void);
14	typedef GList * (OptionBuildFn)(Option option, xmlNode node, guchar label);	14	typedef GList * (OptionBuildFn)(Option option, xmlNode node, gchar label);
15		15
16	struct _Option {	16	struct _Option {
17	guchar *value;	17	gchar *value;
18	long int_value;	18	long int_value;
19	gboolean has_changed;	19	gboolean has_changed;
20		20
21	guchar backup; / Copy of value to Revert to */	21	gchar backup; / Copy of value to Revert to */
22		22
23	GtkWidget widget; / NULL => No UI yet */	23	GtkWidget widget; / NULL => No UI yet */
24	void (update_widget)(Option option);	24	void (update_widget)(Option option);
25	guchar * (read_widget)(Option option);	25	gchar * (read_widget)(Option option);
26	};	26	};
27		27
28	/* Prototypes */	28	/* Prototypes */

Lines 159-165 Link Here

(-)src-old/settings.c (-19 / +19 lines)
159	{	159	{
160	if (child->type != XML_ELEMENT_NODE)	160	if (child->type != XML_ELEMENT_NODE)
161	continue;	161	continue;
162	if (strcmp(child->name, "Setting") != 0)	162	if (strcmp((gchar*)child->name, "Setting") != 0)
163	continue;	163	continue;
164		164
165	set_from_xml(child);	165	set_from_xml(child);
Lines 167-175 Link Here
167	}	167	}
168	else	168	else
169	{	169	{
170	settings_doc = xmlNewDoc("1.0");	170	settings_doc = xmlNewDoc((xmlChar*)"1.0");
171	xmlDocSetRootElement(settings_doc,	171	xmlDocSetRootElement(settings_doc,
172	xmlNewDocNode(settings_doc, NULL, "Settings", NULL));	172	xmlNewDocNode(settings_doc, NULL, (xmlChar*)"Settings", NULL));
173	if (manage_xsettings.int_value)	173	if (manage_xsettings.int_value)
174	{	174	{
175	/* Override annoying defaults... */	175	/* Override annoying defaults... */
Lines 188-195 Link Here
188	xmlNode *node;	188	xmlNode *node;
189		189
190	node = get_node(name, TRUE);	190	node = get_node(name, TRUE);
191	xmlSetProp(node, "value", value);	191	xmlSetProp(node, (xmlChar)"value", (xmlChar)value);
192	xmlSetProp(node, "type", "string");	192	xmlSetProp(node, (xmlChar)"type", (xmlChar)"string");
193		193
194	set_from_xml(node);	194	set_from_xml(node);
195	activate_changes();	195	activate_changes();
Lines 461-469 Link Here
461		461
462	if (child->type != XML_ELEMENT_NODE)	462	if (child->type != XML_ELEMENT_NODE)
463	continue;	463	continue;
464	if (strcmp(child->name, "Setting") != 0)	464	if (strcmp((gchar*)child->name, "Setting") != 0)
465	continue;	465	continue;
466	attr_name = xmlGetProp(child, "name");	466	attr_name = (gchar)xmlGetProp(child, (xmlChar)"name");
467	if (!attr_name)	467	if (!attr_name)
468	{	468	{
469	g_warning("Malformed <Setting>");	469	g_warning("Malformed <Setting>");
Lines 479-486 Link Here
479	if (!create_if_missing)	479	if (!create_if_missing)
480	return NULL;	480	return NULL;
481		481
482	child = xmlNewDocNode(settings_doc, NULL, "Setting", NULL);	482	child = xmlNewDocNode(settings_doc, NULL, (xmlChar*)"Setting", NULL);
483	xmlSetProp(child, "name", name);	483	xmlSetProp(child, (xmlChar)"name", (xmlChar)name);
484	xmlAddChild(root, child);	484	xmlAddChild(root, child);
485	return child;	485	return child;
486	}	486	}
Lines 509-516 Link Here
509	str = g_strdup_printf("%d", value);	509	str = g_strdup_printf("%d", value);
510		510
511	node = get_node(name, TRUE);	511	node = get_node(name, TRUE);
512	xmlSetProp(node, "value", str);	512	xmlSetProp(node, (xmlChar)"value", (xmlChar)str);
513	xmlSetProp(node, "type", "int");	513	xmlSetProp(node, (xmlChar)"type", (xmlChar)"int");
514		514
515	g_free(str);	515	g_free(str);
516		516
Lines 583-589 Link Here
583	ROX_XSETTINGS_NS, "GetSetting"))	583	ROX_XSETTINGS_NS, "GetSetting"))
584	{	584	{
585	DBusMessage *reply;	585	DBusMessage *reply;
586	char type, value;	586	guchar type, value;
587	xmlNode *node;	587	xmlNode *node;
588		588
589	if (!dbus_message_get_args(message, error,	589	if (!dbus_message_get_args(message, error,
Lines 597-604 Link Here
597	return dbus_message_new_error(message, MISSING_SETTING_ERROR,	597	return dbus_message_new_error(message, MISSING_SETTING_ERROR,
598	"Missing setting");	598	"Missing setting");
599		599
600	type = xmlGetProp(node, "type");	600	type = xmlGetProp(node, (xmlChar*)"type");
601	value = xmlGetProp(node, "value");	601	value = xmlGetProp(node, (xmlChar*)"value");
602	if (type && value)	602	if (type && value)
603	{	603	{
604	reply = dbus_message_new_method_return(message);	604	reply = dbus_message_new_method_return(message);
Lines 628-634 Link Here
628	g_warning("ROX-Session is no longer the XSETTINGS manager!");	628	g_warning("ROX-Session is no longer the XSETTINGS manager!");
629	}	629	}
630		630
631	static void set_setting(char name, char value, char *type)	631	static void set_setting(gchar name, gchar value, gchar *type)
632	{	632	{
633	g_return_if_fail(name && type && value);	633	g_return_if_fail(name && type && value);
634		634
Lines 665-677 Link Here
665		665
666	static void set_from_xml(xmlNode *setting)	666	static void set_from_xml(xmlNode *setting)
667	{	667	{
668	char name, value, *type;	668	gchar name, value, *type;
669		669
670	g_return_if_fail(!manage_xsettings.int_value \|\| xsettings_manager != NULL);	670	g_return_if_fail(!manage_xsettings.int_value \|\| xsettings_manager != NULL);
671		671
672	name = xmlGetProp(setting, "name");	672	name = (gchar)xmlGetProp(setting, (xmlChar)"name");
673	type = xmlGetProp(setting, "type");	673	type = (gchar)xmlGetProp(setting, (xmlChar)"type");
674	value = xmlGetProp(setting, "value");	674	value = (gchar)xmlGetProp(setting, (xmlChar)"value");
675		675
676	set_setting(name, value, type);	676	set_setting(name, value, type);
677		677

Lines 112-118 Link Here

(-)src-old/xkb.c (-3 / +3 lines)
112	if (delay <= 0) delay = 1;	112	if (delay <= 0) delay = 1;
113	if (!XkbSetAutoRepeatRate(GDK_DISPLAY(), XkbUseCoreKbd,	113	if (!XkbSetAutoRepeatRate(GDK_DISPLAY(), XkbUseCoreKbd,
114	delay, interval))	114	delay, interval))
115	g_warning(_("Failed to set auto repeat rate/interval"));	115	g_warning("%s", _("Failed to set auto repeat rate/interval"));
116	}	116	}
117	else	117	else
118	{	118	{
Lines 131-137 Link Here
131		131
132	/* get key state using XKB */	132	/* get key state using XKB */
133	if (XkbGetIndicatorState (GDK_DISPLAY(), XkbUseCoreKbd, &states) != Success)	133	if (XkbGetIndicatorState (GDK_DISPLAY(), XkbUseCoreKbd, &states) != Success)
134	g_warning (_("error in reading keyboard indicator states"));	134	g_warning ("%s", _("error in reading keyboard indicator states"));
135		135
136	return (states & code) ? TRUE : FALSE;	136	return (states & code) ? TRUE : FALSE;
137	}	137	}
Lines 145-151 Link Here
145	KeyCode code = XKeysymToKeycode(GDK_DISPLAY(), keysym);	145	KeyCode code = XKeysymToKeycode(GDK_DISPLAY(), keysym);
146	if (!XTestFakeKeyEvent (GDK_DISPLAY(), code, True, CurrentTime) \|\|	146	if (!XTestFakeKeyEvent (GDK_DISPLAY(), code, True, CurrentTime) \|\|
147	!XTestFakeKeyEvent (GDK_DISPLAY(), code, False, CurrentTime))	147	!XTestFakeKeyEvent (GDK_DISPLAY(), code, False, CurrentTime))
148	g_warning (_("error while sending fake key events"));	148	g_warning ("%s", _("error while sending fake key events"));
149	}	149	}
150	}	150	}
151		151