git-fixes.patch 2.5 KB

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