]>
Commit | Line | Data |
---|---|---|
501bf5e1 | 1 | --- fsviewer-0.2.3.orig/src/FSFileView.c |
2 | +++ fsviewer-0.2.3/src/FSFileView.c | |
3 | @@ -397,10 +397,10 @@ | |
4 | if ((fView->primary)) | |
5 | { | |
6 | memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes)); | |
7 | - attributes.window_style = (NSTitledWindowMask | | |
8 | - NSMiniaturizableWindowMask | | |
9 | - NSResizableWindowMask); | |
10 | - attributes.window_level = NSNormalWindowLevel; | |
11 | + attributes.window_style = (WMTitledWindowMask | | |
12 | + WMMiniaturizableWindowMask | | |
13 | + WMResizableWindowMask); | |
14 | + attributes.window_level = WMNormalWindowLevel; | |
15 | attributes.extra_flags = GSFullKeyboardEventsFlag; | |
16 | attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr | | |
17 | GSExtraFlagsAttr); | |
18 | --- fsviewer-0.2.3.orig/src/FSFinder.c | |
19 | +++ fsviewer-0.2.3/src/FSFinder.c | |
20 | @@ -138,11 +138,11 @@ | |
21 | } | |
22 | ||
23 | memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes)); | |
24 | - attributes.window_style = (NSTitledWindowMask | | |
25 | - NSMiniaturizableWindowMask | | |
26 | - NSClosableWindowMask | | |
27 | - NSResizableWindowMask); | |
28 | - attributes.window_level = NSNormalWindowLevel; | |
29 | + attributes.window_style = (WMTitledWindowMask | | |
30 | + WMMiniaturizableWindowMask | | |
31 | + WMClosableWindowMask | | |
32 | + WMResizableWindowMask); | |
33 | + attributes.window_level = WMNormalWindowLevel; | |
34 | attributes.extra_flags = GSFullKeyboardEventsFlag; | |
35 | attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr | | |
36 | GSExtraFlagsAttr); | |
37 | --- fsviewer-0.2.3.orig/src/FSPanel.c | |
38 | +++ fsviewer-0.2.3/src/FSPanel.c | |
39 | @@ -1564,10 +1564,10 @@ | |
40 | WMCloseWindow(selIcon->win); | |
41 | WMUnmapWidget(selIcon->win); | |
42 | WMDestroyWidget(selIcon->win); | |
43 | - free((void *) selIcon); | |
44 | if(selIcon->iconName) | |
45 | imgStr = wstrdup(selIcon->iconName); | |
46 | ||
47 | + free((void *) selIcon); | |
48 | selIcon = NULL; | |
49 | ||
50 | return imgStr; | |
51 | --- fsviewer-0.2.3.orig/src/FSViewer.c | |
52 | +++ fsviewer-0.2.3/src/FSViewer.c | |
53 | @@ -127,8 +127,8 @@ | |
54 | } | |
55 | ||
56 | memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes)); | |
57 | - attributes.window_style = (NSTitledWindowMask | NSClosableWindowMask); | |
58 | - attributes.window_level = NSFloatingWindowLevel; | |
59 | + attributes.window_style = (WMTitledWindowMask | WMClosableWindowMask); | |
60 | + attributes.window_level = WMFloatingWindowLevel; | |
61 | attributes.extra_flags = GSFullKeyboardEventsFlag; | |
62 | attributes.flags = | |
63 | (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr); | |
64 | @@ -153,10 +153,10 @@ | |
65 | } | |
66 | ||
67 | memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes)); | |
68 | - attributes.window_style = (NSTitledWindowMask | | |
69 | - NSClosableWindowMask | | |
70 | - NSMiniaturizableWindowMask); | |
71 | - attributes.window_level = NSNormalWindowLevel; | |
72 | + attributes.window_style = (WMTitledWindowMask | | |
73 | + WMClosableWindowMask | | |
74 | + WMMiniaturizableWindowMask); | |
75 | + attributes.window_level = WMNormalWindowLevel; | |
76 | attributes.extra_flags = GSFullKeyboardEventsFlag; | |
77 | attributes.flags = | |
78 | (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr); | |
79 | @@ -182,8 +182,8 @@ | |
80 | // This is horrible: there must be a better way? | |
81 | XStoreName(fsViewer->dpy, window, " "); | |
82 | memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes)); | |
83 | - attributes.window_style = (NSTitledWindowMask); | |
84 | - attributes.window_level = NSFloatingWindowLevel; | |
85 | + attributes.window_style = (WMTitledWindowMask); | |
86 | + attributes.window_level = WMFloatingWindowLevel; | |
87 | attributes.extra_flags = GSFullKeyboardEventsFlag; | |
88 | attributes.flags = | |
89 | (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr); |