[Xfce4-commits] r26399 - in xfce4-session/trunk: . engines/simple

[Benedikt Meurer]

Author: benny
Date: 2007-11-28 20:57:32 +0000 (Wed, 28 Nov 2007)
New Revision: 26399

Modified:
   xfce4-session/trunk/ChangeLog
   xfce4-session/trunk/engines/simple/fallback.h
   xfce4-session/trunk/engines/simple/preview.h
   xfce4-session/trunk/engines/simple/simple.c
Log:
2007-11-28	Benedikt Meurer <benny at xfce.org>

	* engines/simple/simple.c: Fix dialog layout. Bug #3287.
	* engines/simple/fallback.h, engines/simple/preview.h: Shut up
	  gcc.




Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog	2007-11-28 20:51:26 UTC (rev 26398)
+++ xfce4-session/trunk/ChangeLog	2007-11-28 20:57:32 UTC (rev 26399)
@@ -1,5 +1,11 @@
 2007-11-28	Benedikt Meurer <benny at xfce.org>
 
+	* engines/simple/simple.c: Fix dialog layout. Bug #3287.
+	* engines/simple/fallback.h, engines/simple/preview.h: Shut up
+	  gcc.
+
+2007-11-28	Benedikt Meurer <benny at xfce.org>
+
 	* xfce4-session/xfce4-session.1: Apply patch from Alexander
 	  Toresson <alexander.toresson at gmail.com> to fix typos in
 	  the man page. Bug #3288.

Modified: xfce4-session/trunk/engines/simple/fallback.h
===================================================================
--- xfce4-session/trunk/engines/simple/fallback.h	2007-11-28 20:51:26 UTC (rev 26398)
+++ xfce4-session/trunk/engines/simple/fallback.h	2007-11-28 20:57:32 UTC (rev 26399)
@@ -8,7 +8,7 @@
   350, /* width */
   350, /* height */
   /* pixel_data: */
-  "\377(:_\377\377(:_\377\377(:_\377\377(:_\377\377(:_\377\311(:_\377\203"
+  (guchar *)"\377(:_\377\377(:_\377\377(:_\377\377(:_\377\377(:_\377\311(:_\377\203"
   "(:`\377\377):`\377\377):`\377\311):`\377\203(:`\377\216(:_\377\5(:`\377"
   "):`\377*;a\377*<a\377+<a\377\377+=b\377\377+=b\377\313+=b\377\5+<a\377"
   "*<a\377*;a\377):`\377(:`\377\212(:_\377\7):`\377*;a\377+=b\377,>c\377"

Modified: xfce4-session/trunk/engines/simple/preview.h
===================================================================
--- xfce4-session/trunk/engines/simple/preview.h	2007-11-28 20:51:26 UTC (rev 26398)
+++ xfce4-session/trunk/engines/simple/preview.h	2007-11-28 20:57:32 UTC (rev 26399)
@@ -8,7 +8,7 @@
   225, /* width */
   240, /* height */
   /* pixel_data: */
-  "\377\0\0\0\377\342\0\0\0\377\1\12\17\31\377\377\35*E\377\337\35*E\377"
+  (guchar*)"\377\0\0\0\377\342\0\0\0\377\1\12\17\31\377\377\35*E\377\337\35*E\377"
   "\3\25\36""2\377\0\0\0\377\17\25\"\377\377(:_\377\337(:_\377\3\35*E\377"
   "\0\0\0\377\17\25\"\377\203(:_\377\3):`\377*;a\377+<b\377\377+=b\377\323"
   "+=b\377\3*<b\377*;a\377):`\377\203(:_\377\3\35*E\377\0\0\0\377\17\25"

Modified: xfce4-session/trunk/engines/simple/simple.c
===================================================================
--- xfce4-session/trunk/engines/simple/simple.c	2007-11-28 20:51:26 UTC (rev 26398)
+++ xfce4-session/trunk/engines/simple/simple.c	2007-11-28 20:57:32 UTC (rev 26399)
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2003-2004 Benedikt Meurer <benny at xfce.org>
+ * Copyright (c) 2003-2007 Benedikt Meurer <benny at xfce.org>
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -429,7 +429,7 @@
 
   entry = gtk_entry_new ();
   gtk_table_attach (GTK_TABLE (table), entry, 0, 1, 1, 2,
-                    GTK_FILL, GTK_FILL, 0, 0);
+                    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (entry);
 
   image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
@@ -437,7 +437,7 @@
   button = gtk_button_new ();
   gtk_container_add (GTK_CONTAINER (button), image);
   gtk_table_attach (GTK_TABLE (table), button, 1, 2, 1, 2,
-                    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+                    GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (button);
 
   path = xfsm_splash_rc_read_entry (config->rc, "Image", NULL);