rev |
line source |
al@19856
|
1 diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css
|
al@19856
|
2 index 179f0d6..f8e6432 100644
|
al@19856
|
3 --- a/data/themes/Industrial/gtk.css
|
al@19856
|
4 +++ b/data/themes/Industrial/gtk.css
|
al@19856
|
5 @@ -17,6 +17,7 @@
|
al@19856
|
6 color: #000000;
|
al@19856
|
7 }
|
al@19856
|
8
|
al@19856
|
9 +#bottom_pane label,
|
al@19856
|
10 #bottom_pane GtkLabel {
|
al@19856
|
11 font: Sans 12;
|
al@19856
|
12 color: #9E9D9B;
|
al@19856
|
13 diff --git a/src/greeter-gdk.c b/src/greeter-gdk.c
|
al@19856
|
14 index 1abbefa..ad3267a 100644
|
al@19856
|
15 --- a/src/greeter-gdk.c
|
al@19856
|
16 +++ b/src/greeter-gdk.c
|
al@19856
|
17 @@ -22,6 +22,7 @@
|
al@19856
|
18
|
al@19856
|
19 #define XLIB_ILLEGAL_ACCESS
|
al@19856
|
20
|
al@19856
|
21 +#include <gtk/gtk.h>
|
al@19856
|
22 #include <gdk/gdk.h>
|
al@19856
|
23 #include <gdk/gdkx.h>
|
al@19856
|
24 #include <gdk/gdkkeysyms.h>
|
al@19856
|
25 @@ -88,12 +89,14 @@ static void on_ui_expose(void)
|
al@19856
|
26 }
|
al@19856
|
27
|
al@19856
|
28 cr=gdk_cairo_create(win);
|
al@19856
|
29 +#if GTK_CHECK_VERSION(3,0,0)
|
al@19856
|
30 cairo_pattern_t *pattern=gdk_window_get_background_pattern(win);
|
al@19856
|
31 if(pattern)
|
al@19856
|
32 {
|
al@19856
|
33 cairo_set_source(cr,pattern);
|
al@19856
|
34 cairo_paint(cr);
|
al@19856
|
35 }
|
al@19856
|
36 +#endif
|
al@19856
|
37
|
al@19856
|
38 gdk_cairo_set_source_color(cr, &bg);
|
al@19856
|
39 cairo_rectangle(cr, rc.x, rc.y, rc.width, rc.height);
|
al@19856
|
40 diff --git a/src/greeter.c b/src/greeter.c
|
al@19856
|
41 index 10b7f3f..03503b6 100644
|
al@19856
|
42 --- a/src/greeter.c
|
al@19856
|
43 +++ b/src/greeter.c
|
al@19856
|
44 @@ -146,7 +146,7 @@ static void switch_to_input_user(void)
|
al@19856
|
45 if(user_list_scrolled)
|
al@19856
|
46 gtk_widget_show(user_list_scrolled);
|
al@19856
|
47 else
|
al@19856
|
48 - gtk_widget_hide(user_list);
|
al@19856
|
49 + gtk_widget_show(user_list);
|
al@19856
|
50 gtk_widget_grab_focus(user_list);
|
al@19856
|
51 }
|
al@19856
|
52 else
|
al@19856
|
53 diff --git a/src/lxdm.c b/src/lxdm.c
|
al@19856
|
54 index a37f051..722936f 100644
|
al@19856
|
55 --- a/src/lxdm.c
|
al@19856
|
56 +++ b/src/lxdm.c
|
al@19856
|
57 @@ -488,6 +490,9 @@ static char *lxsession_xserver_command(LXSession *s)
|
al@19856
|
58 {
|
al@19856
|
59 arg[arc++] = g_strdup("-nolisten");
|
al@19856
|
60 arg[arc++] = g_strdup("tcp");
|
al@19856
|
61 + } else {
|
al@19856
|
62 + arg[arc++] = g_strdup("-listen");
|
al@19856
|
63 + arg[arc++] = g_strdup("tcp");
|
al@19856
|
64 }
|
al@19856
|
65 if(!novtswitch)
|
al@19856
|
66 {
|
al@19856
|
67 @@ -750,7 +755,13 @@ static char ** create_client_auth(struct passwd *pw,char **env)
|
al@19856
|
68 if(xauth_write_file(authfile,s->display,s->mcookie)==-1)
|
al@19856
|
69 {
|
al@19856
|
70 g_free(authfile);
|
al@19856
|
71 - authfile = g_strdup_printf("/var/run/lxdm/.Xauth%d",pw->pw_uid);
|
al@19856
|
72 +
|
al@19856
|
73 + gchar *authdir = g_strdup_printf("/var/run/lxdm/%d", pw->pw_uid);
|
al@19856
|
74 + g_mkdir_with_parents(authdir, S_IRWXU);
|
al@19856
|
75 + chown(authdir, pw->pw_uid, pw->pw_gid);
|
al@19856
|
76 +
|
al@19856
|
77 + authfile = g_strdup_printf("%s/.Xauthority", authdir);
|
al@19856
|
78 + g_free(authdir);
|
al@19856
|
79 remove(authfile);
|
al@19856
|
80 xauth_write_file(authfile,s->display,s->mcookie);
|
al@19856
|
81 }
|
al@19856
|
82 @@ -956,6 +967,11 @@ static void on_xserver_stop(void *data,int pid, int status)
|
al@19856
|
83 s->dpy=NULL;
|
al@19856
|
84 ui_drop();
|
al@19856
|
85 lxdm_startx(s);
|
al@19856
|
86 + #ifndef DISABLE_XAUTH
|
al@19856
|
87 + char temp[256];
|
al@19856
|
88 + sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display);
|
al@19856
|
89 + setenv("XAUTHORITY",temp,1);
|
al@19856
|
90 + #endif
|
al@19856
|
91 ui_prepare();
|
al@19856
|
92 lxsession_set_active(s);
|
al@19856
|
93 }
|