← Back to branch summary

~xubuntu-dev/xfce4-session/grumpy

« back to all changes in this revision

Viewing changes to debian/patches/02_use-mice-as-default-engine.patch

  • Committer: corsac
  • Date: 2009-02-27 01:13:49 UTC
  • mto: This revision was merged to the branch mainline in revision 114.
  • Revision ID: svn-v4:0c9b3bff-18ee-0310-b944-d1aa2700132f:desktop/trunk/xfce4-session:2781
merge back xfce 4.6 from svn-snapshots

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_use-mice-as-default-engine.patch
1
 
--- xfce4-session/xfce4-session/main.c.orig     2006-11-04 19:42:52.000000000 +0100
2
 
+++ xfce4-session/xfce4-session/main.c  2006-12-18 10:52:41.000000000 +0100
3
 
@@ -61,6 +61,7 @@
4
 
 #include <xfce4-session/xfsm-manager.h>
5
 
 #include <xfce4-session/xfsm-startup.h>
6
 
 
7
 
+#define DEFAULT_SPLASH_ENGINE "mice"
8
 
 
9
 
 void
10
 
 setup_environment (void)
11
 
@@ -134,7 +135,7 @@
12
 
   gint n;
13
 
 
14
 
   xfce_rc_set_group (rc, "Splash Screen");
15
 
-  engine = xfce_rc_read_entry (rc, "Engine", NULL);
16
 
+  engine = xfce_rc_read_entry (rc, "Engine", DEFAULT_SPLASH_ENGINE);
17
 
 
18
 
   splash_screen = xfsm_splash_screen_new (dpy, engine);  
19
 
   xfsm_splash_screen_next (splash_screen, _("Loading desktop settings"));
20
 
--- xfce4-session/xfce4-session.rc.orig 2006-11-04 19:42:56.000000000 +0100
21
 
+++ xfce4-session/xfce4-session.rc      2006-12-18 11:58:25.000000000 +0100
22
 
@@ -44,8 +44,3 @@
23
 
 Client2_PerScreen=False
24
 
 Client3_Command=xfdesktop
25
 
 Client3_PerScreen=False
26
 
-
27
 
-
28
 
-# Default splash screen selection.
29
 
-[Splash Screen]
30
 
-Engine=mice