HEYAHONG/kconfig-frontends
1
0
Fork 0
mirror of https://github.com/HEYAHONG/kconfig-frontends.git synced 2025-05-09 02:01:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

libs/images: fix warnings

Browse Source 
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
This commit is contained in:
Yann E. MORIN" 2012-04-04 18:52:48 +02:00 committed by Yann E. MORIN"
parent 468fc6ffe0
commit 2e436c8ff2
6 changed files with 231 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontends/gconf/gconf.c
View File

@ -11,6 +11,11 @@
#endif
#include "lkc.h"
#define WANTS_xpm_single_view
#define WANTS_xpm_split_view
#define WANTS_xpm_tree_view
#define WANTS_xpm_menu
#define WANTS_xpm_void
#include "images.h"
#include <glade/glade.h>

20
frontends/gconf/gconf.c.patch
View File

@ -1,35 +1,33 @@
diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
--- a/frontends/gconf/gconf.c
+++ b/frontends/gconf/gconf.c
@@ -11,7 +11,7 @@
@@ -11,7 +11,12 @@
#endif
#include "lkc.h"
-#include "images.c"
+#define WANTS_xpm_single_view
+#define WANTS_xpm_split_view
+#define WANTS_xpm_tree_view
+#define WANTS_xpm_menu
+#define WANTS_xpm_void
+#include "images.h"
#include <glade/glade.h>
#include <gtk/gtk.h>
@@ -1468,7 +1468,9 @@
@@ -1468,8 +1473,10 @@
int main(int ac, char *av[])
{
const char *name;
+#if 0
char *env;
+#endif
gchar *glade_file = GUI_PATH;
bindtextdomain(PACKAGE, LOCALEDIR);
@@ -1469,7 +1471,7 @@
{
const char *name;
char *env;
- gchar *glade_file;
+ gchar *glade_file = GUI_PATH;
bindtextdomain(PACKAGE, LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -1483,6 +1483,7 @@
@@ -1483,6 +1490,7 @@
//add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
//add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
@ -37,7 +35,7 @@ diff --git a/frontends/gconf/gconf.c b/frontends/gconf/gconf.c
/* Determine GUI path */
env = getenv(SRCTREE);
if (env)
@@ -1491,6 +1492,7 @@
@@ -1491,6 +1499,7 @@
glade_file = g_strconcat(av[0], ".glade", NULL);
else
glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);

15
frontends/qconf/qconf.cc
View File

@ -46,6 +46,21 @@
#include "qconf.h"
#include "qconf.moc"
#define WANTS_xpm_symbol_yes
#define WANTS_xpm_symbol_mod
#define WANTS_xpm_symbol_no
#define WANTS_xpm_choice_yes
#define WANTS_xpm_choice_no
#define WANTS_xpm_menu
#define WANTS_xpm_menu_inv
#define WANTS_xpm_menuback
#define WANTS_xpm_void
#define WANTS_xpm_back
#define WANTS_xpm_load
#define WANTS_xpm_save
#define WANTS_xpm_single_view
#define WANTS_xpm_split_view
#define WANTS_xpm_tree_view
#include "images.h"
#ifdef _

17
frontends/qconf/qconf.cc.patch
View File

@ -1,11 +1,26 @@
diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc
--- a/frontends/qconf/qconf.cc
+++ b/frontends/qconf/qconf.cc
@@ -46,7 +46,7 @@
@@ -46,7 +46,22 @@
#include "qconf.h"
#include "qconf.moc"
-#include "images.c"
+#define WANTS_xpm_symbol_yes
+#define WANTS_xpm_symbol_mod
+#define WANTS_xpm_symbol_no
+#define WANTS_xpm_choice_yes
+#define WANTS_xpm_choice_no
+#define WANTS_xpm_menu
+#define WANTS_xpm_menu_inv
+#define WANTS_xpm_menuback
+#define WANTS_xpm_void
+#define WANTS_xpm_back
+#define WANTS_xpm_load
+#define WANTS_xpm_save
+#define WANTS_xpm_single_view
+#define WANTS_xpm_split_view
+#define WANTS_xpm_tree_view
+#include "images.h"
#ifdef _

30
libs/images/images.h
View File

@ -3,6 +3,7 @@
* Released under the terms of the GNU GPL v2.0.
*/
#ifdef WANTS_xpm_load
static const char *xpm_load[] = {
"22 22 5 1",
". c None",
@ -32,7 +33,9 @@ static const char *xpm_load[] = {
"##cccccccccccc##......",
"###############.......",
"......................"};
#endif
#ifdef WANTS_xpm_save
static const char *xpm_save[] = {
"22 22 5 1",
". c None",
@ -62,7 +65,9 @@ static const char *xpm_save[] = {
".#aaa#########bbb#aa#.",
"..##################..",
"......................"};
#endif
#ifdef WANTS_xpm_back
static const char *xpm_back[] = {
"22 22 3 1",
". c None",
@ -90,7 +95,9 @@ static const char *xpm_back[] = {
"......................",
"......................",
"......................"};
#endif
#ifdef WANTS_xpm_tree_view
static const char *xpm_tree_view[] = {
"22 22 2 1",
". c None",
@ -117,7 +124,9 @@ static const char *xpm_tree_view[] = {
"......########........",
"......................",
"......................"};
#endif
#ifdef WANTS_xpm_single_view
static const char *xpm_single_view[] = {
"22 22 2 1",
". c None",
@ -144,7 +153,9 @@ static const char *xpm_single_view[] = {
"..........#...........",
"......................",
"......................"};
#endif
#ifdef WANTS_xpm_split_view
static const char *xpm_split_view[] = {
"22 22 2 1",
". c None",
@ -171,7 +182,9 @@ static const char *xpm_split_view[] = {
"......#......#........",
"......................",
"......................"};
#endif
#ifdef WANTS_xpm_symbol_no
static const char *xpm_symbol_no[] = {
"12 12 2 1",
" c white",
@ -188,7 +201,9 @@ static const char *xpm_symbol_no[] = {
" . . ",
" .......... ",
" "};
#endif
#ifdef WANTS_xpm_symbol_mod
static const char *xpm_symbol_mod[] = {
"12 12 2 1",
" c white",
@ -205,7 +220,9 @@ static const char *xpm_symbol_mod[] = {
" . . ",
" .......... ",
" "};
#endif
#ifdef WANTS_xpm_symbol_yes
static const char *xpm_symbol_yes[] = {
"12 12 2 1",
" c white",
@ -222,7 +239,9 @@ static const char *xpm_symbol_yes[] = {
" . . ",
" .......... ",
" "};
#endif
#ifdef WANTS_xpm_choice_no
static const char *xpm_choice_no[] = {
"12 12 2 1",
" c white",
@ -239,7 +258,9 @@ static const char *xpm_choice_no[] = {
" .. .. ",
" .... ",
" "};
#endif
#ifdef WANTS_xpm_choice_yes
static const char *xpm_choice_yes[] = {
"12 12 2 1",
" c white",
@ -256,7 +277,9 @@ static const char *xpm_choice_yes[] = {
" .. .. ",
" .... ",
" "};
#endif
#ifdef WANTS_xpm_menu
static const char *xpm_menu[] = {
"12 12 2 1",
" c white",
@ -273,7 +296,9 @@ static const char *xpm_menu[] = {
" . . ",
" .......... ",
" "};
#endif
#ifdef WANTS_xpm_menu_inv
static const char *xpm_menu_inv[] = {
"12 12 2 1",
" c white",
@ -290,7 +315,9 @@ static const char *xpm_menu_inv[] = {
" .......... ",
" .......... ",
" "};
#endif
#ifdef WANTS_xpm_menuback
static const char *xpm_menuback[] = {
"12 12 2 1",
" c white",
@ -307,7 +334,9 @@ static const char *xpm_menuback[] = {
" . . ",
" .......... ",
" "};
#endif
#ifdef WANTS_xpm_void
static const char *xpm_void[] = {
"12 12 2 1",
" c white",
@ -324,3 +353,4 @@ static const char *xpm_void[] = {
" ",
" ",
" "};
#endif

156
libs/images/images.h.patch Normal file
View File

@ -0,0 +1,156 @@
diff --git a/libs/images/images.h b/libs/images/images.h
--- a/libs/images/images.h
+++ b/libs/images/images.h
@@ -3,6 +3,7 @@
* Released under the terms of the GNU GPL v2.0.
*/
+#ifdef WANTS_xpm_load
static const char *xpm_load[] = {
"22 22 5 1",
". c None",
@@ -32,7 +33,9 @@
"##cccccccccccc##......",
"###############.......",
"......................"};
+#endif
+#ifdef WANTS_xpm_save
static const char *xpm_save[] = {
"22 22 5 1",
". c None",
@@ -62,7 +65,9 @@
".#aaa#########bbb#aa#.",
"..##################..",
"......................"};
+#endif
+#ifdef WANTS_xpm_back
static const char *xpm_back[] = {
"22 22 3 1",
". c None",
@@ -90,7 +95,9 @@
"......................",
"......................",
"......................"};
+#endif
+#ifdef WANTS_xpm_tree_view
static const char *xpm_tree_view[] = {
"22 22 2 1",
". c None",
@@ -117,7 +124,9 @@
"......########........",
"......................",
"......................"};
+#endif
+#ifdef WANTS_xpm_single_view
static const char *xpm_single_view[] = {
"22 22 2 1",
". c None",
@@ -144,7 +153,9 @@
"..........#...........",
"......................",
"......................"};
+#endif
+#ifdef WANTS_xpm_split_view
static const char *xpm_split_view[] = {
"22 22 2 1",
". c None",
@@ -171,7 +182,9 @@
"......#......#........",
"......................",
"......................"};
+#endif
+#ifdef WANTS_xpm_symbol_no
static const char *xpm_symbol_no[] = {
"12 12 2 1",
" c white",
@@ -188,7 +201,9 @@
" . . ",
" .......... ",
" "};
+#endif
+#ifdef WANTS_xpm_symbol_mod
static const char *xpm_symbol_mod[] = {
"12 12 2 1",
" c white",
@@ -205,7 +220,9 @@
" . . ",
" .......... ",
" "};
+#endif
+#ifdef WANTS_xpm_symbol_yes
static const char *xpm_symbol_yes[] = {
"12 12 2 1",
" c white",
@@ -222,7 +239,9 @@
" . . ",
" .......... ",
" "};
+#endif
+#ifdef WANTS_xpm_choice_no
static const char *xpm_choice_no[] = {
"12 12 2 1",
" c white",
@@ -239,7 +258,9 @@
" .. .. ",
" .... ",
" "};
+#endif
+#ifdef WANTS_xpm_choice_yes
static const char *xpm_choice_yes[] = {
"12 12 2 1",
" c white",
@@ -256,7 +277,9 @@
" .. .. ",
" .... ",
" "};
+#endif
+#ifdef WANTS_xpm_menu
static const char *xpm_menu[] = {
"12 12 2 1",
" c white",
@@ -273,7 +296,9 @@
" . . ",
" .......... ",
" "};
+#endif
+#ifdef WANTS_xpm_menu_inv
static const char *xpm_menu_inv[] = {
"12 12 2 1",
" c white",
@@ -290,7 +315,9 @@
" .......... ",
" .......... ",
" "};
+#endif
+#ifdef WANTS_xpm_menuback
static const char *xpm_menuback[] = {
"12 12 2 1",
" c white",
@@ -307,7 +334,9 @@
" . . ",
" .......... ",
" "};
+#endif
+#ifdef WANTS_xpm_void
static const char *xpm_void[] = {
"12 12 2 1",
" c white",
@@ -324,3 +353,4 @@
" ",
" ",
" "};
+#endif