Up to 1.6, fixed profile menu artefacts, fixed ini new strings

stransky · Dec 9, 2012 · 05fb66f · 05fb66f
1 parent c72b7ec
commit 05fb66f
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 7 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -17,6 +17,8 @@ beruskydoc_DATA = \
 
 EXTRA_DIST = $(beruskydoc_DATA)
 
+
+
 # Copy all the spec files. Of cource, only one is actually used.
 dist-hook:
 	for specfile in *.spec; do \

diff --git a/berusky.prj b/berusky.prj
@@ -28,7 +28,7 @@ anjuta.compatibility.level=1
 project.name=berusky
 project.type=GTK 2.0
 project.target.type=EXECUTABLE
-project.version=1.3
+project.version=1.6
 project.author=User
 project.source.target=berusky
 project.has.gettext=1
@@ -114,7 +114,8 @@ module.source.files=\
 	gui.h\
 	portability.h\
 	profile.cpp\
-	profile.h
+	profile.h\
+	llist.h
 
 module.pixmap.name=pixmaps
 module.pixmap.type=

diff --git a/configure b/configure
@@ -2819,7 +2819,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=berusky
- VERSION=1.5.2
+ VERSION=1.6
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.in b/configure.in
@@ -4,7 +4,7 @@ dnl If you don't want it to overwrite it,
 dnl 	Please disable it in the Anjuta project configuration
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(berusky, 1.5.2)
+AM_INIT_AUTOMAKE(berusky, 1.6)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -49,5 +49,6 @@ src/gui.h
 src/portability.h
 src/profile.cpp
 src/profile.h
+src/llist.h
 
 
diff --git a/src/2d_graph.cpp b/src/2d_graph.cpp
@@ -1067,6 +1067,7 @@ void font::print(char *p_string, RECT *p_res, int lines)
     assert(px >= 0);
 
     if(p_res) {
+      p_res->x = px;
       //bprintf("before print - [%d %d] -> [%d %d]",px, py, width_string, height_string);
       rect_adjust(p_res, px, py, width_string, height_string);
       //bprintf("after print - [%d %d] -> [%d %d]",p_res->x,p_res->y,p_res->w,p_res->h);

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -58,7 +58,8 @@ berusky_SOURCES = \
 	gui.h\
 	portability.h\
 	profile.cpp\
-	profile.h
+	profile.h\
+	llist.h
 
 berusky_LDFLAGS = 
 

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -292,7 +292,8 @@ berusky_SOURCES = \
 	gui.h\
 	portability.h\
 	profile.cpp\
-	profile.h
+	profile.h\
+	llist.h
 
 berusky_LDFLAGS = 
 berusky_LDADD = \

diff --git a/src/ini.cpp b/src/ini.cpp
@@ -266,7 +266,7 @@ int ini_write_string(FHANDLE f_in, FHANDLE f_out, const char *p_template, const
   }
   else {
     file_copy(f_in, f_out);    
-    fprintf(f_out,"%s = %s\n",p_template, p_value);
+    fprintf(f_out,"\n%s = %s\n",p_template, p_value);
   }
 
   return(TRUE);