Sakura

Merge lp:~david.gabor.bodor/sakura/config-file-option into lp:~dabisu/sakura/sakura

  1. config-file-option
  2. Merge into sakura
Proposed by Dávid Gábor Bodor
Status: Merged
Merge reported by: David Gómez
Merged at revision: not available
Proposed branch: lp:~david.gabor.bodor/sakura/config-file-option
Merge into: lp:~dabisu/sakura/sakura
Diff against target: 55 lines (+8/-4)
4 files modified
CMakeLists.txt (+1/-1)
po/sakura.pot (+1/-1)
sakura.pod (+5/-0)
src/sakura.c (+1/-2)
To merge this branch: bzr merge lp:~david.gabor.bodor/sakura/config-file-option
Reviewer Review Type Date Requested Status
David Gómez Approve
Review via email: mp+95609@code.launchpad.net

Description of the change

This patch is long overdue, my sincere apologies for that.

I made the config-file option use the sakura config dir as a base, also, updated the man pages to include the new option. (Please check them, I'm not a native english speaker).
Also removed a printf I accidentally left in for debug purposes.

This revision already includes the fix for the linker error concerning libm.so

To post a comment you must log in.
Revision history for this message
David Gómez (dabisu) wrote :

Thanks Bodor, I've merged the latest changes.

Revision history for this message
David Gómez (dabisu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-02-27 13:39:19 +0000
3+++ CMakeLists.txt 2012-03-02 16:32:23 +0000
4@@ -43,7 +43,7 @@
5
6 INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
7 LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS})
8-LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES})
9+LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES} m)
10 ADD_EXECUTABLE (sakura src/sakura.c)
11 ADD_DEPENDENCIES (sakura src/sakura.c src/sakura.h)
12
13
14=== modified file 'po/sakura.pot'
15--- po/sakura.pot 2012-02-27 13:38:29 +0000
16+++ po/sakura.pot 2012-03-02 16:32:23 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: PACKAGE VERSION\n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2012-02-27 14:37+0100\n"
22+"POT-Creation-Date: 2012-03-02 17:21+0100\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26
27=== modified file 'sakura.pod'
28--- sakura.pod 2010-10-19 14:27:36 +0000
29+++ sakura.pod 2012-03-02 16:32:23 +0000
30@@ -78,6 +78,11 @@
31
32 X display to use
33
34+=item B<--config-file=FILENAME>
35+
36+Use alternate configurtation file. Path is relative to the sakura config dir.
37+(Example: ~/.config/sakura/FILENAME).
38+
39 =back
40
41 =head1 GTK+ OPTIONS
42
43=== modified file 'src/sakura.c'
44--- src/sakura.c 2012-02-27 13:35:40 +0000
45+++ src/sakura.c 2012-03-02 16:32:23 +0000
46@@ -1589,8 +1589,7 @@
47 if( ! g_file_test( configdir, G_FILE_TEST_EXISTS) )
48 g_mkdir( configdir, 0755 );
49 if (option_config_file) {
50- sakura.configfile=option_config_file;
51- printf("The config file is: %s", option_config_file);
52+ sakura.configfile=g_build_filename(configdir, option_config_file, NULL);
53 } else {
54 /* Use more standard-conforming path for config files, if available. */
55 sakura.configfile=g_build_filename(configdir, DEFAULT_CONFIGFILE, NULL);

Subscribers

People subscribed via source and target branches