Added simple redhat shutdown code (dunno if this works actually, copied from

gnome-session) per botsie's request. Added lots of .cvsignore files. Use
Brians XfceColorButton instead of the 2.4-only GtkColorButton widget.
Removed the custom xinitrc script, its no longer required, since xinitrc
starts xfce4-session automatically.


(Old svn revision: 4623)

8 files changed, 28 insertions, 8 deletions

diff --git a/engines/.cvsignore b/engines/.cvsignore
new file mode 100644
index 00000000..f3c7a7c5
--- /dev/null
+++ b/engines/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/engines/balou/.cvsignore b/engines/balou/.cvsignore
new file mode 100644
index 00000000..fb21864a
--- /dev/null
+++ b/engines/balou/.cvsignore
@@ -0,0 +1,9 @@
+.deps
+.libs
+Makefile
+libbalou.la
+libbalou_la-balou-theme.lo
+libbalou_la-balou.lo
+libbalou_la-config.lo
+libbalou_la-engine.lo
+libbalou_la-gnome-uri.lo
diff --git a/engines/balou/scripts/.cvsignore b/engines/balou/scripts/.cvsignore
new file mode 100644
index 00000000..f3c7a7c5
--- /dev/null
+++ b/engines/balou/scripts/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/engines/balou/themes/.cvsignore b/engines/balou/themes/.cvsignore
new file mode 100644
index 00000000..f3c7a7c5
--- /dev/null
+++ b/engines/balou/themes/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/engines/balou/themes/Default/.cvsignore b/engines/balou/themes/Default/.cvsignore
new file mode 100644
index 00000000..f3c7a7c5
--- /dev/null
+++ b/engines/balou/themes/Default/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/engines/mice/.cvsignore b/engines/mice/.cvsignore
new file mode 100644
index 00000000..5a52270c
--- /dev/null
+++ b/engines/mice/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+generate
+libmice.la
+libmice_la-mice.lo
diff --git a/engines/simple/.cvsignore b/engines/simple/.cvsignore
new file mode 100644
index 00000000..2c9b25b9
--- /dev/null
+++ b/engines/simple/.cvsignore
@@ -0,0 +1,5 @@
+.deps
+.libs
+Makefile
+libsimple.la
+libsimple_la-simple.lo
diff --git a/engines/simple/simple.c b/engines/simple/simple.c
index f5453304..704f9a36 100644
--- a/engines/simple/simple.c
+++ b/engines/simple/simple.c
@@ -296,7 +296,6 @@ engine_init (XfsmSplashEngine *engine)
 
 
 
-#if GTK_CHECK_VERSION(2,4,0)
 /* FIXME: 2.4.x only because of missing GtkColorButton! Add XfceColorButton
    to libxfcegui4? */
 static void
@@ -395,7 +394,7 @@ config_configure (XfsmSplashConfig *config,
 
   gdk_color_parse (xfsm_splash_rc_read_entry (config->rc, "BgColor",
                                               DEFAULT_BGCOLOR), &color);
-  sel_bg = gtk_color_button_new_with_color (&color);
+  sel_bg = xfce_color_button_new_with_color (&color);
   gtk_table_attach (GTK_TABLE (table), sel_bg, 1, 2, 0, 1,
                     GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (sel_bg);
@@ -407,7 +406,7 @@ config_configure (XfsmSplashConfig *config,
 
   gdk_color_parse (xfsm_splash_rc_read_entry (config->rc, "FgColor",
                                               DEFAULT_FGCOLOR), &color);
-  sel_fg = gtk_color_button_new_with_color (&color);
+  sel_fg = xfce_color_button_new_with_color (&color);
   gtk_table_attach (GTK_TABLE (table), sel_fg, 1, 2, 1, 2,
                     GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (sel_fg);
@@ -466,14 +465,14 @@ config_configure (XfsmSplashConfig *config,
   font = gtk_font_button_get_font_name (GTK_FONT_BUTTON (btn_font));
   xfsm_splash_rc_write_entry (config->rc, "Font", font);
 
-  gtk_color_button_get_color (GTK_COLOR_BUTTON (sel_bg), &color);
+  xfce_color_button_get_color (XFCE_COLOR_BUTTON (sel_bg), &color);
   g_snprintf (buffer, 32, "#%02x%02x%02x",
               (unsigned) color.red >> 8,
               (unsigned) color.green >> 8,
               (unsigned) color.blue >> 8);
   xfsm_splash_rc_write_entry (config->rc, "BgColor", buffer);
 
-  gtk_color_button_get_color (GTK_COLOR_BUTTON (sel_fg), &color);
+  xfce_color_button_get_color (XFCE_COLOR_BUTTON (sel_fg), &color);
   g_snprintf (buffer, 32, "#%02x%02x%02x",
               (unsigned) color.red >> 8,
               (unsigned) color.green >> 8,
@@ -493,7 +492,6 @@ config_configure (XfsmSplashConfig *config,
   
   gtk_widget_destroy (dialog);
 }
-#endif
 
 
 static GdkPixbuf*
@@ -512,9 +510,7 @@ config_init (XfsmSplashConfig *config)
   config->author      = g_strdup ("Benedikt Meurer");
   config->homepage    = g_strdup ("http://www.xfce.org/");
   
-#if GTK_CHECK_VERSION(2,4,0)
   config->configure   = config_configure;
-#endif
   config->preview     = config_preview;
 }