Menu
▾
▴
morphix-cvs — A list for all cvs commits done, to easily keep track of development
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
(20) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(43) |
Feb
(31) |
Mar
(99) |
Apr
(57) |
May
(82) |
Jun
(73) |
Jul
(123) |
Aug
(634) |
Sep
(588) |
Oct
(264) |
Nov
(217) |
Dec
(179) |
| 2005 |
Jan
(262) |
Feb
(273) |
Mar
(164) |
Apr
(88) |
May
(23) |
Jun
(10) |
Jul
(8) |
Aug
(19) |
Sep
(112) |
Oct
(57) |
Nov
(71) |
Dec
(6) |
| 2006 |
Jan
(14) |
Feb
(48) |
Mar
(56) |
Apr
(21) |
May
(77) |
Jun
(46) |
Jul
(47) |
Aug
(27) |
Sep
(18) |
Oct
(16) |
Nov
(4) |
Dec
(18) |
| 2007 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
(27) |
May
(13) |
Jun
(27) |
Jul
(20) |
Aug
(3) |
Sep
(3) |
Oct
(23) |
Nov
(21) |
Dec
(6) |
| 2008 |
Jan
(7) |
Feb
(3) |
Mar
(4) |
Apr
(8) |
May
(3) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(11) |
Feb
(1) |
Mar
(8) |
Apr
|
May
|
Jun
(4) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <ale...@us...> - 2003-11-07 00:43:20
|
Update of /cvsroot/morphix/langconf In directory sc8-pr-cvs1:/tmp/cvs-serv17419 Removed Files: locale-list Log Message: moved locale-list, more install-fixes --- locale-list DELETED --- |
|
From: <ale...@us...> - 2003-11-07 00:42:26
|
Update of /cvsroot/morphix/langconf/lists In directory sc8-pr-cvs1:/tmp/cvs-serv17348/lists Log Message: Directory /cvsroot/morphix/langconf/lists added to the repository |
|
From: <ale...@us...> - 2003-11-07 00:41:49
|
Update of /cvsroot/morphix/langconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv17206/src
Modified Files:
liblang.c liblang.h main.c
Log Message:
more install-fixes
Index: liblang.c
===================================================================
RCS file: /cvsroot/morphix/langconf/src/liblang.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** liblang.c 28 Oct 2003 01:46:06 -0000 1.2
--- liblang.c 7 Nov 2003 00:41:46 -0000 1.3
***************
*** 121,128 ****
gint i, j, ret;
! if (!g_file_get_contents(LIST_LOCALES,&locs,&locs_len,NULL)) {
! if (!g_file_get_contents(LIST_LOCALES_2,&locs,&locs_len,NULL)) {
! return FALSE;
! }
}
--- 121,131 ----
gint i, j, ret;
! if (list_locales == NULL) {
! debug("Locales path not yet set up, returning false from r_l_l\n");
! return FALSE;
! }
!
! if (!g_file_get_contents(list_locales,&locs,&locs_len,NULL)) {
! return FALSE;
}
Index: liblang.h
===================================================================
RCS file: /cvsroot/morphix/langconf/src/liblang.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** liblang.h 26 Oct 2003 23:02:46 -0000 1.1.1.1
--- liblang.h 7 Nov 2003 00:41:46 -0000 1.2
***************
*** 3,8 ****
#include <gtk/gtk.h>
- #define LIST_LOCALES "../locale-list"
- #define LIST_LOCALES_2 "/usr/share/libconf/locale-list"
#define LOCALE_GEN "/etc/locale.gen"
#define ETC_ENVIRONMENT "/etc/environment"
--- 3,6 ----
***************
*** 25,28 ****
--- 23,27 ----
gint locales_count;
+ gchar *list_locales;
gchar current_code[64];
loc_struct *find_language_entry(gchar *desc);
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/langconf/src/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.c 3 Nov 2003 00:26:45 -0000 1.3
--- main.c 7 Nov 2003 00:41:46 -0000 1.4
***************
*** 22,25 ****
--- 22,26 ----
extern loc_struct *selected_locale;
extern gboolean realised;
+ extern gchar *list_locales;
enum {
***************
*** 51,55 ****
GtkWidget *image = lookup_widget(MainWindow,"image1");
! gchar *image_loc;
gint length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/globe.png");
image_loc = (gchar *)malloc(length + 1);
--- 52,56 ----
GtkWidget *image = lookup_widget(MainWindow,"image1");
! gchar *image_loc, list_loc;
gint length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/globe.png");
image_loc = (gchar *)malloc(length + 1);
***************
*** 60,63 ****
--- 61,71 ----
gtk_image_set_from_file(GTK_IMAGE(image),image_loc);
free(image_loc);
+
+ length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/lists/locale-list");
+ list_locales = (gchar *)malloc(length + 1);
+ strcpy(list_locales,PACKAGE_DATA_DIR "/" PACKAGE "/lists/locale-list");
+ if (list_locales == NULL) {
+ debug("Malloc failed in setup!\n");
+ }
/*
fp = fopen(GLOBE_LOC,"r");
***************
*** 84,87 ****
--- 92,96 ----
void quit_langconf() {
cleanup_locale_list();
+ // free(list_locales);
exit(0);
}
|
|
From: <ale...@us...> - 2003-11-07 00:41:49
|
Update of /cvsroot/morphix/langconf In directory sc8-pr-cvs1:/tmp/cvs-serv17206 Modified Files: Makefile.am Log Message: more install-fixes Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/langconf/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 26 Oct 2003 23:02:43 -0000 1.1.1.1 --- Makefile.am 7 Nov 2003 00:41:46 -0000 1.2 *************** *** 18,21 **** --- 18,29 ---- done \ fi + if test -d $(srcdir)/lists; then \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/lists; \ + for list in $(srcdir)/lists/*; do \ + if test -f $$lists; then \ + $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/lists; \ + fi \ + done \ + fi dist-hook: |
|
From: <ale...@us...> - 2003-11-07 00:41:13
|
Update of /cvsroot/morphix/keybconf In directory sc8-pr-cvs1:/tmp/cvs-serv17099 Modified Files: Makefile.am Log Message: more install-fixes Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/keybconf/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 31 Oct 2003 00:43:17 -0000 1.1.1.1 --- Makefile.am 7 Nov 2003 00:41:10 -0000 1.2 *************** *** 18,21 **** --- 18,29 ---- done \ fi + if test -d $(srcdir)/lists; then \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/lists; \ + for list in $(srcdir)/lists/*; do \ + if test -f $$list; then \ + $(INSTALL_DATA) $$list $(DESTDIR)$(pkgdatadir)/lists; \ + fi \ + done \ + fi dist-hook: |
|
From: <ale...@us...> - 2003-11-07 00:40:50
|
Update of /cvsroot/morphix/datetimeconf/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv17005/autom4te.cache
Modified Files:
requests
Log Message:
more install-fixes
Index: requests
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/autom4te.cache/requests,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** requests 26 Oct 2003 16:02:27 -0000 1.2
--- requests 7 Nov 2003 00:40:45 -0000 1.3
***************
*** 16,109 ****
],
{
- 'AC_FUNC_MALLOC' => 1,
- 'AC_FUNC_STAT' => 1,
- 'AC_FUNC_WAIT3' => 1,
- 'AC_FUNC_GETPGRP' => 1,
- 'AC_INIT' => 1,
- 'AC_HEADER_SYS_WAIT' => 1,
- 'AC_HEADER_MAJOR' => 1,
- 'AC_TYPE_SIGNAL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'AC_FUNC_FORK' => 1,
- 'AC_PATH_X' => 1,
- 'AC_PROG_CPP' => 1,
- 'AC_FUNC_STRTOD' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_PROG_MAKE_SET' => 1,
- 'AC_TYPE_MODE_T' => 1,
- 'AC_STRUCT_TIMEZONE' => 1,
- 'AC_PROG_CC' => 1,
- 'AC_FUNC_VPRINTF' => 1,
'AC_C_INLINE' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
'AC_FUNC_STRCOLL' => 1,
! 'AC_FUNC_MEMCMP' => 1,
! 'AC_FUNC_SETPGRP' => 1,
! 'AC_FUNC_SELECT_ARGTYPES' => 1,
! 'AC_FUNC_CHOWN' => 1,
! 'AC_TYPE_SIZE_T' => 1,
'AM_AUTOMAKE_VERSION' => 1,
! 'AC_C_VOLATILE' => 1,
! 'AC_FUNC_MKTIME' => 1,
! 'm4_pattern_allow' => 1,
! 'AM_MAINTAINER_MODE' => 1,
! 'AC_FUNC_STRNLEN' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AC_PROG_CXX' => 1,
! 'AC_C_CONST' => 1,
'AC_TYPE_OFF_T' => 1,
- 'AC_PROG_INSTALL' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'AC_FUNC_REALLOC' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
'AC_FUNC_GETGROUPS' => 1,
! 'AC_FUNC_CLOSEDIR_VOID' => 1,
! 'AC_HEADER_DIRENT' => 1,
'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
! 'AC_PROG_LN_S' => 1,
'AC_SUBST' => 1,
! 'AC_LIBSOURCE' => 1,
! 'AC_FUNC_UTIME_NULL' => 1,
! 'AH_OUTPUT' => 1,
! 'AC_FUNC_ERROR_AT_LINE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
! 'AC_FUNC_STRFTIME' => 1,
'include' => 1,
! 'AM_PROG_CC_C_O' => 1,
! 'AC_FUNC_OBSTACK' => 1,
! 'AM_CONDITIONAL' => 1,
! 'AC_FUNC_ALLOCA' => 1,
! 'AC_PROG_LIBTOOL' => 1,
! 'AC_PROG_RANLIB' => 1,
! 'AC_FUNC_MBRTOWC' => 1,
'm4_include' => 1,
! 'AC_PROG_LEX' => 1,
! 'AC_DEFINE_TRACE_LITERAL' => 1,
! 'AC_FUNC_GETLOADAVG' => 1,
! 'AC_REPLACE_FNMATCH' => 1,
! 'AC_HEADER_TIME' => 1,
! 'AC_CONFIG_HEADERS' => 1,
! 'AC_TYPE_UID_T' => 1,
! 'AC_CHECK_FUNCS' => 1,
'AC_CHECK_HEADERS' => 1,
! 'AC_FUNC_FSEEKO' => 1,
! 'AC_PROG_YACC' => 1,
! 'AC_HEADER_STDC' => 1,
! 'AC_PROG_AWK' => 1,
! 'AC_CANONICAL_HOST' => 1,
! 'AC_TYPE_PID_T' => 1,
! 'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_FUNC_MMAP' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_CHECK_TYPES' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_GETMNTENT' => 1,
! 'AC_CHECK_LIB' => 1,
! 'AC_CHECK_MEMBERS' => 1,
! 'AM_INIT_AUTOMAKE' => 1,
! 'AC_PROG_GCC_TRADITIONAL' => 1,
! 'AC_FUNC_STRERROR_R' => 1,
! 'AC_HEADER_STAT' => 1
}
], 'Request' )
--- 16,109 ----
],
{
'AC_C_INLINE' => 1,
+ 'AC_HEADER_SYS_WAIT' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
+ 'AC_FUNC_STRERROR_R' => 1,
+ 'AC_FUNC_GETLOADAVG' => 1,
'AC_FUNC_STRCOLL' => 1,
! 'AC_PROG_LEX' => 1,
! 'AC_FUNC_STRFTIME' => 1,
! 'AH_OUTPUT' => 1,
'AM_AUTOMAKE_VERSION' => 1,
! 'AC_FUNC_MBRTOWC' => 1,
! 'AC_FUNC_OBSTACK' => 1,
! 'AC_PROG_MAKE_SET' => 1,
! 'AC_HEADER_STDC' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_FUNC_GETGROUPS' => 1,
! 'AC_TYPE_PID_T' => 1,
! 'AM_CONDITIONAL' => 1,
'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
! 'AC_STRUCT_TIMEZONE' => 1,
! 'AC_PROG_GCC_TRADITIONAL' => 1,
'AC_SUBST' => 1,
! 'AC_FUNC_SELECT_ARGTYPES' => 1,
! 'AM_INIT_AUTOMAKE' => 1,
! 'AC_PROG_LN_S' => 1,
! 'AC_CHECK_LIB' => 1,
! 'AC_CHECK_TYPES' => 1,
! 'AC_TYPE_SIZE_T' => 1,
! 'AC_PROG_YACC' => 1,
! 'AM_GNU_GETTEXT' => 1,
! 'AC_PATH_X' => 1,
! 'AC_PROG_LIBTOOL' => 1,
! 'AC_CONFIG_AUX_DIR' => 1,
! 'AC_C_VOLATILE' => 1,
! 'm4_pattern_allow' => 1,
! 'AC_FUNC_MKTIME' => 1,
! 'AM_MAINTAINER_MODE' => 1,
! 'AC_FUNC_MALLOC' => 1,
'AC_CONFIG_SUBDIRS' => 1,
! 'AC_STRUCT_TM' => 1,
'include' => 1,
! 'AC_FUNC_STRNLEN' => 1,
! 'AC_CHECK_MEMBERS' => 1,
'm4_include' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
! 'AC_FUNC_ERROR_AT_LINE' => 1,
'AC_CHECK_HEADERS' => 1,
! 'AC_PROG_INSTALL' => 1,
! 'AC_TYPE_SIGNAL' => 1,
! 'AC_FUNC_CLOSEDIR_VOID' => 1,
! 'AC_FUNC_STRTOD' => 1,
! 'AC_PROG_RANLIB' => 1,
! 'AC_LIBSOURCE' => 1,
! 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_MMAP' => 1,
+ 'AC_HEADER_TIME' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_DEFINE_TRACE_LITERAL' => 1,
! 'm4_pattern_forbid' => 1,
! 'AC_FUNC_GETPGRP' => 1,
! 'AC_HEADER_DIRENT' => 1,
! 'AC_FUNC_ALLOCA' => 1,
! 'AC_CONFIG_FILES' => 1,
! 'AC_FUNC_STAT' => 1,
! 'AC_HEADER_MAJOR' => 1,
! 'AC_FUNC_SETVBUF_REVERSED' => 1,
! 'AC_FUNC_VPRINTF' => 1,
! 'AC_C_CONST' => 1,
! 'AC_PROG_CPP' => 1,
! 'AC_HEADER_STAT' => 1,
! 'AC_TYPE_UID_T' => 1,
! 'AC_INIT' => 1,
! 'AM_PROG_CC_C_O' => 1,
! 'AC_FUNC_SETPGRP' => 1,
'AC_FUNC_GETMNTENT' => 1,
! 'AC_FUNC_WAIT3' => 1,
! 'AC_CANONICAL_HOST' => 1,
! 'AC_CONFIG_HEADERS' => 1,
! 'AC_FUNC_FORK' => 1,
! 'AC_CANONICAL_SYSTEM' => 1,
! 'AC_FUNC_UTIME_NULL' => 1,
! 'AC_PROG_AWK' => 1,
! 'AC_PROG_CC' => 1,
! 'AC_CHECK_FUNCS' => 1,
! 'AC_FUNC_REALLOC' => 1,
! 'AC_PROG_CXX' => 1,
! 'AC_FUNC_MEMCMP' => 1,
! 'AC_FUNC_CHOWN' => 1,
! 'AC_REPLACE_FNMATCH' => 1,
! 'AC_FUNC_FSEEKO' => 1
}
], 'Request' )
|
|
From: <ale...@us...> - 2003-11-07 00:40:50
|
Update of /cvsroot/morphix/datetimeconf
In directory sc8-pr-cvs1:/tmp/cvs-serv17005
Modified Files:
datetimeconf.glade stamp-h.in
Log Message:
more install-fixes
Index: datetimeconf.glade
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/datetimeconf.glade,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** datetimeconf.glade 26 Oct 2003 20:48:00 -0000 1.3
--- datetimeconf.glade 7 Nov 2003 00:40:45 -0000 1.4
***************
*** 6,10 ****
<widget class="GtkDialog" id="MainWindow">
<property name="width_request">500</property>
! <property name="height_request">700</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Date / Time Properties</property>
--- 6,10 ----
<widget class="GtkDialog" id="MainWindow">
<property name="width_request">500</property>
! <property name="height_request">650</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Date / Time Properties</property>
Index: stamp-h.in
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/stamp-h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stamp-h.in 26 Oct 2003 16:02:27 -0000 1.1
--- stamp-h.in 7 Nov 2003 00:40:45 -0000 1.2
***************
*** 0 ****
--- 1 ----
+ timestamp
|
|
From: <ale...@us...> - 2003-11-07 00:40:50
|
Update of /cvsroot/morphix/datetimeconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv17005/src
Modified Files:
interface.c main.c main.h
Log Message:
more install-fixes
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/src/interface.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** interface.c 26 Oct 2003 20:48:00 -0000 1.3
--- interface.c 7 Nov 2003 00:40:46 -0000 1.4
***************
*** 77,81 ****
MainWindow = gtk_dialog_new ();
! gtk_widget_set_size_request (MainWindow, 500, 700);
gtk_window_set_title (GTK_WINDOW (MainWindow), _("Date / Time Properties"));
gtk_window_set_position (GTK_WINDOW (MainWindow), GTK_WIN_POS_CENTER);
--- 77,81 ----
MainWindow = gtk_dialog_new ();
! gtk_widget_set_size_request (MainWindow, 500, 650);
gtk_window_set_title (GTK_WINDOW (MainWindow), _("Date / Time Properties"));
gtk_window_set_position (GTK_WINDOW (MainWindow), GTK_WIN_POS_CENTER);
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/src/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.c 3 Nov 2003 00:34:45 -0000 1.5
--- main.c 7 Nov 2003 00:40:46 -0000 1.6
***************
*** 82,85 ****
--- 82,88 ----
exit(1);
}
+
+ debug("Location map: %s\nLocation green cross: %s\nLocation red cross: %s\n",timezone_map_loc,cross_green_loc,cross_red_loc);
+
}
Index: main.h
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/src/main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.h 3 Nov 2003 00:34:45 -0000 1.4
--- main.h 7 Nov 2003 00:40:46 -0000 1.5
***************
*** 27,31 ****
gchar *timezone_map_loc;
! gchar *cross_green_loc
gchar *cross_red_loc;
--- 27,31 ----
gchar *timezone_map_loc;
! gchar *cross_green_loc;
gchar *cross_red_loc;
|
|
From: <ale...@us...> - 2003-11-03 00:39:01
|
Update of /cvsroot/morphix/keybconf/lists In directory sc8-pr-cvs1:/tmp/cvs-serv6769 Added Files: qwerty qwertz Log Message: nearly forgot to add these two again, should all work after a make-install now --- NEW FILE: qwerty --- US american - us Brazilian - br British - gb Bulgarian - bg Byelorussian - by Canadian (French) - cf Czech - cz Danish - dk Dutch - nl Estonian - et Finnish - fi Greek - gr Hebrew - il Hungarian - hu Icelandic - is Italian - it Latin American - la Latvian - lv Lithuanian - lt Macedonian - mk Norwegian - no Polish - pl1 Portugese - pt Romanian - ro Russian - ru1 Serbian - sr Slovak - sk Spanish - es Swedish - se Turkish - tr Ukrainian - ua --- NEW FILE: qwertz --- Czech - cz German - de Hungarian - hu Serbian - sr Slovak - sk Swiss (French) - fr_CH Swiss (German) - sg |
|
From: <ale...@us...> - 2003-11-03 00:34:48
|
Update of /cvsroot/morphix/datetimeconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5939/src
Modified Files:
main.c main.h
Log Message:
some datetime cleanups
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/src/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.c 28 Oct 2003 01:49:06 -0000 1.4
--- main.c 3 Nov 2003 00:34:45 -0000 1.5
***************
*** 62,65 ****
--- 62,85 ----
ntp_changed = FALSE;
utc_changed = FALSE;
+ timezone_map_loc = NULL;
+ cross_green_loc = NULL;
+ cross_red_loc = NULL;
+
+ gint length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/map480.png");
+ timezone_map_loc = (gchar *)malloc(length + 1);
+ strcpy(timezone_map_loc,PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/map480.png");
+ length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/cross-green.png");
+ cross_green_loc = (gchar *)malloc(length +1);
+ strcpy(cross_green_loc,PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/cross-green.png");
+
+ length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/cross-red.png");
+ cross_red_loc = (gchar *)malloc(length +1);
+ strcpy(cross_red_loc,PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/cross-red.png");
+ if (timezone_map_loc == NULL ||
+ cross_green_loc == NULL ||
+ cross_red_loc == NULL) {
+ debug("Can't find pixmaps in %s\n",PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
+ exit(1);
+ }
}
***************
*** 114,117 ****
--- 134,140 ----
int quit_conf() {
free_zone_info();
+ free(timezone_map_loc);
+ free(cross_green_loc);
+ free(cross_red_loc);
exit(0);
}
***************
*** 238,250 ****
GError *err = NULL;
GtkWidget *drawarea = lookup_widget(MainWindow,"drawingarea1");
! GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(TIMEZONE_MAP,&err);
if (pixbuf == NULL) {
! debug("Error: %s\n",err->message);
! err = NULL;
! GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(TIMEZONE_MAP_2,&err);
! if (pixbuf == NULL) {
! return FALSE;
! }
}
gtk_widget_show_all(drawarea);
--- 261,268 ----
GError *err = NULL;
GtkWidget *drawarea = lookup_widget(MainWindow,"drawingarea1");
! GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(timezone_map_loc,&err);
if (pixbuf == NULL) {
! return FALSE;
}
gtk_widget_show_all(drawarea);
***************
*** 269,278 ****
gboolean draw_cross(int x, int y) {
GtkWidget *drawarea = lookup_widget(MainWindow,"drawingarea1");
! GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(CROSS_GREEN,NULL);
if (pixbuf == NULL) {
! GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(CROSS_GREEN_2,NULL);
! if (pixbuf == NULL) {
! return FALSE;
! }
}
gdk_draw_pixbuf(drawarea->window,
--- 287,293 ----
gboolean draw_cross(int x, int y) {
GtkWidget *drawarea = lookup_widget(MainWindow,"drawingarea1");
! GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(cross_green_loc,NULL);
if (pixbuf == NULL) {
! return FALSE;
}
gdk_draw_pixbuf(drawarea->window,
***************
*** 291,300 ****
gboolean draw_red_cross(int x, int y) {
GtkWidget *drawarea = lookup_widget(MainWindow,"drawingarea1");
! GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(CROSS_RED,NULL);
if (pixbuf == NULL) {
! GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(CROSS_RED_2,NULL);
! if (pixbuf == NULL) {
! return FALSE;
! }
}
gdk_draw_pixbuf(drawarea->window,
--- 306,312 ----
gboolean draw_red_cross(int x, int y) {
GtkWidget *drawarea = lookup_widget(MainWindow,"drawingarea1");
! GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(cross_red_loc,NULL);
if (pixbuf == NULL) {
! return FALSE;
}
gdk_draw_pixbuf(drawarea->window,
Index: main.h
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/src/main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.h 28 Oct 2003 01:49:06 -0000 1.3
--- main.h 3 Nov 2003 00:34:45 -0000 1.4
***************
*** 8,12 ****
#define MAP_HEIGHT 240
#define MAP_WIDTH 480
!
#define TIMEZONE_MAP "../pixmaps/map480.png"
#define TIMEZONE_MAP_2 "/usr/share/datetimeconf/pixmaps/map480.png"
--- 8,12 ----
#define MAP_HEIGHT 240
#define MAP_WIDTH 480
! /*
#define TIMEZONE_MAP "../pixmaps/map480.png"
#define TIMEZONE_MAP_2 "/usr/share/datetimeconf/pixmaps/map480.png"
***************
*** 17,21 ****
#define CROSS_RED "../pixmaps/cross-red.png"
#define CROSS_RED_2 "/usr/share/datetimeconf/pixmaps/cross-red.png"
!
#define DEBUG
--- 17,21 ----
#define CROSS_RED "../pixmaps/cross-red.png"
#define CROSS_RED_2 "/usr/share/datetimeconf/pixmaps/cross-red.png"
! */
#define DEBUG
***************
*** 25,28 ****
--- 25,32 ----
#define debug (void)
#endif
+
+ gchar *timezone_map_loc;
+ gchar *cross_green_loc
+ gchar *cross_red_loc;
enum {
|
|
From: <ale...@us...> - 2003-11-03 00:26:48
|
Update of /cvsroot/morphix/langconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv3027/src
Modified Files:
main.c main.h
Log Message:
added some make-install fixes, cleanups
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/langconf/src/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c 28 Oct 2003 01:46:06 -0000 1.2
--- main.c 3 Nov 2003 00:26:45 -0000 1.3
***************
*** 32,36 ****
GtkTreeModel *model;
gchar *loc_desc;
! debug("Selection chaned\n");
if (gtk_tree_selection_get_selected(selection,&model,&iter)) {
gtk_tree_model_get(model,&iter, LANG_DESC, &loc_desc, -1);
--- 32,36 ----
GtkTreeModel *model;
gchar *loc_desc;
! debug("Selection changed\n");
if (gtk_tree_selection_get_selected(selection,&model,&iter)) {
gtk_tree_model_get(model,&iter, LANG_DESC, &loc_desc, -1);
***************
*** 50,53 ****
--- 50,64 ----
FILE *fp = NULL;
GtkWidget *image = lookup_widget(MainWindow,"image1");
+
+ gchar *image_loc;
+ gint length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/globe.png");
+ image_loc = (gchar *)malloc(length + 1);
+ if (image_loc == NULL) {
+ debug("Malloc failed in setup!\n");
+ }
+ strcpy(image_loc,PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/globe.png");
+ gtk_image_set_from_file(GTK_IMAGE(image),image_loc);
+ free(image_loc);
+ /*
fp = fopen(GLOBE_LOC,"r");
if (fp == NULL) {
***************
*** 60,63 ****
--- 71,75 ----
gtk_image_set_from_file(GTK_IMAGE(image),GLOBE_LOC);
}
+ */
read_locale_list();
setup_language_list();
Index: main.h
===================================================================
RCS file: /cvsroot/morphix/langconf/src/main.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.h 26 Oct 2003 23:02:46 -0000 1.1.1.1
--- main.h 3 Nov 2003 00:26:45 -0000 1.2
***************
*** 3,9 ****
#include <gtk/gtk.h>
!
#define GLOBE_LOC "/home/alex/Projects/langconf/pixmaps/globe.png"
#define GLOBE_LOC_2 "/usr/share/langconf/globe.png"
void quit_langconf();
void setup_language_list();
--- 3,10 ----
#include <gtk/gtk.h>
! /*
#define GLOBE_LOC "/home/alex/Projects/langconf/pixmaps/globe.png"
#define GLOBE_LOC_2 "/usr/share/langconf/globe.png"
+ */
void quit_langconf();
void setup_language_list();
|
Update of /cvsroot/morphix/keybconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2668/src
Modified Files:
callbacks.c callbacks.h interface.c libkeyb.c libkeyb.h main.c
main.h
Log Message:
added changes so that keybconf actually does something
removed redundant keyboard.png file
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/keybconf/src/callbacks.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** callbacks.c 31 Oct 2003 00:43:20 -0000 1.1.1.1
--- callbacks.c 3 Nov 2003 00:20:30 -0000 1.2
***************
*** 14,17 ****
--- 14,19 ----
extern GtkWidget *MainWindow;
+ gboolean keymap_changed;
+
gboolean
on_treeview1_select_cursor_row (GtkTreeView *treeview,
***************
*** 36,40 ****
gpointer user_data)
{
!
}
--- 38,46 ----
gpointer user_data)
{
! if (keymap_changed) {
! write_X_keyboard_settings();
! set_X_keyboard_settings();
! }
! quit_keybconf();
}
***************
*** 48,51 ****
--- 54,65 ----
{
+ }
+
+
+ void
+ on_cancelbutton1_clicked (GtkButton *button,
+ gpointer user_data)
+ {
+ quit_keybconf();
}
Index: callbacks.h
===================================================================
RCS file: /cvsroot/morphix/keybconf/src/callbacks.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** callbacks.h 31 Oct 2003 00:43:20 -0000 1.1.1.1
--- callbacks.h 3 Nov 2003 00:20:30 -0000 1.2
***************
*** 18,19 ****
--- 18,23 ----
on_MainWindow_show (GtkWidget *widget,
gpointer user_data);
+
+ void
+ on_cancelbutton1_clicked (GtkButton *button,
+ gpointer user_data);
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/keybconf/src/interface.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** interface.c 31 Oct 2003 00:43:20 -0000 1.1.1.1
--- interface.c 3 Nov 2003 00:20:30 -0000 1.2
***************
*** 113,116 ****
--- 113,117 ----
gtk_widget_show (helpbutton1);
gtk_dialog_add_action_widget (GTK_DIALOG (MainWindow), helpbutton1, GTK_RESPONSE_HELP);
+ gtk_widget_set_sensitive (helpbutton1, FALSE);
GTK_WIDGET_SET_FLAGS (helpbutton1, GTK_CAN_DEFAULT);
***************
*** 132,136 ****
NULL);
g_signal_connect ((gpointer) cancelbutton1, "clicked",
! G_CALLBACK (gtk_main_quit),
NULL);
g_signal_connect ((gpointer) okbutton1, "clicked",
--- 133,137 ----
NULL);
g_signal_connect ((gpointer) cancelbutton1, "clicked",
! G_CALLBACK (on_cancelbutton1_clicked),
NULL);
g_signal_connect ((gpointer) okbutton1, "clicked",
Index: libkeyb.c
===================================================================
RCS file: /cvsroot/morphix/keybconf/src/libkeyb.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** libkeyb.c 31 Oct 2003 00:43:20 -0000 1.1.1.1
--- libkeyb.c 3 Nov 2003 00:20:31 -0000 1.2
***************
*** 1,7 ****
#include <gtk/gtk.h>
#include <dirent.h>
#include "libkeyb.h"
! gint keymaps_count;
// still need to be made before it does anything useful
--- 1,23 ----
#include <gtk/gtk.h>
#include <dirent.h>
+ #include <stdio.h>
#include "libkeyb.h"
+ #include "support.h"
! gboolean exec_command (gchar *command) {
! gchar *outbuffer;
! gchar cmdline[256];
! gint exitstatus;
!
! debug("Exec: %s\n",command);
! if (g_spawn_command_line_sync(command,&outbuffer,NULL,&exitstatus,NULL) == FALSE) {
! debug("Error occured executing command\n");
! return FALSE;
! }
! free(outbuffer);
! return TRUE;
! }
!
! // use /etc/X11/xkb for reading in types, rules for different keyboard layouts
// still need to be made before it does anything useful
***************
*** 9,17 ****
--- 25,102 ----
gboolean write_console_keyboard_settings() {
}
+
gboolean write_X_keyboard_settings() {
+ gchar *xlist = NULL;
+ gchar **x_array = NULL;
+ gint xlist_length;
+ gint i;
+ gchar *ret;
+ gboolean set_x = FALSE;
+ FILE *fp = NULL;
+ if (selected_keymapitem == NULL) {
+ debug("Can't call write_X_keyboard_settings if selected_keymap is NULL!\n");
+ return FALSE;
+ }
+ debug("Writing changes to XF86Config-4\n");
+ if (!g_file_get_contents(X_CONFIG_FILE,&xlist,&xlist_length,NULL)) {
+ return FALSE;;
+ }
+ x_array = g_strsplit(xlist,"\n",0);
+ fp = fopen(X_CONFIG_FILE,"w");
+ if (fp == NULL || x_array == NULL)
+ return FALSE;
+
+ for (i = 0; x_array[i] != NULL; i++) {
+ // should use sscanf for this one
+ ret = strstr(x_array[i],"\"XkbLayout\"");
+ if (ret == NULL) {
+ fprintf(fp,"%s\n",x_array[i]);
+ continue;
+ }
+ debug("\tOption\t\t\"XkbLayout\"\t\"%s\"\n",selected_keymapitem->code);
+ fprintf(fp,"\tOption\t\t\"XkbLayout\"\t\"%s\"\n",selected_keymapitem->code);
+ }
+ fclose(fp);
+ g_strfreev(x_array);
+ free(xlist);
+ return TRUE;
+ }
+
+ gboolean set_X_keyboard_settings() {
+ gchar cmdline[256];
+ if (selected_keymapitem == NULL) {
+ debug("Can't call set_X_keyboard_settings if selected_keymap is NULL!\n");
+ return FALSE;
+ }
+ debug("Setting changes using setxbdmap\n");
+ sprintf(cmdline,"setxkbmap %s",selected_keymapitem->code);
+ exec_command(cmdline);
+ return TRUE;
}
+
gboolean read_console_keyboard_settings() {
+ // TODO
}
gboolean read_X_keyboard_settings() {
+ gchar *xlist = NULL;
+ gchar **x_array = NULL;
+ gint xlist_length;
+ gint i, ret;
+ gboolean set_x = FALSE;
+ if (!g_file_get_contents(X_CONFIG_FILE,&xlist,&xlist_length,NULL)) {
+ return FALSE;
+ }
+ debug("Reading in X keyboard settings\n");
+ x_array = g_strsplit(xlist,"\n",0);
+ for (i = 0; x_array[i] != NULL; i++) {
+ ret = sscanf(x_array[i],"\tOption \"XkbLayout\" \"%15[^\"]\"",current_keymap);
+ if (ret != 1)
+ continue;
+ set_x = TRUE;
+ break;
+ }
+ g_strfreev(x_array);
+ free(xlist);
+ return set_x;
}
***************
*** 33,40 ****
struct dirent **ep;
gint n;
- gchar mappath[] = KEYMAP_LIST_DIR;
gint i, j, ret;
! n = scandir(mappath,&ep, 0,alphasort);
if (n >= 3) {
--- 118,129 ----
struct dirent **ep;
gint n;
gint i, j, ret;
! if (keymap_list_dir == NULL) {
! return FALSE;
! }
! debug("Reading in keymap list\n");
!
! n = scandir(keymap_list_dir,&ep, 0,alphasort);
if (n >= 3) {
***************
*** 54,58 ****
continue;
}
! sprintf(cmdline,"%s/%s",KEYMAP_LIST_DIR,ep[cnt]->d_name);
if (!g_file_get_contents(cmdline,&keymaplist,&keymaplist_length,NULL)) {
continue;
--- 143,147 ----
continue;
}
! sprintf(cmdline,"%s/%s",keymap_list_dir,ep[cnt]->d_name);
if (!g_file_get_contents(cmdline,&keymaplist,&keymaplist_length,NULL)) {
continue;
***************
*** 97,100 ****
void free_keymaps_list() {
! // TODO
}
--- 186,221 ----
void free_keymaps_list() {
! gint i, j;
!
! debug("Freeing keymap list\n");
!
! for (i = 0; i < keymaps_count; i++) {
! for (j = 0; j < keymaps[i].list_count; j++) {
! free(keymaps[i].list[j].code);
! free(keymaps[i].list[j].description);
! }
! free(keymaps[i].list);
! keymaps[i].list_count = 0;
! free(keymaps[i].name);
! }
! free(keymaps);
! }
!
!
! /*
! returns pointer to ki_struct if found (which is presumed to be unique),
! NULL otherwise
! */
!
! ki_struct* find_keymap_entry(gchar *desc) {
! gint i, j;
! ki_struct *kitem = NULL;
! for (i = 0; i < keymaps_count; i++) {
! for (j = 0; j < keymaps[i].list_count; j++) {
! if (strcmp(keymaps[i].list[j].description,desc) == 0) {
! kitem = &keymaps[i].list[j];
! }
! }
! }
! return kitem;
}
Index: libkeyb.h
===================================================================
RCS file: /cvsroot/morphix/keybconf/src/libkeyb.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** libkeyb.h 31 Oct 2003 00:43:20 -0000 1.1.1.1
--- libkeyb.h 3 Nov 2003 00:20:31 -0000 1.2
***************
*** 19,22 ****
--- 19,25 ----
typedef struct keymap_type_struct kt_struct;
+ gint keymaps_count;
+ gchar current_keymap[16];
+ ki_struct *selected_keymapitem;
#define DEBUG
***************
*** 28,34 ****
#endif
! #define KEYMAP_LIST_DIR "/home/alex/Projects/keybconfig/lists"
gboolean read_keymaps_list();
#endif
--- 31,43 ----
#endif
! gchar *keymap_list_dir;
! #define X_CONFIG_FILE "/etc/X11/XF86Config-4"
gboolean read_keymaps_list();
+ ki_struct* find_keymap_entry(gchar *desc);
+ gboolean read_X_keyboard_settings();
+ gboolean set_X_keyboard_settings();
+ gboolean write_X_keyboard_settings();
+ void free_keymaps_list();
#endif
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/keybconf/src/main.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.c 31 Oct 2003 00:43:22 -0000 1.1.1.1
--- main.c 3 Nov 2003 00:20:31 -0000 1.2
***************
*** 16,22 ****
#include "libkeyb.h"
GtkWidget *MainWindow;
extern gint keymaps_count;
!
enum {
--- 16,26 ----
#include "libkeyb.h"
+ // #define LOCAL_BUILD
+
GtkWidget *MainWindow;
+ GtkTreeSelection *selector;
extern gint keymaps_count;
! extern gboolean keymap_changed;
! gboolean realized;
enum {
***************
*** 26,31 ****
--- 30,77 ----
};
+ void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data) {
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ gchar *loc_desc;
+
+ if (!realized)
+ return;
+
+ if (gtk_tree_selection_get_selected(selection,&model,&iter)) {
+ gtk_tree_model_get(model,&iter, LOCALE_COLUMN, &loc_desc, -1);
+ if (loc_desc == NULL) {
+ return;
+ }
+ if (strcmp(loc_desc,"") != 0) {
+ debug("Selection changed\n");
+ selected_keymapitem = find_keymap_entry(loc_desc);
+ keymap_changed = TRUE;
+ }
+ g_free(loc_desc);
+ }
+ }
+
+ /*
+ when you want to use this after make install, switch the comments below
+ */
+
void init_keybconf() {
+ #ifdef LOCAL_BUILD
+ gint length = strlen("../lists");
+ #else
+ gint length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/lists");
+ #endif
+ keymap_changed = FALSE;
+ realized = FALSE;
+ selected_keymapitem = NULL;
+ strcpy(current_keymap,"");
+ keymap_list_dir = (gchar *)malloc(length + 1);
+ #ifdef LOCAL_BUILD
+ strcpy(keymap_list_dir,"../lists");
+ #else
+ strcpy(keymap_list_dir, PACKAGE_DATA_DIR "/" PACKAGE "/lists");
+ #endif
+ debug("keymap_list_dir: %s\n",keymap_list_dir);
}
***************
*** 35,47 ****
read_keymaps_list();
! add_keymap_list();
! fp = fopen(KEYBPIX_LOC,"r");
! if (fp == NULL) {
! gtk_image_set_from_file(GTK_IMAGE(image),KEYBPIX_LOC_2);
! }
! else {
! fclose(fp);
! gtk_image_set_from_file(GTK_IMAGE(image),KEYBPIX_LOC);
! }
}
--- 81,103 ----
read_keymaps_list();
! add_keymap_list();
! setup_keymap_list_cb();
! read_X_keyboard_settings();
! select_current_keymap();
!
! gchar *kbd_pix;
! gint length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/keyboard.png");
! kbd_pix = (gchar *)malloc(length);
! strcpy(kbd_pix,PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/keyboard.png");
! gtk_image_set_from_file(GTK_IMAGE(image),kbd_pix);
! free(kbd_pix);
!
! realized = TRUE;
! }
!
! void quit_keybconf() {
! free_keymaps_list();
! free(keymap_list_dir);
! exit(0);
}
***************
*** 54,78 ****
}
#ifdef ENABLE_NLS
! bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
! bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
! textdomain (GETTEXT_PACKAGE);
#endif
! gtk_set_locale ();
! gtk_init (&argc, &argv);
! add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
! /*
! * The following code was added by Glade to create one of each component
! * (except popup menus), just so that you see something after building
! * the project. Delete any components that you don't want shown initially.
! */
! MainWindow = create_MainWindow ();
! init_keybconf();
! gtk_widget_show (MainWindow);
! setup_keybconf();
! gtk_main ();
! return 0;
}
--- 110,197 ----
}
#ifdef ENABLE_NLS
! bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
! bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
! textdomain (GETTEXT_PACKAGE);
#endif
! gtk_set_locale ();
! gtk_init (&argc, &argv);
!
! add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
! MainWindow = create_MainWindow ();
! init_keybconf();
! gtk_widget_show (MainWindow);
! setup_keybconf();
! gtk_main ();
! return 0;
! }
! gboolean select_current_keymap() {
! gint i, j;
! GtkTreeIter iter, iter_c;
! gboolean valid;
! GtkTreePath *path = NULL;
! GtkWidget *treeview = lookup_widget(MainWindow,"treeview1");
! GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
! GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
!
! if (strcmp(current_keymap,"") == 0) {
! return FALSE;
! }
! debug("finding %s\n",current_keymap);
! valid = gtk_tree_model_get_iter_first(model,&iter);
! for (i = 0; i < keymaps_count && valid == TRUE; i++) {
! for (j = 0; j < keymaps[i].list_count; j++) {
! gtk_tree_model_iter_nth_child(model,
! &iter_c,
! &iter,
! j);
! if (strcmp(keymaps[i].list[j].code,current_keymap) == 0) {
! path = gtk_tree_model_get_path(model,&iter_c);
! gtk_tree_selection_select_path(selection,path);
! gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview),path);
! gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview),
! path,
! NULL,
! TRUE,
! 0.5,0.0);
! debug("found keymap at nr %d\n",j);
! break;
! }
! }
! valid = gtk_tree_model_iter_next(model,&iter);
! }
! if (valid == FALSE || i >= keymaps_count ) {
! valid = gtk_tree_model_get_iter_first(model,&iter);
! for (i = 0; i < keymaps_count && valid == TRUE; i++) {
! for (j = 0; j < keymaps[i].list_count; j++) {
! if (strcmp(keymaps[i].list[j].code,"us") == 0) {
! path = gtk_tree_model_get_path(model,&iter);
! gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview),
! path,
! NULL,
! TRUE,
! 0.5,0.0);
! gtk_tree_selection_select_iter(selection,&iter);
! break;
! }
! }
! valid = gtk_tree_model_iter_next(model,&iter);
! }
! }
! return TRUE;
! }
!
!
!
! void setup_keymap_list_cb() {
! GtkWidget *treeview = lookup_widget(MainWindow,"treeview1");
!
! selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
! gtk_tree_selection_set_mode(selector, GTK_SELECTION_SINGLE);
! g_signal_connect(G_OBJECT(selector),"changed",
! G_CALLBACK(tree_selection_changed_cb),
! NULL);
}
Index: main.h
===================================================================
RCS file: /cvsroot/morphix/keybconf/src/main.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.h 31 Oct 2003 00:43:22 -0000 1.1.1.1
--- main.h 3 Nov 2003 00:20:31 -0000 1.2
***************
*** 1,9 ****
#ifndef KEYBCONF_MAIN_H
#define KEYBCONF_MAIN_H
!
#define KEYBPIX_LOC "../pixmaps/keyboard.png"
#define KEYBPIX_LOC_2 "/usr/share/keybconf/keyboard.png"
!
void add_keymap_list();
#endif
--- 1,10 ----
#ifndef KEYBCONF_MAIN_H
#define KEYBCONF_MAIN_H
! /*
#define KEYBPIX_LOC "../pixmaps/keyboard.png"
#define KEYBPIX_LOC_2 "/usr/share/keybconf/keyboard.png"
! */
void add_keymap_list();
+ void setup_keymap_list_cb();
#endif
|
|
From: <ale...@us...> - 2003-11-03 00:20:34
|
Update of /cvsroot/morphix/keybconf In directory sc8-pr-cvs1:/tmp/cvs-serv2668 Modified Files: keybconfig.glade Removed Files: keyboard.png Log Message: added changes so that keybconf actually does something removed redundant keyboard.png file Index: keybconfig.glade =================================================================== RCS file: /cvsroot/morphix/keybconf/keybconfig.glade,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** keybconfig.glade 31 Oct 2003 00:43:16 -0000 1.1.1.1 --- keybconfig.glade 3 Nov 2003 00:20:30 -0000 1.2 *************** *** 31,34 **** --- 31,35 ---- <widget class="GtkButton" id="helpbutton1"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_default">True</property> <property name="can_focus">True</property> *************** *** 50,54 **** <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-6</property> ! <signal name="clicked" handler="gtk_main_quit" last_modification_time="Sat, 14 Jun 2003 18:48:02 GMT"/> </widget> </child> --- 51,55 ---- <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-6</property> ! <signal name="clicked" handler="on_cancelbutton1_clicked" last_modification_time="Sun, 02 Nov 2003 22:39:12 GMT"/> </widget> </child> --- keyboard.png DELETED --- |
|
From: <ale...@us...> - 2003-11-03 00:16:06
|
Update of /cvsroot/morphix/keybconf/lists In directory sc8-pr-cvs1:/tmp/cvs-serv1975 Removed Files: querty quertz Log Message: removing typos :) --- querty DELETED --- --- quertz DELETED --- |
|
From: <ale...@us...> - 2003-10-28 02:43:32
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1:/tmp/cvs-serv495 Modified Files: ChangeLog Log Message: updated changelog with mantas's info Index: ChangeLog =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ChangeLog 1 Oct 2003 23:25:38 -0000 1.5 --- ChangeLog 28 Oct 2003 01:02:40 -0000 1.6 *************** *** 1,2 **** --- 1,26 ---- + 2003-09-28 Mantas Kriauèiûnas <ma...@ak...> + * Lots of usefull changes + * src/callbacks.c: on_buttonOkUser_clicked() - Removed UseXsessionBoot + (should be optional and realized in postinstall.sh, not in installers binary + * src/instlib.c: Same for "cp -af /morphix/init.sh /etc/init.d/xsession" + * src/callbacks.c: on_ExpertButtonRoot_clicked() - SelectPartExpert widget + now is created only one time (first time when user presses expert partitioning) + * src/instlib.c: MakeFS() - Added -q when making reiserfs + (-q - quiet work without messages, progress and questions) + * src/instlib.c: MakeRoot() - partitions are now unmounted before mkfs + * src/instlib.c: MakeRoot() - added check, as same partition can't be selected + as root and in expert partitioning + * src/instlib.c: changed /floppy and /cdrom lines to supermount in fstab + (TODO: I think it's a bad solution to hardcode /etc/fstab into installer) + * src/instlib.c: SetUpHomeDir() - left morph user as is (copying files from + morph's user dir to newly created user dir is a bad solution, because some + config files depend on path or username + * src/instlib.c: removed adding "2:2345:respawn:/sbin/getty 38400 tty2" to + because standart Debian inittab already contains this stuff + * src/instlib.c: UnmountTarget() - target/miniroot and expert partitions + should be unmounted before unmounting root partition. + * src/instlib.c: GetCdromSize() - changed "du -s /cdrom" to "du -s /usr" + and because of this in GetCurrentPercentage() unpacked_cdrom_size = cdrom_size + 2003-09-24 Alex de Landgraaf <ale...@xs...> * src/callbacks.c, src/instlib.c made changes to copy-process |
|
From: <ale...@us...> - 2003-10-28 02:00:39
|
Update of /cvsroot/morphix/datetimeconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8921
Modified Files:
main.c main.h
Log Message:
fixed same bug as in langconf
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/src/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.c 26 Oct 2003 20:48:00 -0000 1.3
--- main.c 28 Oct 2003 01:49:06 -0000 1.4
***************
*** 23,27 ****
extern tz_struct *selected_timezone;
! GtkTreeSelection *select;
void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data) {
--- 23,27 ----
extern tz_struct *selected_timezone;
! GtkTreeSelection *selector;
void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data) {
***************
*** 75,78 ****
--- 75,79 ----
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(utccheckbutton),check_system_utc());
debug("Set date/time\n");
+ set_ntp_server_list();
do_ntp_server();
setup_timezone_list();
***************
*** 134,137 ****
--- 135,144 ----
}
+ void set_ntp_server_list() {
+ GtkWidget *combo = lookup_widget(MainWindow,"combo1");
+ GList *list = NULL;
+ list = g_list_append(list,"time.nist.gov");
+ gtk_combo_set_popdown_strings(GTK_COMBO(combo),list);
+ }
struct tm get_date_time() {
struct tm dt;
***************
*** 174,180 ****
GtkWidget *treeview = lookup_widget(MainWindow,"treeview1");
! select = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
! gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
! g_signal_connect(G_OBJECT(select),"changed",
G_CALLBACK(tree_selection_changed_cb),
NULL);
--- 181,187 ----
GtkWidget *treeview = lookup_widget(MainWindow,"treeview1");
! selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
! gtk_tree_selection_set_mode(selector, GTK_SELECTION_SINGLE);
! g_signal_connect(G_OBJECT(selector),"changed",
G_CALLBACK(tree_selection_changed_cb),
NULL);
Index: main.h
===================================================================
RCS file: /cvsroot/morphix/datetimeconf/src/main.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.h 26 Oct 2003 20:48:00 -0000 1.2
--- main.h 28 Oct 2003 01:49:06 -0000 1.3
***************
*** 41,45 ****
gboolean setup_timezone_map();
gboolean draw_cross(int x, int y);
! void set_readin_tz();
void set_current_tz(tz_struct *tz);
gboolean set_tz_from_string(gchar *string);
--- 41,46 ----
gboolean setup_timezone_map();
gboolean draw_cross(int x, int y);
! void set_readin_tz();
! void set_ntp_server_list();
void set_current_tz(tz_struct *tz);
gboolean set_tz_from_string(gchar *string);
|
|
From: <ale...@us...> - 2003-10-28 01:56:56
|
Update of /cvsroot/morphix/langconf
In directory sc8-pr-cvs1:/tmp/cvs-serv7389
Modified Files:
langconf.gladep locale-list
Log Message:
added euro's to locale-list, fixed annoying select-shadowed bug
Index: langconf.gladep
===================================================================
RCS file: /cvsroot/morphix/langconf/langconf.gladep,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** langconf.gladep 26 Oct 2003 23:14:44 -0000 1.1
--- langconf.gladep 28 Oct 2003 01:46:06 -0000 1.2
***************
*** 6,8 ****
--- 6,10 ----
<program_name>langconf</program_name>
<gnome_support>FALSE</gnome_support>
+ <output_translatable_strings>TRUE</output_translatable_strings>
+ <translatable_strings_file>translate.c</translatable_strings_file>
</glade-project>
Index: locale-list
===================================================================
RCS file: /cvsroot/morphix/langconf/locale-list,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** locale-list 26 Oct 2003 23:02:43 -0000 1.1.1.1
--- locale-list 28 Oct 2003 01:46:06 -0000 1.2
***************
*** 24,28 ****
br_FR 8859-15 lat0-sun16 Breton (France)
bg_BG.UTF-8 utf8 latarcyrheb-sun16 Bulgarian - ÐÑлгаÑÑки
! ca_ES.UTF-8 utf8 latarcyrheb-sun16 Catalan (Spain)
zh_HK.UTF-8 utf8 latarcyrheb-sun16 Chinese (Hong Kong)
zh_CN.GB18030 8859-15 lat0-sun16 Chinese (P.R. of China) - ä¸æ(ç®ä½)
--- 24,28 ----
br_FR 8859-15 lat0-sun16 Breton (France)
bg_BG.UTF-8 utf8 latarcyrheb-sun16 Bulgarian - ÐÑлгаÑÑки
! ca_ES.UTF-8@euro utf8 latarcyrheb-sun16 Catalan (Spain)
zh_HK.UTF-8 utf8 latarcyrheb-sun16 Chinese (Hong Kong)
zh_CN.GB18030 8859-15 lat0-sun16 Chinese (P.R. of China) - ä¸æ(ç®ä½)
***************
*** 32,37 ****
cs_CZ.UTF-8 utf8 latarcyrheb-sun16 Czech - Äeská republika
da_DK.UTF-8 utf8 latarcyrheb-sun16 Danish - Dansk
! nl_BE.UTF-8 utf8 latarcyrheb-sun16 Dutch (Belgium)
! nl_NL.UTF-8 utf8 latarcyrheb-sun16 Dutch (Netherlands)
en_AU.UTF-8 utf8 latarcyrheb-sun16 English (Australia)
en_BW.UTF-8 utf8 latarcyrheb-sun16 English (Botswana)
--- 32,37 ----
cs_CZ.UTF-8 utf8 latarcyrheb-sun16 Czech - Äeská republika
da_DK.UTF-8 utf8 latarcyrheb-sun16 Danish - Dansk
! nl_BE.UTF-8@euro utf8 latarcyrheb-sun16 Dutch (Belgium)
! nl_NL.UTF-8@euro utf8 latarcyrheb-sun16 Dutch (Netherlands)
en_AU.UTF-8 utf8 latarcyrheb-sun16 English (Australia)
en_BW.UTF-8 utf8 latarcyrheb-sun16 English (Botswana)
***************
*** 41,45 ****
en_HK.UTF-8 utf8 latarcyrheb-sun16 English (Hong Kong)
en_IN utf8 latarcyrheb-sun16 English (India)
! en_IE.UTF-8 utf8 latarcyrheb-sun16 English (Ireland)
en_NZ.UTF-8 utf8 latarcyrheb-sun16 English (New Zealand)
en_PH.UTF-8 utf8 latarcyrheb-sun16 English (Philippines)
--- 41,45 ----
en_HK.UTF-8 utf8 latarcyrheb-sun16 English (Hong Kong)
en_IN utf8 latarcyrheb-sun16 English (India)
! en_IE.UTF-8@euro utf8 latarcyrheb-sun16 English (Ireland)
en_NZ.UTF-8 utf8 latarcyrheb-sun16 English (New Zealand)
en_PH.UTF-8 utf8 latarcyrheb-sun16 English (Philippines)
***************
*** 50,64 ****
et_EE.UTF-8 utf8 latarcyrheb-sun16 Estonian
fo_FO.UTF-8 utf8 latarcyrheb-sun16 Faroese (Faroe Islands)
! fi_FI.UTF-8 utf8 latarcyrheb-sun16 Finnish
! fr_BE.UTF-8 utf8 latarcyrheb-sun16 French (Belgium)
fr_CA.UTF-8 utf8 latarcyrheb-sun16 French (Canada)
fr_FR.UTF-8 utf8 latarcyrheb-sun16 French (France) - Français
! fr_LU.UTF-8 utf8 latarcyrheb-sun16 French (Luxemburg)
fr_CH.UTF-8 utf8 latarcyrheb-sun16 French (Switzerland)
! gl_ES.UTF-8 utf8 latarcyrheb-sun16 Galician (Spain)
! de_AT.UTF-8 utf8 latarcyrheb-sun16 German (Austria)
! de_BE.UTF-8 utf8 latarcyrheb-sun16 German (Belgium)
! de_DE.UTF-8 utf8 latarcyrheb-sun16 German (Germany) - Deutsch
! de_LU.UTF-8 utf8 latarcyrheb-sun16 German (Luxemburg)
de_CH.UTF-8 utf8 latarcyrheb-sun16 German (Switzerland)
el_GR.UTF-8 utf8 latarcyrheb-sun16 Greek
--- 50,64 ----
et_EE.UTF-8 utf8 latarcyrheb-sun16 Estonian
fo_FO.UTF-8 utf8 latarcyrheb-sun16 Faroese (Faroe Islands)
! fi_FI.UTF-8@euro utf8 latarcyrheb-sun16 Finnish
! fr_BE.UTF-8@euro utf8 latarcyrheb-sun16 French (Belgium)
fr_CA.UTF-8 utf8 latarcyrheb-sun16 French (Canada)
fr_FR.UTF-8 utf8 latarcyrheb-sun16 French (France) - Français
! fr_LU.UTF-8@euro utf8 latarcyrheb-sun16 French (Luxemburg)
fr_CH.UTF-8 utf8 latarcyrheb-sun16 French (Switzerland)
! gl_ES.UTF-8@euro utf8 latarcyrheb-sun16 Galician (Spain)
! de_AT.UTF-8@euro utf8 latarcyrheb-sun16 German (Austria)
! de_BE.UTF-8@euro utf8 latarcyrheb-sun16 German (Belgium)
! de_DE.UTF-8@euro utf8 latarcyrheb-sun16 German (Germany) - Deutsch
! de_LU.UTF-8@euro utf8 latarcyrheb-sun16 German (Luxemburg)
de_CH.UTF-8 utf8 latarcyrheb-sun16 German (Switzerland)
el_GR.UTF-8 utf8 latarcyrheb-sun16 Greek
***************
*** 69,74 ****
is_IS.UTF-8 utf8 latarcyrheb-sun16 Icelandic - Ãslenska
id_ID.UTF-8 utf8 latarcyrheb-sun16 Indonesian
! ga_IE.UTF-8 utf8 latarcyrheb-sun16 Irish
! it_IT.UTF-8 utf8 latarcyrheb-sun16 Italian (Italy) Italiano
it_CH.UTF-8 utf8 latarcyrheb-sun16 Italian (Switzerland)
ja_JP.UTF-8 utf8 lat0-sun16 Japanese - æ¥æ¬èª
--- 69,74 ----
is_IS.UTF-8 utf8 latarcyrheb-sun16 Icelandic - Ãslenska
id_ID.UTF-8 utf8 latarcyrheb-sun16 Indonesian
! ga_IE.UTF-8@euro utf8 latarcyrheb-sun16 Irish
! it_IT.UTF-8@euro utf8 latarcyrheb-sun16 Italian (Italy) Italiano
it_CH.UTF-8 utf8 latarcyrheb-sun16 Italian (Switzerland)
ja_JP.UTF-8 utf8 lat0-sun16 Japanese - æ¥æ¬èª
***************
*** 89,93 ****
pl_PL.UTF-8 utf8 latarcyrheb-sun16 Polish
pt_BR.UTF-8 utf8 latarcyrheb-sun16 Portuguese (Brasil)
! pt_PT.UTF-8 utf8 latarcyrheb-sun16 Portuguese (Portugal) - Português
ro_RO.UTF-8 utf8 latarcyrheb-sun16 Romanian
ru_RU.UTF-8 utf8 latarcyrheb-sun16 Russian - Ð ÑÑÑкий
--- 89,93 ----
pl_PL.UTF-8 utf8 latarcyrheb-sun16 Polish
pt_BR.UTF-8 utf8 latarcyrheb-sun16 Portuguese (Brasil)
! pt_PT.UTF-8@euro utf8 latarcyrheb-sun16 Portuguese (Portugal) - Português
ro_RO.UTF-8 utf8 latarcyrheb-sun16 Romanian
ru_RU.UTF-8 utf8 latarcyrheb-sun16 Russian - Ð ÑÑÑкий
***************
*** 112,120 ****
es_PE.UTF-8 utf8 latarcyrheb-sun16 Spanish (Peru)
es_PR.UTF-8 utf8 latarcyrheb-sun16 Spanish (Puerto Rico)
! es_ES.UTF-8 utf8 latarcyrheb-sun16 Spanish (Spain) - Español
es_US.UTF-8 utf8 latarcyrheb-sun16 Spanish (USA)
es_UY.UTF-8 utf8 latarcyrheb-sun16 Spanish (Uruguay)
es_VE.UTF-8 utf8 latarcyrheb-sun16 Spanish (Venezuela)
! sv_FI.UTF-8 utf8 latarcyrheb-sun16 Swedish (Finland)
sv_SE.UTF-8 utf8 latarcyrheb-sun16 Swedish (Sweden) - Svenska
tl_PH 8859-15 lat0-sun16 Tagalog (Philipines)
--- 112,120 ----
es_PE.UTF-8 utf8 latarcyrheb-sun16 Spanish (Peru)
es_PR.UTF-8 utf8 latarcyrheb-sun16 Spanish (Puerto Rico)
! es_ES.UTF-8@euro utf8 latarcyrheb-sun16 Spanish (Spain) - Español
es_US.UTF-8 utf8 latarcyrheb-sun16 Spanish (USA)
es_UY.UTF-8 utf8 latarcyrheb-sun16 Spanish (Uruguay)
es_VE.UTF-8 utf8 latarcyrheb-sun16 Spanish (Venezuela)
! sv_FI.UTF-8@euro utf8 latarcyrheb-sun16 Swedish (Finland)
sv_SE.UTF-8 utf8 latarcyrheb-sun16 Swedish (Sweden) - Svenska
tl_PH 8859-15 lat0-sun16 Tagalog (Philipines)
|
|
From: <ale...@us...> - 2003-10-28 01:56:56
|
Update of /cvsroot/morphix/langconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7389/src
Modified Files:
liblang.c main.c
Log Message:
added euro's to locale-list, fixed annoying select-shadowed bug
Index: liblang.c
===================================================================
RCS file: /cvsroot/morphix/langconf/src/liblang.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** liblang.c 26 Oct 2003 23:02:46 -0000 1.1.1.1
--- liblang.c 28 Oct 2003 01:46:06 -0000 1.2
***************
*** 38,42 ****
return TRUE;
}
! strcpy(current_code,"en_US.UTF-8");
fclose(fp);
return TRUE;
--- 38,42 ----
return TRUE;
}
! strcpy(current_code,"C");
fclose(fp);
return TRUE;
***************
*** 53,57 ****
return FALSE;
}
! fprintf(fp,"LANG=%s",ls->code);
fclose(fp);
return TRUE;
--- 53,57 ----
return FALSE;
}
! fprintf(fp,"LANG=%s\n",ls->code);
fclose(fp);
return TRUE;
***************
*** 71,79 ****
return FALSE;
}
! if (strcmp(ls->type,"utf8") == 0) {
! fprintf(fp,"%s %s",ls->code,"UTF-8");
! }
! else {
! fprintf(fp,"%s %s",ls->code,ls->type); // probably won't work for redhat types, maybe it's time for a combined redhat/debian locales list :)
}
fclose(fp);
--- 71,81 ----
return FALSE;
}
! if (strcmp(ls->code,"C") != 0) {
! if (strcmp(ls->type,"utf8") == 0) {
! fprintf(fp,"%s %s\n",ls->code,"UTF-8");
! }
! else {
! fprintf(fp,"%s %s\n",ls->code,ls->type); // probably won't work for redhat types, maybe it's time for a combined redhat/debian locales list :)
! }
}
fclose(fp);
***************
*** 104,108 ****
free(locales[i].type);
free(locales[i].description);
- free(&locales[i]);
}
free(locales);
--- 106,109 ----
***************
*** 132,136 ****
}
i = 0;
! locales_count = 0;
while (locale_array[i] != NULL) {
if (locale_array[i][0] != '#' && locale_array[i][0] != '\0')
--- 133,137 ----
}
i = 0;
! locales_count = 1; // adding C by default
while (locale_array[i] != NULL) {
if (locale_array[i][0] != '#' && locale_array[i][0] != '\0')
***************
*** 140,144 ****
j = 0;
locales = (struct locale_struct*) malloc(sizeof(loc_struct) * locales_count);
! debug("size of struct: %d\n",sizeof(loc_struct));
for (i = 0; locale_array[i] != NULL; i++) {
gchar code[32];
--- 141,149 ----
j = 0;
locales = (struct locale_struct*) malloc(sizeof(loc_struct) * locales_count);
! locales[0].code = g_strdup("C");
! locales[0].type = g_strdup("UTF-8");
! locales[0].description = g_strdup("English (C/Default)");
! j++;
!
for (i = 0; locale_array[i] != NULL; i++) {
gchar code[32];
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/langconf/src/main.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.c 26 Oct 2003 23:02:46 -0000 1.1.1.1
--- main.c 28 Oct 2003 01:46:06 -0000 1.2
***************
*** 17,21 ****
GtkWidget *MainWindow;
! GtkTreeSelection *select;
extern gboolean lang_changed;
--- 17,21 ----
GtkWidget *MainWindow;
! GtkTreeSelection *selector;
extern gboolean lang_changed;
***************
*** 149,155 ****
GtkWidget *treeview = lookup_widget(MainWindow,"treeview1");
! select = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
! gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
! g_signal_connect(G_OBJECT(select),"changed",
G_CALLBACK(tree_selection_changed_cb),
NULL);
--- 149,155 ----
GtkWidget *treeview = lookup_widget(MainWindow,"treeview1");
! selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
! gtk_tree_selection_set_mode(selector, GTK_SELECTION_SINGLE);
! g_signal_connect(G_OBJECT(selector),"changed",
G_CALLBACK(tree_selection_changed_cb),
NULL);
|
|
From: <ale...@us...> - 2003-10-26 23:21:46
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1:/tmp/cvs-serv30301 Added Files: morphixinstaller.gladep Log Message: fix glade-build thingy |
|
From: <ale...@us...> - 2003-10-26 23:21:39
|
Update of /cvsroot/morphix/datetimeconf In directory sc8-pr-cvs1:/tmp/cvs-serv29664 Added Files: datetimeconf.gladep Log Message: adding glade-build fix --- NEW FILE: datetimeconf.gladep --- <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> <!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd"> <glade-project> <name>Datetimeconf</name> <program_name>datetimeconf</program_name> <gnome_support>FALSE</gnome_support> <output_translatable_strings>TRUE</output_translatable_strings> <translatable_strings_file>translate.c</translatable_strings_file> </glade-project> |
|
From: <ale...@us...> - 2003-10-26 23:18:49
|
Update of /cvsroot/morphix/langconf In directory sc8-pr-cvs1:/tmp/cvs-serv29430 Modified Files: langconf.glade Added Files: langconf.gladep Log Message: fixed glade-building, removed title --- NEW FILE: langconf.gladep --- <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> <!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd"> <glade-project> <name>Langconf</name> <program_name>langconf</program_name> <gnome_support>FALSE</gnome_support> </glade-project> Index: langconf.glade =================================================================== RCS file: /cvsroot/morphix/langconf/langconf.glade,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** langconf.glade 26 Oct 2003 23:02:42 -0000 1.1.1.1 --- langconf.glade 26 Oct 2003 23:14:44 -0000 1.2 *************** *** 147,151 **** <property name="visible">True</property> <property name="can_focus">True</property> ! <property name="headers_visible">True</property> <property name="rules_hint">False</property> <property name="reorderable">False</property> --- 147,151 ---- <property name="visible">True</property> <property name="can_focus">True</property> ! <property name="headers_visible">False</property> <property name="rules_hint">False</property> <property name="reorderable">False</property> |
|
From: <ale...@us...> - 2003-10-26 23:18:48
|
Update of /cvsroot/morphix/langconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29430/src
Modified Files:
interface.c
Log Message:
fixed glade-building, removed title
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/langconf/src/interface.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** interface.c 26 Oct 2003 23:02:46 -0000 1.1.1.1
--- interface.c 26 Oct 2003 23:14:44 -0000 1.2
***************
*** 79,82 ****
--- 79,83 ----
gtk_widget_show (treeview1);
gtk_container_add (GTK_CONTAINER (scrolledwindow1), treeview1);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview1), FALSE);
dialog_action_area1 = GTK_DIALOG (MainWindow)->action_area;
|
|
From: <ale...@us...> - 2003-10-26 23:02:04
|
Update of /cvsroot/morphix/morphixinstaller/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26116/src
Modified Files:
callbacks.c cmdline.c installer.h instlib.c interface.c
Log Message:
added Mantas's changes, see Changelog for details
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** callbacks.c 24 Sep 2003 23:23:03 -0000 1.13
--- callbacks.c 26 Oct 2003 22:56:18 -0000 1.14
***************
*** 255,259 ****
}
// done with install, join our threads and continue with
! // the configuration process
g_thread_join(thread);
timeout = 1;
--- 255,262 ----
}
// done with install, join our threads and continue with
! // the configuration process or inform user about failing install
! // TODO:
! // if there are 0 free space now installing cannot continue
!
g_thread_join(thread);
timeout = 1;
***************
*** 403,408 ****
SetUpHomeDir((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_user)),(gchar *)gtk_entry_get_text(GTK_ENTRY(entry1)));
!
! UseXsessionBoot((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_user)));
CopyKernel();
--- 406,411 ----
SetUpHomeDir((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_user)),(gchar *)gtk_entry_get_text(GTK_ENTRY(entry1)));
! // This should be optional and should be realized in postinstall.sh, not in installers binary
! // UseXsessionBoot((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_user)));
CopyKernel();
***************
*** 740,745 ****
gpointer user_data)
{
SelectPartExpert = create_SelectPartExpert ();
! gtk_widget_show (SelectPartExpert);
GtkWidget *expert_selected_wid[MAX_EXPERT_MOUNTS];
--- 743,750 ----
gpointer user_data)
{
+ // should create only first time when user press expert partitioning
+ if (SelectPartExpert == NULL) {
SelectPartExpert = create_SelectPartExpert ();
!
GtkWidget *expert_selected_wid[MAX_EXPERT_MOUNTS];
***************
*** 752,759 ****
for (j = 0; j < MAX_EXPERT_MOUNTS; j++) {
! gtk_combo_set_popdown_strings(GTK_COMBO(expert_selected_wid[j]),items);
}
}
void
on_cancelButtonExpert_clicked (GtkButton *button,
--- 757,767 ----
for (j = 0; j < MAX_EXPERT_MOUNTS; j++) {
! gtk_combo_set_popdown_strings(GTK_COMBO(expert_selected_wid[j]),items);
}
+ }
+ gtk_widget_show (SelectPartExpert);
}
+ // TODO: cancel doesn't work as expect - from users view cancel is same like ok
void
on_cancelButtonExpert_clicked (GtkButton *button,
Index: cmdline.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/cmdline.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cmdline.c 22 Aug 2003 22:25:23 -0000 1.1
--- cmdline.c 26 Oct 2003 22:56:18 -0000 1.2
***************
*** 427,431 ****
}
SetUpHomeDir(cmdlineargs.username,cmdlineargs.userpass);
! UseXsessionBoot(cmdlineargs.username);
/* lilo section */
--- 427,432 ----
}
SetUpHomeDir(cmdlineargs.username,cmdlineargs.userpass);
! //UseXsessionBoot should be optional and realized in postinstall.sh, not in installers binar
! // UseXsessionBoot(cmdlineargs.username);
/* lilo section */
Index: installer.h
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/installer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** installer.h 22 Aug 2003 22:25:23 -0000 1.6
--- installer.h 26 Oct 2003 22:56:18 -0000 1.7
***************
*** 25,30 ****
#define TEMPLATE_FILENAME "knx-templates-0.37.tgz"
#define ROOT_MOUNTPOINT "/mnt/target"
! #define LOOP_MOUNTPOINT_1 "/mnt/l1"
! #define LOOP_MOUNTPOINT_2 "/mnt/l2"
#define TEMPLATE_DIR "/tmp/templates"
--- 25,30 ----
#define TEMPLATE_FILENAME "knx-templates-0.37.tgz"
#define ROOT_MOUNTPOINT "/mnt/target"
! #define LOOP_MOUNTPOINT_1 "/tmp/l1"
! #define LOOP_MOUNTPOINT_2 "/tmp/l2"
#define TEMPLATE_DIR "/tmp/templates"
Index: instlib.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** instlib.c 7 Oct 2003 14:11:30 -0000 1.8
--- instlib.c 26 Oct 2003 22:56:18 -0000 1.9
***************
*** 108,111 ****
--- 108,113 ----
sprintf(cmdline,"xterm -fn 10x20 -e cfdisk /dev/%s",harddisk);
+ // TODO: Here should be check if in system exist QTParted or other GUI partitioner
+ // sprintf(cmdline,"/usr/sbin/qtparted /dev/%s",harddisk);
debug("Exec: %s\n",cmdline);
g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exit_status,NULL);
***************
*** 158,216 ****
}
! gpointer MakeRoot(gpointer data) {
gchar cmdline[256];
! gint i;
!
! /* choose the fs, space for specific commands here */
switch (selected_fs_nr) {
case (0):
case (1):
! sprintf(cmdline,"mkfs.%s %s",selected_fs,selected_rootpart);
break;
case (2):
! sprintf(cmdline,"mkfs.%s -f -f %s",selected_fs,selected_rootpart);
break;
case (3):
! sprintf(cmdline,"mkfs.%s -f %s",selected_fs,selected_rootpart);
break;
default:
! sprintf(cmdline,"mkfs.%s %s",selected_fs,selected_rootpart);
break;
}
ExecuteCommand(cmdline);
! root_done = TRUE;
! // for each partition selected, make a new filesystem on it
! // the type of filesystem is the same as the root filesystem,
! // as most people shouldn't need any weird different partitiontypes
! if (expert_part == TRUE) {
! for (i = 0; i < MAX_EXPERT_MOUNTS; i++) {
! if (strcmp(expert_selected_parts[i],"none") == 0 ||
! strcmp(expert_selected_parts[i],"") == 0) {
! continue;
! }
! if (expert_new_filesystem[i] == TRUE) {
! switch (selected_fs_nr) {
! case (0):
! case (1):
! sprintf(cmdline,"mkfs.%s %s",selected_fs,expert_selected_parts[i]);
! break;
! case (2):
! sprintf(cmdline,"mkfs.%s -f -f %s",selected_fs,expert_selected_parts[i]);
! break;
! case (3):
! sprintf(cmdline,"mkfs.%s -f %s",selected_fs,expert_selected_parts[i]);
! break;
! default:
! sprintf(cmdline,"mkfs.%s %s",selected_fs,expert_selected_parts[i]);
! break;
! }
! ExecuteCommand(cmdline);
! }
! }
}
!
! debug("Root partition generated\n");
}
--- 160,237 ----
}
! /* choose the fs, space for specific commands here */
! gboolean MakeFS (gchar *selected_fs, gchar *selected_part) {
gchar cmdline[256];
!
switch (selected_fs_nr) {
case (0):
case (1):
! sprintf(cmdline,"mkfs.%s %s",selected_fs,selected_part);
break;
case (2):
! //mkfs.reiserfs --help: -q | --quiet quiet work without messages, progress and
! // questions. Useful if run in a script. For use by end users only.
! sprintf(cmdline,"mkfs.%s -f -f -q %s",selected_fs,selected_part);
break;
case (3):
! sprintf(cmdline,"mkfs.%s -f %s",selected_fs,selected_part);
break;
default:
! sprintf(cmdline,"mkfs.%s %s",selected_fs,selected_part);
break;
}
ExecuteCommand(cmdline);
! }
! gpointer MakeRoot(gpointer data) {
!
! gchar cmdline[256];
! gint i;
!
! /* umount the partitions for sure and check for duplicating */
! // somewhere should be check is target directory empty or not
! /* another partition can be leaved mounted ex. during previous install */
! if (expert_part == TRUE) {
! for (i = 0; i < MAX_EXPERT_MOUNTS; i++) {
! if (strcmp(expert_selected_parts[i],"") != 0 &&
! strcmp(expert_selected_parts[i],"none") != 0) {
! // Not sure about && expert_fstab_only[i] != TRUE)
! if (strcmp(selected_rootpart,expert_selected_parts[i]) != 0){
! sprintf(cmdline,"umount %s",expert_selected_parts[i]);
! ExecuteCommand(cmdline);
! }
! else{
! debug("root partition can't be mounted somewhere else!!!\n");
! root_done = FALSE;
! return;
! }
! }
}
! }
! sprintf(cmdline,"umount %s",selected_rootpart);
! ExecuteCommand(cmdline);
!
! sprintf(cmdline,"umount %s",ROOT_MOUNTPOINT);
! ExecuteCommand(cmdline);
!
! MakeFS (selected_fs,selected_rootpart);
! root_done = TRUE;
!
! // for each partition selected, make a new filesystem on it
! // the type of filesystem is the same as the root filesystem,
! // as most people shouldn't need any weird different partitiontypes
! if (expert_part == TRUE) {
! for (i = 0; i < MAX_EXPERT_MOUNTS; i++) {
! if (strcmp(expert_selected_parts[i],"none") != 0 &&
! strcmp(expert_selected_parts[i],"") != 0 &&
! expert_new_filesystem[i] == TRUE) {
!
! MakeFS (selected_fs,expert_selected_parts[i]);
! }
! }
! }
!
! debug("Root partition generated\n");
}
***************
*** 235,255 ****
/* mount extra partitions, if these have been selected... */
if (expert_part == TRUE) {
! for (i = 0; i < MAX_EXPERT_MOUNTS; i++) {
! if (strcmp(expert_selected_parts[i],"none") == 0 ||
! strcmp(expert_selected_parts[i],"") == 0) {
! continue;
! }
! if (expert_fstab_only[i] != TRUE) {
! sprintf(cmdline,"%s%s",
! ROOT_MOUNTPOINT,expert_selected_mounts[i]);
! if (mkdir(cmdline,0755) == -1) {
! debug("Error creating directory %s\n",cmdline);
! continue;
! }
! sprintf(cmdline,"mount %s %s%s",expert_selected_parts[i],
! ROOT_MOUNTPOINT,expert_selected_mounts[i]);
! ExecuteCommand(cmdline);
! }
}
}
if (cpio_passthrough == TRUE) {
--- 256,280 ----
/* mount extra partitions, if these have been selected... */
if (expert_part == TRUE) {
! for (i = 0; i < MAX_EXPERT_MOUNTS; i++) {
! if (strcmp(expert_selected_parts[i],"") != 0 &&
! strcmp(expert_selected_parts[i],"none") != 0 &&
! expert_fstab_only[i] != TRUE) {
!
! sprintf(cmdline,"%s%s",
! ROOT_MOUNTPOINT,expert_selected_mounts[i]);
! //continue operator is not recommended to use in "for" cycle
! if (mkdir(cmdline,0755) == -1) {
! debug("Error creating directory %s\n",cmdline);
! continue;
! }
! // type of newly created filesystem is selected_fs
! if (expert_new_filesystem[i] != TRUE)
! sprintf(cmdline,"mount %s %s%s",expert_selected_parts[i],
! ROOT_MOUNTPOINT,expert_selected_mounts[i]);
! else sprintf(cmdline,"mount -t %s %s %s%s",selected_fs,expert_selected_parts[i],
! ROOT_MOUNTPOINT,expert_selected_mounts[i]);
! ExecuteCommand(cmdline);
}
+ }
}
if (cpio_passthrough == TRUE) {
***************
*** 374,379 ****
}
! debug("proc /proc proc defaults 0 0\n/dev/fd0 /floppy vfat defaults,user,noauto,showexec,umask=022 0 0\n/dev/cdrom /cdrom iso9660 defaults,ro,user,noexec,noauto 0 0\n");
! fprintf(file,"proc /proc proc defaults 0 0\n/dev/fd0 /mnt/auto/floppy auto defaults,user,noauto,showexec,umask=022 0 0\n/dev/cdrom /mnt/auto/cdrom auto defaults,ro,user,noexec,noauto 0 0\n");
// add any entries in regular fstab that have been added my morphix-base
--- 399,405 ----
}
! // TODO: I think is bad solution to hardcode /etc/fstab into installer. I think parts of live-CD fstab should be used instead
! debug("proc /proc proc defaults 0 0\n/dev/fd0 /floppy vfat defaults,user,noauto,showexec,umask=022 0 0\n/cdrom /cdrom supermount auto,users,ro,fs=auto,dev=/dev/cdrom 0 0\n");
! fprintf(file,"proc /proc proc defaults 0 0\n/floppy /floppy supermount auto,users,fs=vfat,dev=/dev/fd0 0 0\n/cdrom /cdrom supermount auto,users,ro,fs=auto,dev=/dev/cdrom 0 0\n");
// add any entries in regular fstab that have been added my morphix-base
***************
*** 411,415 ****
fclose(file);
! sprintf(cmdline,"cp -af /morphix/init.sh %s/etc/init.d/xsession",ROOT_MOUNTPOINT);
ExecuteCommand(cmdline);
--- 437,444 ----
fclose(file);
! // this is really not installers job, for example Gnome module doesn't need this
! // at all, if there are modules, that needs this then do this in postinst.sh
!
! /* sprintf(cmdline,"cp -af /morphix/init.sh %s/etc/init.d/xsession",ROOT_MOUNTPOINT);
ExecuteCommand(cmdline);
***************
*** 419,422 ****
--- 448,452 ----
sprintf(cmdline,"chmod a+rx %s/etc/init.d/xsession",ROOT_MOUNTPOINT);
ExecuteCommand(cmdline);
+ */
/* umount extra partitions, if these have been selected... */
***************
*** 672,712 ****
/* This looks ugly, but it works... sortof :o)*/
void SetUpHomeDir(gchar *username, gchar *password) {
! gchar cmdline[256];
! if (strncmp(username,"morph",6) != 0) {
! // move the morph dir to the new username's
! sprintf(cmdline,"chroot %s sh -c 'mv /home/morph /home/%s'",ROOT_MOUNTPOINT,username);
! ExecuteCommand(cmdline);
!
! // remove the morph user
! sprintf(cmdline,"chroot %s sh -c 'deluser morph'",ROOT_MOUNTPOINT);
! ExecuteCommand(cmdline);
! // add the new group
! sprintf(cmdline,"chroot %s sh -c 'groupadd %s'",ROOT_MOUNTPOINT,username);
! ExecuteCommand(cmdline);
! // add the new user
! sprintf(cmdline,"chroot %s sh -c 'useradd -s /bin/bash -d /home/%s -c \"Morphix User\" -g %s -G audio,video,users -p '%s' %s'",ROOT_MOUNTPOINT,username,username,crypt(password),username);
! ExecuteCommand(cmdline);
! // Add the new user to /etc/sudoers - Even though the file may be deleted later on !
! sprintf(cmdline,"chroot %s sh -c 'echo %s ALL:=NOPASSWD:ALL\n >> /etc/sudoers'",ROOT_MOUNTPOINT,username);
! ExecuteCommand(cmdline);
! // make sure the user's files have the right permissions
! sprintf(cmdline,"chroot %s sh -c 'chown -R %s.%s /home/%s'",ROOT_MOUNTPOINT,username,username,username);
! ExecuteCommand(cmdline);
!
! }
! else {
! // change the morph-user's password
! sprintf(cmdline,"chroot %s sh -c \"echo \\\"morph:%s\\\" | chpasswd\"",ROOT_MOUNTPOINT,password);
! ExecuteCommand(cmdline);
! }
}
void UseXsessionBoot(gchar *username) {
gchar *input_buf;
--- 702,755 ----
/* This looks ugly, but it works... sortof :o)*/
void SetUpHomeDir(gchar *username, gchar *password) {
! //TODO: User groups should made customizable in future,
! // not hardcoded in executable like now
! const gchar user_groups[64] = "audio,video,users,lp,cdrom,floppy,games";
! // It is enough 256 characters ?
! gchar cmdline[256];
!
! if (strncmp(username,"morph",6) != 0) {
! // I think morph user can be left as is (TODO: maybe with no password)
! // move the morph dir to the new username's
! // sprintf(cmdline,"chroot %s sh -c 'mv /home/morph /home/%s'",ROOT_MOUNTPOINT,username);
! // ExecuteCommand(cmdline);
! // remove the morph user
! // sprintf(cmdline,"chroot %s sh -c 'deluser morph'",ROOT_MOUNTPOINT);
! // ExecuteCommand(cmdline);
! // add the new group
! sprintf(cmdline,"chroot %s sh -c 'groupadd %s'",ROOT_MOUNTPOINT,username);
! ExecuteCommand(cmdline);
! // add the new user
! sprintf(cmdline,"chroot %s sh -c 'useradd -m -s /bin/bash -d /home/%s -c \"Morphix User\" -g %s -p '%s' %s'",
! ROOT_MOUNTPOINT, username, username, crypt(password), username);
! ExecuteCommand(cmdline);
! // Add the new user to /etc/sudoers - Even though the file may be deleted later on !
! sprintf(cmdline,"chroot %s sh -c 'echo %s ALL:=NOPASSWD:ALL\n >> /etc/sudoers'",ROOT_MOUNTPOINT,username);
! ExecuteCommand(cmdline);
! // make sure the user's files have the right permissions
! sprintf(cmdline,"chroot %s sh -c 'chown -R %s.%s /home/%s'",ROOT_MOUNTPOINT,username,username,username);
! ExecuteCommand(cmdline);
! }
! else {
! // change the morph-user's password
! sprintf(cmdline,"chroot %s sh -c \"echo \\\"morph:%s\\\" | chpasswd\"",ROOT_MOUNTPOINT,password);
! ExecuteCommand(cmdline);
! }
!
! // add user to needed groups
! sprintf(cmdline,"chroot %s sh -c 'usermod -G %s %s'", ROOT_MOUNTPOINT, user_groups, username);
! ExecuteCommand(cmdline);
!
! sprintf(cmdline,"chroot %s sh -c 'usermod -G dip %s'",ROOT_MOUNTPOINT,username);
! ExecuteCommand(cmdline);
}
+ /*
void UseXsessionBoot(gchar *username) {
gchar *input_buf;
***************
*** 742,745 ****
--- 785,789 ----
g_strfreev(input_array);
}
+ */
/*
***************
*** 752,755 ****
--- 796,800 ----
void SetupLilo(gint lilo_mode) {
+ // lilo.conf shouldn't be hardcoded to executable
gchar lilo_conf[4092];
gchar *outbuffer;
***************
*** 992,997 ****
/* add pump to the inittab (messy, i know, gotta fix this to detect if DHCP is used...) */
! sprintf(cmdline,"%s/etc/inittab",ROOT_MOUNTPOINT);
file =fopen(cmdline,"a");
// add getty's so each console has it's login prompt
fprintf(file,"2:2345:respawn:/sbin/getty 38400 tty2\n");
--- 1037,1044 ----
/* add pump to the inittab (messy, i know, gotta fix this to detect if DHCP is used...) */
! // TODO: detect if DHCP is used and make correct /etc/network/interfaces in this case
! /* sprintf(cmdline,"%s/etc/inittab",ROOT_MOUNTPOINT);
file =fopen(cmdline,"a");
+ // standart Debian inittab already contains this stuff
// add getty's so each console has it's login prompt
fprintf(file,"2:2345:respawn:/sbin/getty 38400 tty2\n");
***************
*** 1002,1006 ****
fprintf(file,"P1:2345:once:/sbin/pump\n");
fclose(file);
!
// TODO - add DMA
--- 1049,1053 ----
fprintf(file,"P1:2345:once:/sbin/pump\n");
fclose(file);
! */
// TODO - add DMA
***************
*** 1101,1110 ****
void UnmountTarget() {
! gchar cmdline[256];
! // doesn't work
! debug("Unmounting /mnt/target\n");
! sprintf(cmdline,"umount %s",ROOT_MOUNTPOINT);
! ExecuteCommand(cmdline);
}
--- 1148,1173 ----
void UnmountTarget() {
! gchar cmdline[256];
! gint i;
! // target/miniroot and expert partitions should be unmounted first
!
! if (expert_part == TRUE) {
! for (i = 0; i < MAX_EXPERT_MOUNTS; i++) {
! if (strcmp(expert_selected_parts[i],"") != 0 &&
! strcmp(expert_selected_parts[i],"none") != 0) {
! sprintf(cmdline,"umount %s",expert_selected_parts[i]);
! ExecuteCommand(cmdline);
! }
! }
! }
!
! // Don't know where is the best place for umounting miniroot
! sprintf(cmdline,"umount %s/miniroot",ROOT_MOUNTPOINT);
! ExecuteCommand(cmdline);
!
! debug("Unmounting target\n");
! sprintf(cmdline,"umount %s",ROOT_MOUNTPOINT);
! ExecuteCommand(cmdline);
}
***************
*** 1341,1345 ****
gint total_size_mb = 0;
! cmdline = g_strdup_printf("du -s /cdrom");
g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL);
output_array = g_strsplit(outbuffer,"\n",0);
--- 1404,1413 ----
gint total_size_mb = 0;
! // I think we should care about really size of copiedfiles and use
! // du -s /usr + du -s /lib and so on ... but for some stange reasons
! // /usr on CD is significally bigger - /usr/lib and /usr/X11R6 are duplicated
! // Btw, here should displayed somewhat like "Calculating free space..."
! // Because, on slower CPU's and CD's this may take more than 2 minutes
! cmdline = g_strdup_printf("du -s /usr");
g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL);
output_array = g_strsplit(outbuffer,"\n",0);
***************
*** 1350,1354 ****
gchar device[64];
gint num_finds = 0;
! num_finds = sscanf(output_array[i],"%63s /cdrom",size);
// if (num_finds == 0) {
/* fixme: check for multiple cdrom's... */
--- 1418,1422 ----
gchar device[64];
gint num_finds = 0;
! num_finds = sscanf(output_array[i],"%63s /usr",size);
// if (num_finds == 0) {
/* fixme: check for multiple cdrom's... */
***************
*** 1420,1424 ****
gdouble GetCurrentPercentage(gint cdrom_size, gint curr_rootpart_size) {
gdouble perc;
! gdouble unpacked_cdrom_size = cdrom_size * 2.8; // just guessing this one
perc = (gdouble)curr_rootpart_size / unpacked_cdrom_size;
--- 1488,1492 ----
gdouble GetCurrentPercentage(gint cdrom_size, gint curr_rootpart_size) {
gdouble perc;
! gdouble unpacked_cdrom_size = cdrom_size;
perc = (gdouble)curr_rootpart_size / unpacked_cdrom_size;
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/src/interface.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** interface.c 24 Sep 2003 23:23:03 -0000 1.10
--- interface.c 26 Oct 2003 22:56:18 -0000 1.11
***************
*** 247,251 ****
gtk_box_pack_start (GTK_BOX (hbox4), vbox3, TRUE, TRUE, 0);
! label4 = gtk_label_new (_("Please select your harddisk,\nthis will launch cfdisk, a partition tool for Linux. \nIt is console-based, but temporary.\n\nMake sure you have at least one Linux and one swap partition\n"));
gtk_widget_show (label4);
gtk_box_pack_start (GTK_BOX (vbox3), label4, FALSE, FALSE, 0);
--- 247,251 ----
gtk_box_pack_start (GTK_BOX (hbox4), vbox3, TRUE, TRUE, 0);
! label4 = gtk_label_new (_("Please select your harddisk,\nthis will launch a Linux partitioning tool.\n\nMake sure you have at least one Linux and one swap partition\n"));
gtk_widget_show (label4);
gtk_box_pack_start (GTK_BOX (vbox3), label4, FALSE, FALSE, 0);
|
|
From: <ale...@us...> - 2003-10-26 23:02:03
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1:/tmp/cvs-serv26116 Modified Files: AUTHORS Log Message: added Mantas's changes, see Changelog for details Index: AUTHORS =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AUTHORS 15 Sep 2003 20:08:53 -0000 1.2 --- AUTHORS 26 Oct 2003 22:56:18 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- Alex de Landgraaf <ale...@xs...> Sven Herzberg <he...@gn...> + Mantas Kriauèiûnas <ma...@ak...> |
|
From: <ale...@us...> - 2003-10-26 20:48:10
|
Update of /cvsroot/morphix/datetimeconf In directory sc8-pr-cvs1:/tmp/cvs-serv3350 Modified Files: datetimeconf.glade Log Message: fixed that timezone selected in list wasn't saved Index: datetimeconf.glade =================================================================== RCS file: /cvsroot/morphix/datetimeconf/datetimeconf.glade,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** datetimeconf.glade 26 Oct 2003 16:02:27 -0000 1.2 --- datetimeconf.glade 26 Oct 2003 20:48:00 -0000 1.3 *************** *** 654,657 **** --- 654,658 ---- <property name="reorderable">False</property> <property name="enable_search">True</property> + <signal name="row_activated" handler="on_treeview1_row_activated" last_modification_time="Sun, 26 Oct 2003 17:17:26 GMT"/> </widget> </child> |
1 message has been excluded from this view by a project administrator.
