rpms/rhgb/devel rhgb-eeepc.patch,1.1,1.2 rhgb.spec,1.99,1.100

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/rhgb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4942

Modified Files:
	rhgb-eeepc.patch rhgb.spec 
Log Message:
sync with F9


rhgb-eeepc.patch:

Index: rhgb-eeepc.patch
===================================================================
RCS file: /cvs/extras/rpms/rhgb/devel/rhgb-eeepc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rhgb-eeepc.patch	2 May 2008 17:29:28 -0000	1.1
+++ rhgb-eeepc.patch	2 May 2008 17:47:03 -0000	1.2
@@ -1,30 +1,22 @@
 diff -up rhgb-9.0.0/src/splash.c.eeepc rhgb-9.0.0/src/splash.c
---- rhgb-9.0.0/src/splash.c.eeepc	2008-05-02 13:21:20.000000000 -0400
-+++ rhgb-9.0.0/src/splash.c	2008-05-02 13:21:24.000000000 -0400
-@@ -171,7 +171,7 @@ window_realize (GtkWindow *window,
+--- rhgb-9.0.0/src/splash.c.eeepc	2008-05-02 13:39:25.000000000 -0400
++++ rhgb-9.0.0/src/splash.c	2008-05-02 13:43:30.000000000 -0400
+@@ -171,7 +171,8 @@ window_realize (GtkWindow *window,
    GdkAtom atom;
  
    gtk_window_move (window, splash->x, splash->y);
 -  gtk_window_fullscreen (window);
-+//  gtk_window_fullscreen (window);
++  if (!g_getenv ("RHGB_WIDTH") || !g_getenv ("RHGB_HEIGHT"))
++    gtk_window_fullscreen (window);
  
    /*
     * Jonathan's hack ask the WM to move on the 2nd desktop to get it
-@@ -239,6 +239,8 @@ expand_pixbuf (GdkPixbuf *p, gint w2, gi
-   w = gdk_pixbuf_get_width (p);
-   h = gdk_pixbuf_get_height (p);
- 
-+  g_print ("expanding pixbuf from %dx%d to %dx%d\n", w, h, w2, h2);
-+
-   p2 = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, w2, h2);
- 
-   w1 = MIN (w, w2) / 2;
-@@ -275,14 +277,17 @@ event_box_realize (GtkWidget *widget)
+@@ -275,14 +276,17 @@ event_box_realize (GtkWidget *widget)
  
    screen = gdk_screen_get_default ();
    gdk_screen_get_monitor_geometry (screen, 0, &rect);
 -  screen_height = rect.height;
-+  if (g_getenv ("RHGB_HEIGHT")) 
++  if (g_getenv ("RHGB_WIDTH") && g_getenv ("RHGB_HEIGHT")) 
 +    screen_height = atoi (g_getenv ("RHGB_HEIGHT"));
 +  else
 +    screen_height = rect.height;
@@ -40,7 +32,7 @@
  #endif
      }
    else
-@@ -408,17 +413,28 @@ splash_new (void)
+@@ -408,17 +412,28 @@ splash_new (void)
    splash = g_new0 (Splash, 1);
  
    screen = gdk_screen_get_default ();


Index: rhgb.spec
===================================================================
RCS file: /cvs/extras/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- rhgb.spec	2 May 2008 17:29:28 -0000	1.99
+++ rhgb.spec	2 May 2008 17:47:03 -0000	1.100
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 9.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -61,6 +61,9 @@
 
 %changelog
 * Fri May  2 2008 Matthias Clasen <mclasen at redhat.com> - 1:9.0.0-4
+- Remove debug spew
+
+* Fri May  2 2008 Matthias Clasen <mclasen at redhat.com> - 1:9.0.0-4
 - Make the splash on 800x480 (#444944)
 
 * Thu Apr 24 2008 Bill Nottingham <notting at redhat.com> - 1:9.0.0-3