xsplash

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

  1. screen-size-changed
  2. Merge into trunk
Proposed by Cody Russell
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~bratsche/xsplash/screen-size-changed
Merge into: lp://qastaging/xsplash
Diff against target: 38 lines
1 file modified
src/xsplash.c (+8/-4)
To merge this branch: bzr merge lp://qastaging/~bratsche/xsplash/screen-size-changed
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Review via email: mp+13420@code.qastaging.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
1=== modified file 'src/xsplash.c'
2--- src/xsplash.c 2009-10-14 22:35:08 +0000
3+++ src/xsplash.c 2009-10-15 15:50:22 +0000
4@@ -579,7 +579,7 @@
5 gtk_fixed_move (GTK_FIXED (priv->fixed),
6 priv->logo,
7 get_monitor_width () / 2 - gdk_pixbuf_get_width (priv->logo_pixbuf) / 2,
8- get_monitor_height () / 3 - gdk_pixbuf_get_height (priv->logo_pixbuf) / 2);;
9+ get_monitor_height () / 3 - gdk_pixbuf_get_height (priv->logo_pixbuf) / 2);
10 }
11 }
12
13@@ -630,10 +630,10 @@
14 }
15
16 static void
17-monitors_changed (GdkScreen *screen,
18+image_size_changed (GdkScreen *screen,
19 gpointer user_data)
20 {
21- XsplashServer *server= (XsplashServer *)user_data;
22+ XsplashServer *server = (XsplashServer *)user_data;
23
24 setup_background_image (server);
25 setup_logo_image (server);
26@@ -692,7 +692,11 @@
27 server);
28 g_signal_connect (G_OBJECT (priv->screen),
29 "monitors-changed",
30- G_CALLBACK (monitors_changed),
31+ G_CALLBACK (image_size_changed),
32+ server);
33+ g_signal_connect (G_OBJECT (priv->screen),
34+ "size-changed",
35+ G_CALLBACK (image_size_changed),
36 server);
37
38 g_signal_connect (priv->window,

Subscribers

People subscribed via source and target branches