summaryrefslogtreecommitdiffstats
path: root/redhat/kdebase/kdebase-3.5.13-fix_rhel4_compilation.patch
blob: 21ee6a4bff7a41d214f40ad1500406b9b1c14211 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
--- kdebase/kwin/kompmgr/kompmgr.c.rhel4	2012-09-06 22:02:37.201586743 +0200
+++ kdebase/kwin/kompmgr/kompmgr.c	2012-09-06 22:04:39.529337359 +0200
@@ -89,6 +89,8 @@
 #include <pwd.h>
 #endif
 
+#define ShapeInput                     2
+
 typedef enum {
     WINTYPE_DESKTOP,
     WINTYPE_DOCK,
@@ -403,6 +405,70 @@
 #endif
 }
 
+void
+loadConfig(char *filename){
+	FILE           *file = NULL;
+	char            line[ 1024 ];
+	size_t          length = 0;
+	Bool            wasNull = False;
+	Bool            section = False;
+
+	if( filename == NULL ){
+#ifdef USE_ENV_HOME
+		const char *home = getenv("HOME");
+#else
+		const char *home;
+		struct passwd *p;
+		p = getpwuid(getuid());
+		if (p)
+			home = p->pw_dir;
+		else
+			home = getenv("HOME");
+#endif
+		const char *configfile = "/.xcompmgrrc"; 
+		int n = strlen(home)+strlen(configfile)+1;
+		filename = (char*)malloc(n*sizeof(char));
+		memset(filename,0,n);
+		wasNull = True;
+
+		strcat(filename, home);
+		strcat(filename, configfile);
+	}
+
+	printf("trying '%s' as configfile\n\n", filename);
+
+	if( (file = fopen(filename, "r")) == NULL ){
+		printf("failed to open config file. does it exist?\n");
+		if( wasNull ){
+			free(filename);
+			filename = NULL;
+		}
+		return;
+	}
+
+	/*find section*/
+	while( !section && fgets(line, 1023, file) != NULL ){
+		if( strcmp(line, "[xcompmgr]\n") == 0 )
+			section = True;
+	}
+	/*read and set values*/
+	while( section && fgets(line, 1023, file) != NULL ){
+		int ret = strlen( line );
+		if( ret > 1 ){
+			if( *line == '[' )/*found new section - maybe check for '\n'?*/
+				break;
+			*(line+ret-1) = '\0';
+			setParameter(line);
+		}
+	}
+	printf("\nfinished parsing the config file\n");
+	fclose(file);
+	if( wasNull ){
+		free(filename);
+		filename = NULL;
+	}
+}
+
 void handle_siguser (int sig)
 {
     int uidnum;
@@ -2992,69 +3058,6 @@
 	return 0;
 }
 
-void
-loadConfig(char *filename){
-	FILE           *file = NULL;
-	char            line[ 1024 ];
-	size_t          length = 0;
-	Bool            wasNull = False;
-	Bool            section = False;
-
-	if( filename == NULL ){
-#ifdef USE_ENV_HOME
-		const char *home = getenv("HOME");
-#else
-		const char *home;
-		struct passwd *p;
-		p = getpwuid(getuid());
-		if (p)
-			home = p->pw_dir;
-		else
-			home = getenv("HOME");
-#endif
-		const char *configfile = "/.xcompmgrrc"; 
-		int n = strlen(home)+strlen(configfile)+1;
-		filename = (char*)malloc(n*sizeof(char));
-		memset(filename,0,n);
-		wasNull = True;
-
-		strcat(filename, home);
-		strcat(filename, configfile);
-	}
-
-	printf("trying '%s' as configfile\n\n", filename);
-
-	if( (file = fopen(filename, "r")) == NULL ){
-		printf("failed to open config file. does it exist?\n");
-		if( wasNull ){
-			free(filename);
-			filename = NULL;
-		}
-		return;
-	}
-
-	/*find section*/
-	while( !section && fgets(line, 1023, file) != NULL ){
-		if( strcmp(line, "[xcompmgr]\n") == 0 )
-			section = True;
-	}
-	/*read and set values*/
-	while( section && fgets(line, 1023, file) != NULL ){
-		int ret = strlen( line );
-		if( ret > 1 ){
-			if( *line == '[' )/*found new section - maybe check for '\n'?*/
-				break;
-			*(line+ret-1) = '\0';
-			setParameter(line);
-		}
-	}
-	printf("\nfinished parsing the config file\n");
-	fclose(file);
-	if( wasNull ){
-		free(filename);
-		filename = NULL;
-	}
-}
 
 	void
 usage (char *program)