Annotation of /trunk/xtdesktop/patches/xtdesktop-0.7b-gcc4.patch
Parent Directory | Revision Log
Revision 648 -
(hide annotations)
(download)
Wed Jun 4 13:15:49 2008 UTC (16 years, 3 months ago) by niro
File size: 1741 byte(s)
Wed Jun 4 13:15:49 2008 UTC (16 years, 3 months ago) by niro
File size: 1741 byte(s)
-patches for xtdesktop-0.7b-r1
1 | niro | 648 | diff -Naur xtdesktop-0.7b/desk.h xtdesktop-0.7b-magellan/desk.h |
2 | --- xtdesktop-0.7b/desk.h 2004-09-08 09:25:25.000000000 +0200 | ||
3 | +++ xtdesktop-0.7b-magellan/desk.h 2008-06-04 15:08:35.000000000 +0200 | ||
4 | @@ -110,7 +110,7 @@ | ||
5 | void LoadIcons (void); | ||
6 | void setCheckMountProc (Icon * I); | ||
7 | static void procIsMounted (Icon * I); | ||
8 | - Boolean Desk::isMounted (char *mnt); | ||
9 | + Boolean isMounted (char *mnt); | ||
10 | static Boolean procExecJobs (XtPointer D); | ||
11 | Boolean ExecJobs (void); | ||
12 | inline Pixmap getUPixmap(void){return UnknownPixmap;}; | ||
13 | @@ -128,7 +128,7 @@ | ||
14 | inline int getCaptionBorder(void) { return CaptionBorder; }; | ||
15 | inline int getsnapX (void) { return snapX; }; | ||
16 | inline int getsnapY (void) { return snapY; }; | ||
17 | - void Desk::LowerIcons(Icon *I); | ||
18 | + void LowerIcons(Icon *I); | ||
19 | }; | ||
20 | |||
21 | #endif | ||
22 | diff -Naur xtdesktop-0.7b/icon.h xtdesktop-0.7b-magellan/icon.h | ||
23 | --- xtdesktop-0.7b/icon.h 2004-06-12 07:28:58.000000000 +0200 | ||
24 | +++ xtdesktop-0.7b-magellan/icon.h 2008-06-04 15:08:59.000000000 +0200 | ||
25 | @@ -106,8 +106,8 @@ | ||
26 | void updateMount (Boolean state); | ||
27 | inline char* getConfigFile(void) { return ConfigFile; }; | ||
28 | void checkAccess( char *path, int mode ); | ||
29 | - void Icon::raiseme (void); | ||
30 | - void Icon::lowerme (void); | ||
31 | + void raiseme (void); | ||
32 | + void lowerme (void); | ||
33 | }; | ||
34 | |||
35 | #endif | ||
36 | diff -Naur xtdesktop-0.7b/menu.h xtdesktop-0.7b-magellan/menu.h | ||
37 | --- xtdesktop-0.7b/menu.h 2004-06-07 15:13:16.000000000 +0200 | ||
38 | +++ xtdesktop-0.7b-magellan/menu.h 2008-06-04 15:08:46.000000000 +0200 | ||
39 | @@ -36,7 +36,7 @@ | ||
40 | }; | ||
41 | void AddCommand (char *item, char *command); | ||
42 | void AddProps(char *item, Icon *I); | ||
43 | - static void PopupMenu::procExec (Widget w, XtPointer client_data, | ||
44 | + static void procExec (Widget w, XtPointer client_data, | ||
45 | XtPointer call_data); | ||
46 | }; | ||
47 |