ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00528
[Branch ~xsplash-team/xsplash/trunk] Rev 87: merge lp:~bratsche/xsplash/screen-size-changed, bug #413348
Merge authors:
Cody Russell (bratsche)
Related merge proposals:
https://code.launchpad.net/~bratsche/xsplash/screen-size-changed/+merge/13420
proposed by: Cody Russell (bratsche)
review: Approve - David Barth (dbarth)
------------------------------------------------------------
revno: 87 [merge]
committer: Cody Russell <crussell@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2009-10-15 11:31:57 -0500
message:
merge lp:~bratsche/xsplash/screen-size-changed, bug #413348
modified:
src/xsplash.c
--
lp:xsplash
https://code.launchpad.net/~xsplash-team/xsplash/trunk
Your team ayatana-commits is subscribed to branch lp:xsplash.
To unsubscribe from this branch go to https://code.launchpad.net/~xsplash-team/xsplash/trunk/+edit-subscription.
=== modified file 'src/xsplash.c'
--- src/xsplash.c 2009-10-14 22:35:08 +0000
+++ src/xsplash.c 2009-10-15 16:31:57 +0000
@@ -579,7 +579,7 @@
gtk_fixed_move (GTK_FIXED (priv->fixed),
priv->logo,
get_monitor_width () / 2 - gdk_pixbuf_get_width (priv->logo_pixbuf) / 2,
- get_monitor_height () / 3 - gdk_pixbuf_get_height (priv->logo_pixbuf) / 2);;
+ get_monitor_height () / 3 - gdk_pixbuf_get_height (priv->logo_pixbuf) / 2);
}
}
@@ -630,10 +630,10 @@
}
static void
-monitors_changed (GdkScreen *screen,
+image_size_changed (GdkScreen *screen,
gpointer user_data)
{
- XsplashServer *server= (XsplashServer *)user_data;
+ XsplashServer *server = (XsplashServer *)user_data;
setup_background_image (server);
setup_logo_image (server);
@@ -692,7 +692,11 @@
server);
g_signal_connect (G_OBJECT (priv->screen),
"monitors-changed",
- G_CALLBACK (monitors_changed),
+ G_CALLBACK (image_size_changed),
+ server);
+ g_signal_connect (G_OBJECT (priv->screen),
+ "size-changed",
+ G_CALLBACK (image_size_changed),
server);
g_signal_connect (priv->window,