This commit is contained in:
parent
771becffda
commit
18d5573321
@ -1,21 +0,0 @@
|
||||
diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' gnome-session-2.0.8.orig/gnome-session/splash-widget.c gnome-session-2.0.8/gnome-session/splash-widget.c
|
||||
--- gnome-session-2.0.8.orig/gnome-session/splash-widget.c 2003-01-14 18:28:02.000000000 -0500
|
||||
+++ gnome-session-2.0.8/gnome-session/splash-widget.c 2003-01-14 18:27:50.000000000 -0500
|
||||
@@ -164,7 +164,7 @@
|
||||
exposed.y - si->position.y,
|
||||
exposed.x, exposed.y,
|
||||
exposed.width, exposed.height,
|
||||
- GDK_RGB_DITHER_NORMAL,
|
||||
+ GDK_RGB_DITHER_MAX,
|
||||
exposed.x, exposed.y);
|
||||
}
|
||||
|
||||
@@ -246,7 +246,7 @@
|
||||
sw->background, GDK_DRAWABLE (pm),
|
||||
widget->style->black_gc,
|
||||
0, 0, 0, 0, width, height,
|
||||
- GDK_RGB_DITHER_NORMAL,
|
||||
+ GDK_RGB_DITHER_MAX,
|
||||
0, 0);
|
||||
|
||||
gdk_window_set_back_pixmap (
|
@ -1,5 +1,7 @@
|
||||
--- gnome-session-2.15.91/gnome-session/gdm-logout-action.c
|
||||
+++ gnome-session-2.15.91/gnome-session/gdm-logout-action.c
|
||||
Index: gnome-session-2.19.4/gnome-session/gdm-logout-action.c
|
||||
===================================================================
|
||||
--- gnome-session-2.19.4.orig/gnome-session/gdm-logout-action.c
|
||||
+++ gnome-session-2.19.4/gnome-session/gdm-logout-action.c
|
||||
@@ -56,6 +56,8 @@
|
||||
#define GDM_ACTION_STR_REBOOT "REBOOT"
|
||||
#define GDM_ACTION_STR_SUSPEND "SUSPEND"
|
||||
@ -9,7 +11,7 @@
|
||||
typedef struct {
|
||||
int fd;
|
||||
char *auth_cookie;
|
||||
@@ -64,6 +66,8 @@
|
||||
@@ -64,6 +66,8 @@ typedef struct {
|
||||
GdmLogoutAction current_actions;
|
||||
|
||||
time_t last_update;
|
||||
@ -18,7 +20,7 @@
|
||||
} GdmProtocolData;
|
||||
|
||||
static GdmProtocolData gdm_protocol_data = {
|
||||
@@ -71,11 +75,12 @@
|
||||
@@ -71,11 +75,12 @@ static GdmProtocolData gdm_protocol_data
|
||||
NULL,
|
||||
GDM_LOGOUT_ACTION_NONE,
|
||||
GDM_LOGOUT_ACTION_NONE,
|
||||
@ -33,7 +35,7 @@
|
||||
const char *msg)
|
||||
{
|
||||
GString *retval;
|
||||
@@ -87,7 +92,7 @@
|
||||
@@ -87,7 +92,7 @@ gdm_send_protocol_msg (GdmProtocolData *
|
||||
if (write (data->fd, p, strlen (p)) < 0) {
|
||||
g_free (p);
|
||||
|
||||
@ -42,7 +44,7 @@
|
||||
g_strerror (errno));
|
||||
return NULL;
|
||||
}
|
||||
@@ -153,7 +158,7 @@
|
||||
@@ -153,7 +158,7 @@ gdm_authenticate_connection (GdmProtocol
|
||||
|
||||
msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s",
|
||||
data->auth_cookie);
|
||||
@ -51,7 +53,7 @@
|
||||
g_free (msg);
|
||||
|
||||
if (response && !strcmp (response, "OK")) {
|
||||
@@ -195,7 +200,7 @@
|
||||
@@ -195,7 +200,7 @@ gdm_authenticate_connection (GdmProtocol
|
||||
XauDisposeAuth (xau);
|
||||
|
||||
msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s", buffer);
|
||||
@ -60,7 +62,7 @@
|
||||
g_free (msg);
|
||||
|
||||
if (response && !strcmp (response, "OK")) {
|
||||
@@ -218,7 +223,7 @@
|
||||
@@ -218,7 +223,7 @@ gdm_authenticate_connection (GdmProtocol
|
||||
}
|
||||
|
||||
static void
|
||||
@ -69,7 +71,16 @@
|
||||
{
|
||||
if (data->fd)
|
||||
close (data->fd);
|
||||
@@ -237,7 +242,7 @@
|
||||
@@ -226,7 +231,7 @@ gdm_shutdown_protocol_connection (GdmPro
|
||||
}
|
||||
|
||||
static gboolean
|
||||
-gdm_init_protocol_connection (GdmProtocolData *data)
|
||||
+dm_init_protocol_connection (GdmProtocolData *data)
|
||||
{
|
||||
struct sockaddr_un addr;
|
||||
char *response;
|
||||
@@ -237,7 +242,7 @@ gdm_init_protocol_connection (GdmProtoco
|
||||
if (data->fd < 0) {
|
||||
g_warning ("Failed to create GDM socket: %s",
|
||||
g_strerror (errno));
|
||||
@ -77,13 +88,13 @@
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -247,29 +252,93 @@
|
||||
|
||||
@@ -251,16 +256,16 @@ gdm_init_protocol_connection (GdmProtoco
|
||||
if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
|
||||
g_warning ("Failed to establish a connection with GDM: %s",
|
||||
g_strerror (errno));
|
||||
- gdm_shutdown_protocol_connection (data);
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -94,89 +105,20 @@
|
||||
|
||||
g_warning ("Failed to get protocol version from GDM");
|
||||
- gdm_shutdown_protocol_connection (data);
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
@@ -268,7 +273,7 @@ gdm_init_protocol_connection (GdmProtoco
|
||||
|
||||
if (!gdm_authenticate_connection (data)) {
|
||||
g_warning ("Failed to authenticate with GDM");
|
||||
- gdm_shutdown_protocol_connection (data);
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+static gboolean
|
||||
+kdm_init_protocol_connection (GdmProtocolData *data)
|
||||
+{
|
||||
+ struct sockaddr_un addr;
|
||||
+ char *response;
|
||||
+ char *dm_display;
|
||||
+ char *dm_control;
|
||||
+ char *p0 = NULL;
|
||||
+
|
||||
+ g_assert (data->fd <= 0);
|
||||
+
|
||||
+ data->fd = socket (AF_UNIX, SOCK_STREAM, 0);
|
||||
+ if (data->fd < 0) {
|
||||
+ g_warning ("Failed to create KDM socket: %s",
|
||||
+ g_strerror (errno));
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ dm_display = g_strdup (g_getenv ("DISPLAY"));
|
||||
+ dm_control = g_strdup (g_getenv ("DM_CONTROL"));
|
||||
+
|
||||
+ if (dm_display && (p0 = strchr (dm_display, ':')))
|
||||
+ p0 = strchr (p0, '.');
|
||||
+
|
||||
+ if (!dm_control || !strlen (dm_control) ||
|
||||
+ !dm_display || !strlen (dm_display)) {
|
||||
+ g_free (dm_control);
|
||||
+ g_free (dm_display);
|
||||
+
|
||||
+ g_warning ("Could not locate KDM socket.");
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ snprintf (addr.sun_path, sizeof (addr.sun_path), "%s/dmctl-%.*s/socket",
|
||||
+ dm_control, p0 ? p0 - dm_display : 512, dm_display);
|
||||
+ addr.sun_family = AF_UNIX;
|
||||
+
|
||||
+ g_free (dm_display);
|
||||
+ g_free (dm_control);
|
||||
+
|
||||
+ if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
|
||||
+ g_warning ("Failed to establish a connection with KDM: %s",
|
||||
+ g_strerror (errno));
|
||||
+ dm_shutdown_protocol_connection (data);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+static gboolean
|
||||
+dm_init_protocol_connection (GdmProtocolData *data)
|
||||
+{
|
||||
+ if (g_getenv ("DM_CONTROL") && !g_getenv ("GDMSESSION")) {
|
||||
+ data->is_kdm = TRUE;
|
||||
+ return kdm_init_protocol_connection (data);
|
||||
+ }
|
||||
+
|
||||
+ data->is_kdm = FALSE;
|
||||
+ return gdm_init_protocol_connection (data);
|
||||
+}
|
||||
+
|
||||
static void
|
||||
gdm_parse_query_response (GdmProtocolData *data,
|
||||
const char *response)
|
||||
@@ -317,7 +386,21 @@
|
||||
@@ -322,7 +327,21 @@ gdm_parse_query_response (GdmProtocolDat
|
||||
}
|
||||
|
||||
static void
|
||||
@ -199,7 +141,7 @@
|
||||
{
|
||||
time_t current_time;
|
||||
char *response;
|
||||
@@ -328,21 +411,30 @@
|
||||
@@ -333,21 +352,30 @@ gdm_update_logout_actions (GdmProtocolDa
|
||||
|
||||
data->last_update = current_time;
|
||||
|
||||
@ -238,7 +180,7 @@
|
||||
|
||||
return (gdm_protocol_data.available_actions & action) != 0;
|
||||
}
|
||||
@@ -350,20 +442,15 @@
|
||||
@@ -355,20 +383,15 @@ gdm_supports_logout_action (GdmLogoutAct
|
||||
GdmLogoutAction
|
||||
gdm_get_logout_action (void)
|
||||
{
|
||||
@ -262,7 +204,7 @@
|
||||
|
||||
switch (action) {
|
||||
case GDM_LOGOUT_ACTION_NONE:
|
||||
@@ -380,14 +467,48 @@
|
||||
@@ -385,14 +408,48 @@ gdm_set_logout_action (GdmLogoutAction a
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -1,18 +1,20 @@
|
||||
diff -Nurp gnome-session-2.12.0-pre/gnome-session/ice.c gnome-session-2.12.0-post/gnome-session/ice.c
|
||||
--- gnome-session-2.12.0-pre/gnome-session/ice.c 2005-05-17 08:59:05.000000000 -0500
|
||||
+++ gnome-session-2.12.0-post/gnome-session/ice.c 2006-01-26 22:02:49.000000000 -0600
|
||||
@@ -379,6 +379,8 @@ initialize_ice (void)
|
||||
|
||||
p = g_strconcat (ENVNAME "=", ids, NULL);
|
||||
putenv (p);
|
||||
Index: gnome-session-2.19.4/gnome-session/ice.c
|
||||
===================================================================
|
||||
--- gnome-session-2.19.4.orig/gnome-session/ice.c
|
||||
+++ gnome-session-2.19.4/gnome-session/ice.c
|
||||
@@ -384,6 +384,8 @@ initialize_ice (void)
|
||||
ids = IceComposeNetworkIdList (num_sockets, sockets);
|
||||
g_setenv (ENVNAME, ids, TRUE);
|
||||
free (ids);
|
||||
+
|
||||
+ putenv (g_strconcat (ICE_AUTHORITY_ENV_NAME "=", authfile, NULL));
|
||||
|
||||
ice_depth = 0; /* We are live */
|
||||
}
|
||||
diff -Nurp gnome-session-2.12.0-pre/gnome-session/ice.h gnome-session-2.12.0-post/gnome-session/ice.h
|
||||
--- gnome-session-2.12.0-pre/gnome-session/ice.h 2001-05-10 17:09:15.000000000 -0500
|
||||
+++ gnome-session-2.12.0-post/gnome-session/ice.h 2006-01-26 21:51:35.000000000 -0600
|
||||
Index: gnome-session-2.19.4/gnome-session/ice.h
|
||||
===================================================================
|
||||
--- gnome-session-2.19.4.orig/gnome-session/ice.h
|
||||
+++ gnome-session-2.19.4/gnome-session/ice.h
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#define MAGIC_COOKIE_LEN 16
|
||||
|
@ -1,7 +1,8 @@
|
||||
diff -ur ../gnome-session-2.12.0/gnome-session/logout.c ./gnome-session/logout.c
|
||||
--- ../gnome-session-2.12.0/gnome-session/logout.c 2005-05-06 12:17:12.000000000 +0200
|
||||
+++ ./gnome-session/logout.c 2006-01-07 06:28:42.000000000 +0100
|
||||
@@ -26,6 +26,9 @@
|
||||
Index: gnome-session/logout.c
|
||||
===================================================================
|
||||
--- gnome-session/logout.c.orig
|
||||
+++ gnome-session/logout.c
|
||||
@@ -28,6 +28,9 @@
|
||||
#include <gtk/gtkinvisible.h>
|
||||
#include <gdk/gdkx.h>
|
||||
|
||||
@ -10,8 +11,8 @@ diff -ur ../gnome-session-2.12.0/gnome-session/logout.c ./gnome-session/logout.c
|
||||
+
|
||||
#include <gconf/gconf-client.h>
|
||||
|
||||
#include <libgnome/libgnome.h>
|
||||
@@ -187,6 +190,10 @@
|
||||
#include <libgnomeui/gnome-help.h>
|
||||
@@ -160,6 +163,10 @@ fadeout_screen (GdkScreen *screen,
|
||||
int attr_mask;
|
||||
GdkGCValues values;
|
||||
FadeoutData *fadeout;
|
||||
@ -22,41 +23,8 @@ diff -ur ../gnome-session-2.12.0/gnome-session/logout.c ./gnome-session/logout.c
|
||||
|
||||
fadeout = g_new (FadeoutData, 1);
|
||||
|
||||
@@ -491,12 +498,31 @@
|
||||
*/
|
||||
if (!a11y_enabled)
|
||||
{
|
||||
- XGrabServer (GDK_DISPLAY ());
|
||||
+ /* Really necessary?
|
||||
+ XGrabServer (GDK_DISPLAY ());
|
||||
+ */
|
||||
gsm_foreach_screen (fadeout_screen);
|
||||
}
|
||||
|
||||
gtk_widget_show_all (box);
|
||||
|
||||
+ /* XXX: Appending experimental display modal state */
|
||||
+ {
|
||||
+ Display *xdisplay = GDK_WINDOW_XDISPLAY (box->window);
|
||||
+ Window xwindow = GDK_WINDOW_XID (box->window);
|
||||
+ Atom state_atom, display_modal_atom;
|
||||
+
|
||||
+ state_atom = XInternAtom (xdisplay, "_NET_WM_STATE", 0);
|
||||
+ display_modal_atom = XInternAtom (xdisplay,
|
||||
+ "_NET_WM_STATE_DISPLAY_MODAL", 0);
|
||||
+
|
||||
+ XChangeProperty (xdisplay,
|
||||
+ xwindow,
|
||||
+ state_atom,
|
||||
+ XA_ATOM, 32, PropModeAppend,
|
||||
+ (guchar *) &display_modal_atom, 1);
|
||||
+ }
|
||||
+
|
||||
if (!a11y_enabled)
|
||||
{
|
||||
/* Move the grabs to our message box */
|
||||
@@ -533,7 +559,7 @@
|
||||
if (!a11y_enabled)
|
||||
@@ -517,7 +524,7 @@ display_gui (void)
|
||||
if (iris_effect_enabled)
|
||||
{
|
||||
hide_fadeout_windows ();
|
||||
- XUngrabServer (GDK_DISPLAY ());
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4a1ce73fedcfae94673eeef2655937ff6c9ebc2f52ba817466659d2b583df330
|
||||
size 707392
|
3
gnome-session-2.19.4.tar.bz2
Normal file
3
gnome-session-2.19.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:67ef34935ed69cd469c4a1eef2cd814ac11c320145a0e275344581de178cb6a5
|
||||
size 727620
|
@ -1,10 +0,0 @@
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -13,7 +13,6 @@
|
||||
AC_PROG_CC
|
||||
AC_STDC_HEADERS
|
||||
AM_PROG_LIBTOOL
|
||||
-AC_PATH_PROGS(PATH_TO_XRDB, "xrdb")
|
||||
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
|
||||
|
||||
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
|
@ -1,198 +0,0 @@
|
||||
? gnome-session-speedup.patch
|
||||
? stamp-h1
|
||||
Index: gnome-session/logout.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnome/gnome-session/gnome-session/logout.c,v
|
||||
retrieving revision 1.60
|
||||
diff -u -p -r1.60 logout.c
|
||||
--- gnome-session/logout.c 26 Apr 2005 10:56:50 -0000 1.60
|
||||
+++ gnome-session/logout.c 17 Aug 2005 16:37:52 -0000
|
||||
@@ -61,10 +61,12 @@ typedef struct {
|
||||
int rowstride;
|
||||
GdkWindow *root_window;
|
||||
GdkWindow *draw_window;
|
||||
- GdkPixbuf *start_pb, *end_pb, *frame;
|
||||
- guchar *start_p, *end_p, *frame_p;
|
||||
+ GdkPixmap *draw_pixmap;
|
||||
+ GdkPixbuf *start_pb, *frame;
|
||||
+ guchar *start_p, *frame_p;
|
||||
GTimeVal start_time;
|
||||
GdkGC *gc;
|
||||
+ int callback_id;
|
||||
} FadeoutData;
|
||||
|
||||
static GList *fadeout_windows = NULL;
|
||||
@@ -76,8 +78,10 @@ static void
|
||||
get_current_frame (FadeoutData *fadeout,
|
||||
double sat)
|
||||
{
|
||||
- guchar *sp, *ep, *fp;
|
||||
+ guchar *sp, *fp;
|
||||
int i, j, width, offset;
|
||||
+ const int FIXED = 8;
|
||||
+ int fixed_mult = (0.5 + (sat / 2)) * (1 << 8);
|
||||
|
||||
width = fadeout->area.width * 3;
|
||||
offset = 0;
|
||||
@@ -85,44 +89,17 @@ get_current_frame (FadeoutData *fadeout,
|
||||
for (i = 0; i < fadeout->area.height; i++)
|
||||
{
|
||||
sp = fadeout->start_p + offset;
|
||||
- ep = fadeout->end_p + offset;
|
||||
fp = fadeout->frame_p + offset;
|
||||
|
||||
- for (j = 0; j < width; j += 3)
|
||||
+ for (j = 0; j < width; j ++)
|
||||
{
|
||||
- guchar r = abs (*(sp++) - ep[0]);
|
||||
- guchar g = abs (*(sp++) - ep[1]);
|
||||
- guchar b = abs (*(sp++) - ep[2]);
|
||||
-
|
||||
- *(fp++) = *(ep++) + r * sat;
|
||||
- *(fp++) = *(ep++) + g * sat;
|
||||
- *(fp++) = *(ep++) + b * sat;
|
||||
+ *(fp++) = (*(sp++) * fixed_mult) >> FIXED;
|
||||
}
|
||||
|
||||
offset += fadeout->rowstride;
|
||||
}
|
||||
}
|
||||
|
||||
-static void
|
||||
-darken_pixbuf (GdkPixbuf *pb)
|
||||
-{
|
||||
- int width, height, rowstride;
|
||||
- int i, j;
|
||||
- guchar *p, *pixels;
|
||||
-
|
||||
- width = gdk_pixbuf_get_width (pb) * 3;
|
||||
- height = gdk_pixbuf_get_height (pb);
|
||||
- rowstride = gdk_pixbuf_get_rowstride (pb);
|
||||
- pixels = gdk_pixbuf_get_pixels (pb);
|
||||
-
|
||||
- for (i = 0; i < height; i++)
|
||||
- {
|
||||
- p = pixels + (i * rowstride);
|
||||
- for (j = 0; j < width; j++)
|
||||
- p [j] >>= 1;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
static gboolean
|
||||
fadeout_callback (FadeoutData *fadeout)
|
||||
{
|
||||
@@ -141,30 +118,26 @@ fadeout_callback (FadeoutData *fadeout)
|
||||
|
||||
if (elapsed > FADE_DURATION)
|
||||
{
|
||||
- gdk_draw_pixbuf (fadeout->draw_window,
|
||||
+ get_current_frame (fadeout, 0.0);
|
||||
+ gdk_draw_pixbuf (fadeout->draw_pixmap,
|
||||
fadeout->gc,
|
||||
- fadeout->end_pb,
|
||||
+ fadeout->frame,
|
||||
0, 0,
|
||||
0, 0,
|
||||
fadeout->area.width,
|
||||
fadeout->area.height,
|
||||
GDK_RGB_DITHER_NONE,
|
||||
0, 0);
|
||||
+ gdk_window_clear (fadeout->draw_window);
|
||||
|
||||
- g_object_unref (fadeout->gc);
|
||||
- g_object_unref (fadeout->start_pb);
|
||||
- g_object_unref (fadeout->end_pb);
|
||||
- g_object_unref (fadeout->frame);
|
||||
-
|
||||
- g_free (fadeout);
|
||||
-
|
||||
+ fadeout->callback_id = 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
percent = elapsed / FADE_DURATION;
|
||||
|
||||
get_current_frame (fadeout, 1.0 - percent);
|
||||
- gdk_draw_pixbuf (fadeout->draw_window,
|
||||
+ gdk_draw_pixbuf (fadeout->draw_pixmap,
|
||||
fadeout->gc,
|
||||
fadeout->frame,
|
||||
0, 0,
|
||||
@@ -173,6 +146,7 @@ fadeout_callback (FadeoutData *fadeout)
|
||||
fadeout->area.height,
|
||||
GDK_RGB_DITHER_NONE,
|
||||
0, 0);
|
||||
+ gdk_window_clear (fadeout->draw_window);
|
||||
|
||||
gdk_flush ();
|
||||
|
||||
@@ -211,7 +185,8 @@ fadeout_screen (GdkScreen *screen,
|
||||
attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_NOREDIR;
|
||||
|
||||
fadeout->draw_window = gdk_window_new (fadeout->root_window, &attr, attr_mask);
|
||||
- fadeout_windows = g_list_prepend (fadeout_windows, fadeout->draw_window);
|
||||
+ fadeout->draw_pixmap = gdk_pixmap_new (fadeout->draw_window, fadeout->area.width, fadeout->area.height, gdk_drawable_get_depth (fadeout->draw_window));
|
||||
+ fadeout_windows = g_list_prepend (fadeout_windows, fadeout);
|
||||
|
||||
fadeout->start_pb = gdk_pixbuf_get_from_drawable (NULL,
|
||||
fadeout->root_window,
|
||||
@@ -222,14 +197,10 @@ fadeout_screen (GdkScreen *screen,
|
||||
fadeout->area.width,
|
||||
fadeout->area.height);
|
||||
|
||||
- fadeout->end_pb = gdk_pixbuf_copy (fadeout->start_pb);
|
||||
- darken_pixbuf (fadeout->end_pb);
|
||||
-
|
||||
fadeout->frame = gdk_pixbuf_copy (fadeout->start_pb);
|
||||
fadeout->rowstride = gdk_pixbuf_get_rowstride (fadeout->start_pb);
|
||||
|
||||
fadeout->start_p = gdk_pixbuf_get_pixels (fadeout->start_pb);
|
||||
- fadeout->end_p = gdk_pixbuf_get_pixels (fadeout->end_pb);
|
||||
fadeout->frame_p = gdk_pixbuf_get_pixels (fadeout->frame);
|
||||
|
||||
values.subwindow_mode = GDK_INCLUDE_INFERIORS;
|
||||
@@ -238,7 +209,7 @@ fadeout_screen (GdkScreen *screen,
|
||||
|
||||
gdk_window_set_back_pixmap (fadeout->draw_window, NULL, FALSE);
|
||||
gdk_window_show (fadeout->draw_window);
|
||||
- gdk_draw_pixbuf (fadeout->draw_window,
|
||||
+ gdk_draw_pixbuf (fadeout->draw_pixmap,
|
||||
fadeout->gc,
|
||||
fadeout->frame,
|
||||
0, 0,
|
||||
@@ -247,9 +218,11 @@ fadeout_screen (GdkScreen *screen,
|
||||
fadeout->area.height,
|
||||
GDK_RGB_DITHER_NONE,
|
||||
0, 0);
|
||||
+ gdk_window_set_back_pixmap (fadeout->draw_window, fadeout->draw_pixmap, FALSE);
|
||||
+ gdk_window_clear (fadeout->draw_window);
|
||||
|
||||
g_get_current_time (&fadeout->start_time);
|
||||
- g_idle_add ((GSourceFunc) fadeout_callback, fadeout);
|
||||
+ fadeout->callback_id = g_idle_add ((GSourceFunc) fadeout_callback, fadeout);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -259,8 +232,20 @@ hide_fadeout_windows (void)
|
||||
|
||||
for (l = fadeout_windows; l; l = l->next)
|
||||
{
|
||||
- gdk_window_hide (GDK_WINDOW (l->data));
|
||||
- g_object_unref (l->data);
|
||||
+ FadeoutData *fadeout = l->data;
|
||||
+ gdk_window_hide (fadeout->draw_window);
|
||||
+
|
||||
+ if (fadeout->callback_id)
|
||||
+ g_source_remove (fadeout->callback_id);
|
||||
+
|
||||
+ g_object_unref (fadeout->gc);
|
||||
+ g_object_unref (fadeout->start_pb);
|
||||
+ g_object_unref (fadeout->frame);
|
||||
+
|
||||
+ g_object_unref (fadeout->draw_window);
|
||||
+ g_object_unref (fadeout->draw_pixmap);
|
||||
+
|
||||
+ g_free (fadeout);
|
||||
}
|
||||
|
||||
g_list_free (fadeout_windows);
|
@ -1,3 +1,120 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 10 16:25:12 CEST 2007 - maw@suse.de
|
||||
|
||||
- Update to version 2.19.4
|
||||
==============
|
||||
Version 2.19.4
|
||||
==============
|
||||
|
||||
Session Manager
|
||||
|
||||
* Use g_timeout_add_seconds() when possible (Vincent)
|
||||
* Improve a bit "wrong clock" check when the user has reconfigured his
|
||||
clock (Vincent)
|
||||
* Fix crash when icons on the splash screen needs to be relayout-ed
|
||||
(Vincent)
|
||||
* Fix compilation issue on Solaris (Vincent)
|
||||
|
||||
Session Properties Dialog
|
||||
|
||||
* Fix a crash when the comment for a .desktop file is not defined and a
|
||||
startup program is disabled (Vincent)
|
||||
|
||||
Misc
|
||||
|
||||
* Require glib 2.13.0
|
||||
|
||||
Translators
|
||||
|
||||
* Tshewang Norbu (dz)
|
||||
|
||||
==============
|
||||
Version 2.19.3
|
||||
==============
|
||||
|
||||
Session Manager
|
||||
|
||||
* Don't do logout fade if there's a compositing manager running
|
||||
(Ray Strode, Bastien Nocera)
|
||||
* Start accessibility if GNOME_ACCESSIBILITY is set (Wouter Bolsterlee,
|
||||
Vincent)
|
||||
|
||||
Session Properties Dialog
|
||||
|
||||
* Small code cleanup (Vincent)
|
||||
|
||||
Translators
|
||||
|
||||
* David Lodge (en_GB)
|
||||
* Jorge González (es)
|
||||
* Ivar Smolin (et)
|
||||
* Espen Stefansen (nb)
|
||||
* Daniel Nylander (sv)
|
||||
* Theppitak Karoonboonyanan (th)
|
||||
|
||||
===============
|
||||
Version 2.19.2
|
||||
===============
|
||||
|
||||
Session Manager
|
||||
|
||||
* Use g_usleep() instead of usleep() (Bastien Nocera)
|
||||
* Don't hardcode start of assistive technologies software (Ariel Rios,
|
||||
Vincent)
|
||||
* Fix splash screen in RTL environments (Yair Hershkovitz)
|
||||
* Improve splash screen on old displays (Fedora patch)
|
||||
* Make it possible to use a shaped window for the splash screen
|
||||
(Fedora patch, Vincent)
|
||||
* Display the name of the started application in splash screen even if
|
||||
there's no icon (Vincent)
|
||||
* Don't use deprecated functions (Christian Persch, Vincent)
|
||||
* Don't hardcode esound for the sound daemon (Matthias Clasen, Vincent)
|
||||
* Make the fade on logout faster (Christof Krüger)
|
||||
* Plug leaks (Vincent)
|
||||
* Warn the user if he logs in as root (Vincent, Dan Winship)
|
||||
* Warn the user if the clock is totally wrong and let him launch a
|
||||
config tool (Vincent, Dan Winship)
|
||||
* Change strings about saving the session to be more user-friendly
|
||||
(Vincent)
|
||||
* Remove workaround that chrooted esd to / (fixed in esd) (Vincent)
|
||||
* Make it possible to save a session with multiple clients that are the
|
||||
same program (Hans de Goede, Dan Winship)
|
||||
* Use the new socket path for GDM (Loïc Minier)
|
||||
|
||||
Session Properties Dialog
|
||||
|
||||
* Use Add/Remove instead of New/Delete for handling startup programs
|
||||
(Luca Ferretti)
|
||||
* Show the comments in the startup programs list (Vincent)
|
||||
* Change strings about saving the session to be more user-friendly
|
||||
(Vincent)
|
||||
* Make it possible to sort the program lists by clicking on the headers
|
||||
(Vincent)
|
||||
* Create a non-localized version of the Comment field in .desktop files
|
||||
if necessary (Vincent)
|
||||
|
||||
Misc
|
||||
|
||||
* Remove xrdb check (Andreas Hanke)
|
||||
* Build fixes (Andreas Hanke, Christian Persch)
|
||||
* Require glib 2.12.0 (Vincent)
|
||||
* Add --with-time-utility configure flag to set the executable that is
|
||||
used to configure the time of the computer (Vincent)
|
||||
* Don't require libgnome-desktop anymore (Vincent)
|
||||
* Add support for beryl in gnome-wm (Alex)
|
||||
|
||||
Translators
|
||||
|
||||
* Peter Bach (da)
|
||||
* Jorge González (es)
|
||||
* Ivar Smolin (et)
|
||||
* Iñaki Larrañaga Murgoitio (eu)
|
||||
* Ignacio Casal Quinteiro (gl)
|
||||
* Yair Hershkovitz (he)
|
||||
* Espen Stefansen (nb)
|
||||
* Yannig MARCHEGAY (Kokoyaya) (oc)
|
||||
* Yang Zhang (zh_CN)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 4 14:57:58 CEST 2007 - sbrabec@suse.cz
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gnome-session (Version 2.18.0)
|
||||
# spec file for package gnome-session (Version 2.19.4)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -13,33 +13,32 @@
|
||||
Name: gnome-session
|
||||
BuildRequires: CASA-devel control-center2-devel gnome-common gnome-desktop-devel gnome-keyring gnome-patch-translation hicolor-icon-theme intltool libglade2-devel libnotify-devel perl-XML-Parser tcpd-devel update-desktop-files
|
||||
# for xrdb resp. rsh checks:
|
||||
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
|
||||
License: GPL v2 or later, LGPL v2 or later
|
||||
Group: System/GUI/GNOME
|
||||
Version: 2.18.0
|
||||
Release: 6
|
||||
Version: 2.19.4
|
||||
Release: 1
|
||||
Summary: Session Tools for the GNOME 2.x Desktop
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: gnome
|
||||
Source2: gnome.desktop
|
||||
Patch1: gnome-session-2.0.5-dithering.patch
|
||||
Patch4: gnome-session-suspend.patch
|
||||
Patch6: gnome-session-DESKTOP_LAUNCH.patch
|
||||
Patch7: gnome-session-splash-screen.diff
|
||||
Patch8: gnome-session-remove-dns-warning.patch
|
||||
Patch12: gnome-session-speedup.patch
|
||||
Patch16: gnome-session-2.12.0-xgl-display-modal-2.patch
|
||||
Patch18: gnome-session-2.12.0-su-session-management.patch
|
||||
Patch19: gnome-session-2.12.0-unlock-keyring.patch
|
||||
Patch21: gnome-session-2.12.0-kdm-support.patch
|
||||
Patch22: gnome-session-motd.patch
|
||||
Patch24: gnome-session-dist-splash.patch
|
||||
Patch26: gnome-session-compiz.patch
|
||||
Patch27: gnome-session-migrate-session-manual.patch
|
||||
Patch29: gnome-session-wm-switch.patch
|
||||
Patch0: gnome-session-suspend.patch
|
||||
Patch1: gnome-session-DESKTOP_LAUNCH.patch
|
||||
Patch2: gnome-session-splash-screen.diff
|
||||
Patch3: gnome-session-remove-dns-warning.patch
|
||||
# Patch12 probably can go.
|
||||
### Patch12: gnome-session-speedup.patch
|
||||
Patch4: gnome-session-2.12.0-xgl-display-modal-2.patch
|
||||
Patch5: gnome-session-2.12.0-su-session-management.patch
|
||||
Patch6: gnome-session-2.12.0-unlock-keyring.patch
|
||||
Patch7: gnome-session-2.12.0-kdm-support.patch
|
||||
Patch8: gnome-session-motd.patch
|
||||
Patch9: gnome-session-dist-splash.patch
|
||||
Patch10: gnome-session-compiz.patch
|
||||
Patch11: gnome-session-migrate-session-manual.patch
|
||||
Patch12: gnome-session-wm-switch.patch
|
||||
# FIXME: This doesn't apply. Somebody should go through it and
|
||||
# make it apply.
|
||||
Patch30: gnome-session-tile-ui.patch
|
||||
Patch31: gnome-session-bug_255906.patch
|
||||
Patch13: gnome-session-tile-ui.patch
|
||||
URL: http://www.gnome.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Autoreqprov: on
|
||||
@ -70,25 +69,23 @@ Authors:
|
||||
%prep
|
||||
%setup -q
|
||||
gnome-patch-translation-prepare
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3
|
||||
### %patch12
|
||||
%patch4
|
||||
%patch6 -p1
|
||||
%patch5 -p1
|
||||
#%patch6 -p1
|
||||
%if %suse_version > 1000
|
||||
%patch7 -p1
|
||||
%patch8
|
||||
%patch9 -p0
|
||||
%patch10
|
||||
%patch11 -p1
|
||||
%patch12
|
||||
%patch16
|
||||
%patch18 -p1
|
||||
#%patch19 -p1
|
||||
%if %suse_version > 1000
|
||||
%patch21 -p1
|
||||
%patch22
|
||||
%patch24 -p0
|
||||
%patch26
|
||||
%patch27 -p1
|
||||
%patch29
|
||||
# %patch30 -p1
|
||||
# %patch13 -p1
|
||||
%endif
|
||||
%patch31
|
||||
gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
@ -138,6 +135,96 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jul 10 2007 - maw@suse.de
|
||||
- Update to version 2.19.4
|
||||
==============
|
||||
Version 2.19.4
|
||||
==============
|
||||
Session Manager
|
||||
* Use g_timeout_add_seconds() when possible (Vincent)
|
||||
* Improve a bit "wrong clock" check when the user has reconfigured his
|
||||
clock (Vincent)
|
||||
* Fix crash when icons on the splash screen needs to be relayout-ed
|
||||
(Vincent)
|
||||
* Fix compilation issue on Solaris (Vincent)
|
||||
Session Properties Dialog
|
||||
* Fix a crash when the comment for a .desktop file is not defined and a
|
||||
startup program is disabled (Vincent)
|
||||
Misc
|
||||
* Require glib 2.13.0
|
||||
Translators
|
||||
* Tshewang Norbu (dz)
|
||||
==============
|
||||
Version 2.19.3
|
||||
==============
|
||||
Session Manager
|
||||
* Don't do logout fade if there's a compositing manager running
|
||||
(Ray Strode, Bastien Nocera)
|
||||
* Start accessibility if GNOME_ACCESSIBILITY is set (Wouter Bolsterlee,
|
||||
Vincent)
|
||||
Session Properties Dialog
|
||||
* Small code cleanup (Vincent)
|
||||
Translators
|
||||
* David Lodge (en_GB)
|
||||
* Jorge González (es)
|
||||
* Ivar Smolin (et)
|
||||
* Espen Stefansen (nb)
|
||||
* Daniel Nylander (sv)
|
||||
* Theppitak Karoonboonyanan (th)
|
||||
===============
|
||||
Version 2.19.2
|
||||
===============
|
||||
Session Manager
|
||||
* Use g_usleep() instead of usleep() (Bastien Nocera)
|
||||
* Don't hardcode start of assistive technologies software (Ariel Rios,
|
||||
Vincent)
|
||||
* Fix splash screen in RTL environments (Yair Hershkovitz)
|
||||
* Improve splash screen on old displays (Fedora patch)
|
||||
* Make it possible to use a shaped window for the splash screen
|
||||
(Fedora patch, Vincent)
|
||||
* Display the name of the started application in splash screen even if
|
||||
there's no icon (Vincent)
|
||||
* Don't use deprecated functions (Christian Persch, Vincent)
|
||||
* Don't hardcode esound for the sound daemon (Matthias Clasen, Vincent)
|
||||
* Make the fade on logout faster (Christof Krüger)
|
||||
* Plug leaks (Vincent)
|
||||
* Warn the user if he logs in as root (Vincent, Dan Winship)
|
||||
* Warn the user if the clock is totally wrong and let him launch a
|
||||
config tool (Vincent, Dan Winship)
|
||||
* Change strings about saving the session to be more user-friendly
|
||||
(Vincent)
|
||||
* Remove workaround that chrooted esd to / (fixed in esd) (Vincent)
|
||||
* Make it possible to save a session with multiple clients that are the
|
||||
same program (Hans de Goede, Dan Winship)
|
||||
* Use the new socket path for GDM (Loïc Minier)
|
||||
Session Properties Dialog
|
||||
* Use Add/Remove instead of New/Delete for handling startup programs
|
||||
(Luca Ferretti)
|
||||
* Show the comments in the startup programs list (Vincent)
|
||||
* Change strings about saving the session to be more user-friendly
|
||||
(Vincent)
|
||||
* Make it possible to sort the program lists by clicking on the headers
|
||||
(Vincent)
|
||||
* Create a non-localized version of the Comment field in .desktop files
|
||||
if necessary (Vincent)
|
||||
Misc
|
||||
* Remove xrdb check (Andreas Hanke)
|
||||
* Build fixes (Andreas Hanke, Christian Persch)
|
||||
* Require glib 2.12.0 (Vincent)
|
||||
* Add --with-time-utility configure flag to set the executable that is
|
||||
used to configure the time of the computer (Vincent)
|
||||
* Don't require libgnome-desktop anymore (Vincent)
|
||||
* Add support for beryl in gnome-wm (Alex)
|
||||
Translators
|
||||
* Peter Bach (da)
|
||||
* Jorge González (es)
|
||||
* Ivar Smolin (et)
|
||||
* Iñaki Larrañaga Murgoitio (eu)
|
||||
* Ignacio Casal Quinteiro (gl)
|
||||
* Yair Hershkovitz (he)
|
||||
* Espen Stefansen (nb)
|
||||
* Yannig MARCHEGAY (Kokoyaya) (oc)
|
||||
* Yang Zhang (zh_CN)
|
||||
* Wed Apr 04 2007 - sbrabec@suse.cz
|
||||
- Session start script (gnome) cleanup (#254439).
|
||||
* Tue Apr 03 2007 - jhargadon@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user