Merge lp:~bratsche/xsplash/screen-size-changed into lp:xsplash

Proposed by Cody Russell
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bratsche/xsplash/screen-size-changed
Merge into: lp:xsplash
Diff against target: 38 lines
1 file modified
src/xsplash.c (+8/-4)
To merge this branch: bzr merge lp:~bratsche/xsplash/screen-size-changed
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Review via email: mp+13420@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Barth (dbarth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/xsplash.c'
--- src/xsplash.c 2009-10-14 22:35:08 +0000
+++ src/xsplash.c 2009-10-15 15:50:22 +0000
@@ -579,7 +579,7 @@
579 gtk_fixed_move (GTK_FIXED (priv->fixed),579 gtk_fixed_move (GTK_FIXED (priv->fixed),
580 priv->logo,580 priv->logo,
581 get_monitor_width () / 2 - gdk_pixbuf_get_width (priv->logo_pixbuf) / 2,581 get_monitor_width () / 2 - gdk_pixbuf_get_width (priv->logo_pixbuf) / 2,
582 get_monitor_height () / 3 - gdk_pixbuf_get_height (priv->logo_pixbuf) / 2);;582 get_monitor_height () / 3 - gdk_pixbuf_get_height (priv->logo_pixbuf) / 2);
583 }583 }
584}584}
585585
@@ -630,10 +630,10 @@
630}630}
631631
632static void632static void
633monitors_changed (GdkScreen *screen,633image_size_changed (GdkScreen *screen,
634 gpointer user_data)634 gpointer user_data)
635{635{
636 XsplashServer *server= (XsplashServer *)user_data;636 XsplashServer *server = (XsplashServer *)user_data;
637637
638 setup_background_image (server);638 setup_background_image (server);
639 setup_logo_image (server);639 setup_logo_image (server);
@@ -692,7 +692,11 @@
692 server);692 server);
693 g_signal_connect (G_OBJECT (priv->screen),693 g_signal_connect (G_OBJECT (priv->screen),
694 "monitors-changed",694 "monitors-changed",
695 G_CALLBACK (monitors_changed),695 G_CALLBACK (image_size_changed),
696 server);
697 g_signal_connect (G_OBJECT (priv->screen),
698 "size-changed",
699 G_CALLBACK (image_size_changed),
696 server);700 server);
697701
698 g_signal_connect (priv->window,702 g_signal_connect (priv->window,

Subscribers

People subscribed via source and target branches