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
|
diff -Naurp -p isomaster-1.3.7.orig/Makefile isomaster-1.3.7/Makefile
--- isomaster-1.3.7.orig/Makefile 2010-01-09 14:18:00.333993253 +0100
+++ isomaster-1.3.7/Makefile 2010-01-09 15:17:31.047246400 +0100
@@ -65,21 +65,18 @@ OBJECTS = isomaster.o window.o browser.o
all: translations isomaster.desktop isomaster
-isomaster: $(OBJECTS) lib iniparser
+isomaster: $(OBJECTS) lib
@echo 'Linking isomaster'
- @$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
+ @$(CC) $(LDFLAGS) $(OBJECTS) bk/bk.a `pkg-config --libs gtk+-2.0` -liniparser -o isomaster
# static pattern rule
$(OBJECTS): %.o: %.c %.h bk/bk.h Makefile
@echo 'Compiling' $<
- @$(CC) $< $(CFLAGS) $(CPPFLAGS) -c -o $@
+ @$(CC) $(CFLAGS) $(CPPFLAGS) $< -c -o $@
lib:
cd bk && $(MAKE)
-iniparser:
- cd iniparser-2.17 && $(MAKE)
-
translations:
ifndef WITHOUT_NLS
cd po && $(MAKE)
@@ -94,7 +91,6 @@ bk-doc:
clean:
cd bk && $(MAKE) clean
- cd iniparser-2.17 && $(MAKE) clean
ifndef WITHOUT_NLS
cd po && $(MAKE) clean
endif
diff -Naurp -p isomaster-1.3.7.orig/settings.c isomaster-1.3.7/settings.c
--- isomaster-1.3.7.orig/settings.c 2010-01-09 14:18:00.329993692 +0100
+++ isomaster-1.3.7/settings.c 2010-01-09 15:19:29.052995022 +0100
@@ -607,7 +607,7 @@ void loadSettings(void)
GBLappSettings.recentlyOpen[i] = NULL;
if(GBLsettingsDictionary != NULL)
{
- char configNameStr[20] = "ui:recentlyopen";
+ char configNameStr[46] = "ui:recentlyopen";
snprintf(configNameStr + 15, 20, "%d", i);
tempStr = iniparser_getstring(GBLsettingsDictionary,
@@ -892,7 +892,7 @@ void writeSettings(void)
for(int i = 0; i < 5; i++)
{
- char configNameStr[20] = "ui:recentlyopen";
+ char configNameStr[46] = "ui:recentlyopen";
snprintf(configNameStr + 15, 20, "%d", i);
iniparser_setstr(GBLsettingsDictionary, configNameStr,
diff -Naurp -p isomaster-1.3.7.orig/settings.h isomaster-1.3.7/settings.h
--- isomaster-1.3.7.orig/settings.h 2010-01-09 14:18:00.330993252 +0100
+++ isomaster-1.3.7/settings.h 2010-01-09 14:34:59.495995595 +0100
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include "isomaster.h"
-#include "iniparser-2.17/src/iniparser.h"
+#include <iniparser.h>
#define ISOMASTER_DEFAULT_WINDOW_WIDTH 500
#define ISOMASTER_DEFAULT_WINDOW_HEIGHT 550
|
GitWeb
