Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=fe18568de1dd16291245b063a98041be1e807ee7
commit fe18568de1dd16291245b063a98041be1e807ee7 Author: James Buren <[email protected]> Date: Sun Aug 25 17:04:31 2013 -0500 modeconfig -> dmconfig diff --git a/Makefile b/Makefile index 43c6122..957fcb6 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ endif CFLAGS += $(shell pkg-config --cflags pacman blkid uuid) LDFLAGS += $(shell pkg-config --libs pacman blkid uuid) -SOURCES += src/dictionary.c src/iniparser.c src/main.c src/utility.c src/block.c src/locale.c src/layout.c src/greeter.c src/partition.c src/raid.c src/format.c src/preconfig.c src/install.c src/postconfig.c src/finale.c src/grubconfig.c src/hostconfig.c src/rootconfig.c src/userconfig.c src/timeconfig.c src/modeconfig.c src/langconfig.c src/kbconfig.c src/information.c src/nmconfig.c src/viconfig.c +SOURCES += src/dictionary.c src/iniparser.c src/main.c src/utility.c src/block.c src/locale.c src/layout.c src/greeter.c src/partition.c src/raid.c src/format.c src/preconfig.c src/install.c src/postconfig.c src/finale.c src/grubconfig.c src/hostconfig.c src/rootconfig.c src/userconfig.c src/timeconfig.c src/dmconfig.c src/langconfig.c src/kbconfig.c src/information.c src/nmconfig.c src/viconfig.c OBJECTS := $(patsubst %.c,%.o,$(SOURCES)) all: @@ -69,7 +69,7 @@ install: bin/fwsetup ln -s -f fwsetup $(DESTDIR)/usr/sbin/userconfig ln -s -f fwsetup $(DESTDIR)/usr/sbin/hostconfig ln -s -f fwsetup $(DESTDIR)/usr/sbin/viconfig - ln -s -f fwsetup $(DESTDIR)/usr/sbin/modeconfig + ln -s -f fwsetup $(DESTDIR)/usr/sbin/dmconfig ln -s -f fwsetup $(DESTDIR)/usr/sbin/timeconfig ln -s -f fwsetup $(DESTDIR)/usr/sbin/grubconfig diff --git a/src/modeconfig.c b/src/dmconfig.c similarity index 83% rename from src/modeconfig.c rename to src/dmconfig.c index 01031d5..9051751 100644 --- a/src/modeconfig.c +++ b/src/dmconfig.c @@ -17,15 +17,10 @@ #include "local.h" -static char *modes[] = -{ - "Text Console", - "Display Manager", - 0 -}; -static char *mode = 0; +static char **managers = 0; +static char *manager = 0; -static bool modeconfig_action(const char *mode) +static bool dmconfig_action(const char *mode) { const char *old = 0; const char *new = "etc/systemd/system/default.target"; @@ -56,7 +51,7 @@ static bool modeconfig_action(const char *mode) return true; } -static bool modeconfig_start(void) +static bool dmconfig_start(void) { if(!ui_window_list(MODE_TITLE,MODE_TEXT,modes,&mode)) return false; @@ -64,13 +59,13 @@ static bool modeconfig_start(void) return true; } -static bool modeconfig_finish(void) +static bool dmconfig_finish(void) { bool success = true; if(mode != 0) { - success = modeconfig_action(mode); + success = dmconfig_action(mode); mode = 0; } @@ -78,9 +73,9 @@ static bool modeconfig_finish(void) return success; } -struct tool modeconfig_tool = +struct tool dmconfig_tool = { - modeconfig_start, - modeconfig_finish, + dmconfig_start, + dmconfig_finish, __FILE__ }; diff --git a/src/local.h b/src/local.h index 1a90fd5..07e0552 100644 --- a/src/local.h +++ b/src/local.h @@ -326,7 +326,7 @@ extern struct tool rootconfig_tool; extern struct tool userconfig_tool; extern struct tool hostconfig_tool; extern struct tool viconfig_tool; -extern struct tool modeconfig_tool; +extern struct tool dmconfig_tool; extern struct tool timeconfig_tool; extern struct tool grubconfig_tool; extern struct tool *tools[]; diff --git a/src/main.c b/src/main.c index 0f6fe6a..11a54b5 100644 --- a/src/main.c +++ b/src/main.c @@ -184,7 +184,7 @@ struct tool *tools[] = &userconfig_tool, &hostconfig_tool, &viconfig_tool, - &modeconfig_tool, + &dmconfig_tool, &timeconfig_tool, &grubconfig_tool, 0 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
