Attachment #94529 for bug #107526

View | Details | Raw Unified | Return to bug 107526 | Differences between

and this patch

Lines 154-160 Link Here

(-)slim-1.2.5/cfg.cpp.orig (-2 / +2 lines)
154	}	154	}
155	int pos = 0;	155	int pos = 0;
156	string line = s;	156	string line = s;
157	string::size_type len = line.length();	157	int len = line.length();
158	while ( pos < len && isspace( line[pos] ) ) {	158	while ( pos < len && isspace( line[pos] ) ) {
159	++pos;	159	++pos;
160	}	160	}
Lines 240-246 Link Here
240	if (sessions.size() <= 1)	240	if (sessions.size() <= 1)
241	return current;	241	return current;
242		242
243	for (int i=0; i<sessions.size()-1; i++) {	243	for (int i=0; i<(int)sessions.size()-1; i++) {
244	if (current == sessions[i]) {	244	if (current == sessions[i]) {
245	return sessions[i+1];	245	return sessions[i+1];
246	}	246	}

Lines 391-397 Link Here

(-)slim-1.2.5/image.cpp.orig (-2 / +2 lines)
391	void Image::Center(const int w, const int h, const char *hex) {	391	void Image::Center(const int w, const int h, const char *hex) {
392		392
393	unsigned long packed_rgb;	393	unsigned long packed_rgb;
394	sscanf(hex, "%x", &packed_rgb);	394	sscanf(hex, "%lx", &packed_rgb);
395		395
396	unsigned long r = packed_rgb>>16;	396	unsigned long r = packed_rgb>>16;
397	unsigned long g = packed_rgb>>8 & 0xff;	397	unsigned long g = packed_rgb>>8 & 0xff;
Lines 471-477 Link Here
471	void Image::Plain(const int w, const int h, const char *hex) {	471	void Image::Plain(const int w, const int h, const char *hex) {
472		472
473	unsigned long packed_rgb;	473	unsigned long packed_rgb;
474	sscanf(hex, "%x", &packed_rgb);	474	sscanf(hex, "%lx", &packed_rgb);
475		475
476	unsigned long r = packed_rgb>>16;	476	unsigned long r = packed_rgb>>16;
477	unsigned long g = packed_rgb>>8 & 0xff;	477	unsigned long g = packed_rgb>>8 & 0xff;

Lines 239-245 Link Here

(-)slim-1.2.5/panel.cpp.orig (-3 / +14 lines)
239		239
240	void Panel::Cursor(int visible) {	240	void Panel::Cursor(int visible) {
241	char* text;	241	char* text;
242	int xx, yy, x2,y2, cheight;	242	int xx, yy, y2, cheight;
243	char* txth = "Wj"; // used to get cursor height	243	char* txth = "Wj"; // used to get cursor height
244		244
245	switch(In->GetField()) {	245	switch(In->GetField()) {
Lines 254-259 Link Here
254	xx = input_name_x;	254	xx = input_name_x;
255	yy = input_name_y;	255	yy = input_name_y;
256	break;	256	break;
		257
		258	default: /* Origin & NULL string as default values. */
		259	text = (char *)NULL;
		260	xx = (int)0;
		261	yy = (int)0;
		262	break;
257	}	263	}
258		264
259		265
Lines 347-353 Link Here
347	del = In->Key(buffer, keysym, singleInputMode);	353	del = In->Key(buffer, keysym, singleInputMode);
348	Action = In->GetAction();	354	Action = In->GetAction();
349		355
350	XGlyphInfo extents, delextents;	356	XGlyphInfo extents;
351	XftDraw *draw = XftDrawCreate(Dpy, Win,	357	XftDraw *draw = XftDrawCreate(Dpy, Win,
352	DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));	358	DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
353		359
Lines 397-402 Link Here
397	xx = input_name_x;	403	xx = input_name_x;
398	yy = input_name_y;	404	yy = input_name_y;
399	break;	405	break;
		406
		407	default: /* Origin & NULL string as default values. */
		408	text = (char *)NULL;
		409	xx = (int)0;
		410	yy = (int)0;
		411	break;
400	}	412	}
401		413
402	char* txth = "Wj"; // get proper maximum height ?	414	char* txth = "Wj"; // get proper maximum height ?
Lines 431-437 Link Here
431	// Draw welcome and "enter username" message	443	// Draw welcome and "enter username" message
432	void Panel::ShowText(){	444	void Panel::ShowText(){
433	string cfgX, cfgY;	445	string cfgX, cfgY;
434	int n=-1;
435	XGlyphInfo extents;	446	XGlyphInfo extents;
436		447
437	bool singleInputMode =	448	bool singleInputMode =

Lines 14-21 Link Here

(-)slim-1.2.5/switchuser.cpp.orig (-2 / +2 lines)
14	using namespace std;	14	using namespace std;
15		15
16	SwitchUser::SwitchUser(struct passwd pw, Cfg c, const string& display)	16	SwitchUser::SwitchUser(struct passwd pw, Cfg c, const string& display)
17	: Pw(pw),	17	: cfg(c),
18	cfg(c),	18	Pw(pw),
19	displayName(display)	19	displayName(display)
20	{	20	{
21	}	21	}

Return to bug 107526