Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4020 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
2. r4021 - trunk/src/target/opkg ([EMAIL PROTECTED])
3. r4022 - trunk/src/target/opkg ([EMAIL PROTECTED])
4. r4023 - in
trunk/src/target/OM-2007.2/applications/openmoko-terminal2: data
src ([EMAIL PROTECTED])
5. r4024 -
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-02-06 12:10:34 +0100 (Wed, 06 Feb 2008)
New Revision: 4020
Modified:
branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
Log:
ar6k: 2.0.0.89 firmware support
The 2.0.0.40 firmware crashes when getting certain RX data patterns,
which can easily be reproduced when running an SSH transfer over WPA.
The 2.0.0.89 firmware fixes that and doesn't seem to introduce
regressions. This patch is neede to support this firmware.
Signed-off-by: Samuel Ortiz <[EMAIL PROTECTED]>
atheros_2_0_function.patch
- drivers/sdio/function/wlan/ar6000/include/wmi.h,
drivers/sdio/function/wlan/ar6000/wmi/wmi.c: add support for the 20.0.0.89
firmware.
Modified: branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
2008-02-05 12:16:55 UTC (rev 4019)
+++ branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
2008-02-06 11:10:34 UTC (rev 4020)
@@ -20840,7 +20840,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.24/drivers/sdio/function/wlan/ar6000/include/wmi.h
-@@ -0,0 +1,1739 @@
+@@ -0,0 +1,1743 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
+ * All rights reserved.
@@ -21088,8 +21088,11 @@
+ CONNECT_IGNORE_WPAx_GROUP_CIPHER = 0x0004,
+ CONNECT_PROFILE_MATCH_DONE = 0x0008,
+ CONNECT_IGNORE_AAC_BEACON = 0x0010,
++ CONNECT_CSA_FOLLOW_BSS = 0x0020,
+} WMI_CONNECT_CTRL_FLAGS_BITS;
+
++#define DEFAULT_CONNECT_CTRL_FLAGS (CONNECT_CSA_FOLLOW_BSS)
++
+typedef PREPACK struct {
+ A_UINT8 networkType;
+ A_UINT8 dot11AuthMode;
@@ -21362,8 +21365,8 @@
+typedef PREPACK struct {
+ A_UINT16 psPollTimeout; /* msec */
+ A_UINT16 triggerTimeout; /* msec */
-+ APSD_TIM_POLICY apsdTimPolicy; /* TIM behavior with ques APSD
enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */
-+ APSD_TIM_POLICY simulatedAPSDTimPolicy; /* TIM behavior with
simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */
++ A_UINT32 apsdTimPolicy; /* TIM behavior with ques APSD enabled.
Default is IGNORE_TIM_ALL_QUEUES_APSD */
++ A_UINT32 simulatedAPSDTimPolicy; /* TIM behavior with simulated
APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */
+} POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD;
+
+/*
@@ -21893,7 +21896,7 @@
+ A_UINT8 bssid[ATH_MAC_LEN];
+ A_UINT16 listenInterval;
+ A_UINT16 beaconInterval;
-+ NETWORK_TYPE networkType;
++ A_UINT32 networkType;
+ A_UINT8 beaconIeLen;
+ A_UINT8 assocReqLen;
+ A_UINT8 assocRespLen;
@@ -21913,6 +21916,7 @@
+ NO_RESOURCES_AVAIL = 0x07,
+ CSERV_DISCONNECT = 0x08,
+ INVALID_PROFILE = 0x0a,
++ DOT11H_CHANNEL_SWITCH = 0x0b,
+} WMI_DISCONNECT_REASON;
+
+typedef PREPACK struct {
@@ -24554,7 +24558,7 @@
+ * This module implements the hardware independent layer of the
+ * Wireless Module Interface (WMI) protocol.
+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/wmi/wmi.c#2 $
++ * $Id: //depot/sw/releases/olca2.0-GPL/host/wmi/wmi.c#3 $
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
@@ -26109,7 +26113,7 @@
+ need to do a SYNC before.*/
+ status = (wmi_cmd_send(wmip, osbuf, WMI_DISCONNECT_CMDID,
+ NO_SYNC_WMIFLAG));
-+ wmi_qos_state_init(wmip);
++
+ return status;
+}
+
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-02-06 14:24:59 +0100 (Wed, 06 Feb 2008)
New Revision: 4021
Modified:
trunk/src/target/opkg/opkg_download.c
trunk/src/target/opkg/opkg_state.h
Log:
opkg: fix gpg enabled builds and fix one compiler warning
Modified: trunk/src/target/opkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/opkg_download.c 2008-02-06 11:10:34 UTC (rev
4020)
+++ trunk/src/target/opkg/opkg_download.c 2008-02-06 13:24:59 UTC (rev
4021)
@@ -16,7 +16,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
*/
-
+#include "config.h"
#include <curl/curl.h>
#ifdef HAVE_GPGME
#include <gpgme.h>
Modified: trunk/src/target/opkg/opkg_state.h
===================================================================
--- trunk/src/target/opkg/opkg_state.h 2008-02-06 11:10:34 UTC (rev 4020)
+++ trunk/src/target/opkg/opkg_state.h 2008-02-06 13:24:59 UTC (rev 4021)
@@ -29,4 +29,8 @@
OPKG_STATE_VERIFYING_REPOSITORY_SIGNATURE
} opkg_state_t;
+
+void opkg_set_current_state (opkg_state_t state, const char *data);
+
+
#endif /* OPKG_STATE_H */
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-02-06 15:24:37 +0100 (Wed, 06 Feb 2008)
New Revision: 4022
Modified:
trunk/src/target/opkg/Makefile.am
Log:
opkg: include opkg_state.h in libopkg_include_HEADERS
Modified: trunk/src/target/opkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/Makefile.am 2008-02-06 13:24:59 UTC (rev 4021)
+++ trunk/src/target/opkg/Makefile.am 2008-02-06 14:24:37 UTC (rev 4022)
@@ -35,6 +35,7 @@
opkg_conf.h \
opkg.h \
opkg_message.h \
+ opkg_state.h \
nv_pair.h \
nv_pair_list.h \
pkg_depends.h \
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2008-02-06 16:20:48 +0100 (Wed, 06 Feb 2008)
New Revision: 4023
Removed:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/data/Makefile.in
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mainwindow.vala
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mokoterminal.vala
Log:
openmoko-terminal2:
* close tab when shell exits
* close application when last shell exits
* remove bogus generated file
* closes #1191
Deleted:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/data/Makefile.in
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-terminal2/data/Makefile.in
2008-02-06 14:24:37 UTC (rev 4022)
+++ trunk/src/target/OM-2007.2/applications/openmoko-terminal2/data/Makefile.in
2008-02-06 15:20:48 UTC (rev 4023)
@@ -1,434 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
[EMAIL PROTECTED]@
-
-#
-# misc. data files
-#
-# None yet
-# dist_pkgdata_DATA =
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = data
-DIST_COMMON = $(dist_appicon_DATA) $(dist_desktop_DATA) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(appicondir)" "$(DESTDIR)$(desktopdir)"
-dist_appiconDATA_INSTALL = $(INSTALL_DATA)
-dist_desktopDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_appicon_DATA) $(dist_desktop_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-OBJEXT = @OBJEXT@
-OPENMOKO_TERMINAL2_CFLAGS = @OPENMOKO_TERMINAL2_CFLAGS@
-OPENMOKO_TERMINAL2_LIBS = @OPENMOKO_TERMINAL2_LIBS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-#
-# desktop integration: .desktop file
-#
-desktopdir = $(datadir)/applications
-dist_desktop_DATA = openmoko-terminal.desktop
-
-#
-# desktop integration: application icon
-#
-appicondir = $(datadir)/pixmaps
-dist_appicon_DATA = openmoko-terminal.png
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-dist_appiconDATA: $(dist_appicon_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(appicondir)" || $(MKDIR_P) "$(DESTDIR)$(appicondir)"
- @list='$(dist_appicon_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_appiconDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(appicondir)/$$f'"; \
- $(dist_appiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appicondir)/$$f"; \
- done
-
-uninstall-dist_appiconDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_appicon_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(appicondir)/$$f'"; \
- rm -f "$(DESTDIR)$(appicondir)/$$f"; \
- done
-install-dist_desktopDATA: $(dist_desktop_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
- @list='$(dist_desktop_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_desktopDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(desktopdir)/$$f'"; \
- $(dist_desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
- done
-
-uninstall-dist_desktopDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_desktop_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
- rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
- done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(appicondir)" "$(DESTDIR)$(desktopdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_appiconDATA install-dist_desktopDATA
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_appiconDATA uninstall-dist_desktopDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dist_appiconDATA \
- install-dist_desktopDATA install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_appiconDATA uninstall-dist_desktopDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mainwindow.vala
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mainwindow.vala
2008-02-06 14:24:37 UTC (rev 4022)
+++
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mainwindow.vala
2008-02-06 15:20:48 UTC (rev 4023)
@@ -115,6 +115,13 @@
OpenMokoTerminal2.MokoTerminal terminal = notebook.get_nth_page(
(int)num ); btn_zoom_in.set_sensitive( terminal.get_font_size() < 10 );
btn_zoom_out.set_sensitive( terminal.get_font_size() > 1 );
};
+ notebook.page_removed += (o, page, num) => {
+ stdout.printf( "on_page_removed\n");
+ if ( notebook.get_n_pages() == 0 )
+ Gtk.main_quit();
+ else
+ update_toolbar();
+ };
return false;
}
@@ -133,7 +140,7 @@
stdout.printf( "on_delete_clicked\n" );
var page = notebook.get_nth_page( notebook.get_current_page() );
page.destroy();
- update_toolbar();
+ // update_toolbar will be called through the page-removed signal
handler
}
private void on_zoom_in_clicked( Gtk.ToolButton b )
@@ -163,6 +170,11 @@
public void update_toolbar()
{
stdout.printf( "update_toolbar\n" );
+ if ( null == notebook )
+ {
+ stdout.printf( "notebook no longer present\n" );
+ return;
+ }
btn_delete.set_sensitive( notebook.get_n_pages() > 1 );
OpenMokoTerminal2.MokoTerminal terminal = notebook.get_nth_page(
notebook.get_current_page() );
stdout.printf( "current font size for terminal is %d\n",
terminal.get_font_size() );
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mokoterminal.vala
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mokoterminal.vala
2008-02-06 14:24:37 UTC (rev 4022)
+++
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mokoterminal.vala
2008-02-06 15:20:48 UTC (rev 4023)
@@ -40,8 +40,9 @@
fontsize = 5;
terminal = new Vte.Terminal();
- terminal.child_exited += term => { stdout.printf( "unhandled eof\n" );
};
- terminal.eof += term => { stdout.printf( "unhandled eof\n" ); };
+ // auto-exit may become a preference at some point?
+ terminal.child_exited += term => { destroy(); };
+ terminal.eof += term => { destroy(); };
terminal.window_title_changed += term => { Gtk.Window toplevel =
get_toplevel(); toplevel.set_title( term.window_title ); };
pack_start( terminal, true, true, 0 );
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2008-02-06 17:08:19 +0100 (Wed, 06 Feb 2008)
New Revision: 4024
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mainwindow.vala
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mokoterminal.vala
Log:
openmoko-terminal2: add command line support for -e <initial command>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mainwindow.vala
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mainwindow.vala
2008-02-06 15:20:48 UTC (rev 4023)
+++
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mainwindow.vala
2008-02-06 16:08:19 UTC (rev 4024)
@@ -36,6 +36,8 @@
private ToolButton btn_zoom_out;
private ToolButton btn_paste;
+ private string initial_command;
+
public MainWindow()
{
title = "Terminal";
@@ -50,9 +52,15 @@
setup_notebook();
update_toolbar();
idle_add( on_idle, this );
+ idle_add( on_idle_first_command, this );
//window.add_filter( on_gdk_filter, this );
}
+ public void setup_command( string command )
+ {
+ initial_command = command + "\n";
+ }
+
public void setup_toolbar()
{
toolbar = new Gtk.Toolbar();
@@ -125,6 +133,15 @@
return false;
}
+ private bool on_idle_first_command()
+ {
+ stdout.printf( "on_idle_first_command\n" );
+ OpenMokoTerminal2.MokoTerminal terminal = notebook.get_nth_page( 0 );
+ if ( initial_command != null )
+ terminal.paste_command( initial_command );
+ return false;
+ }
+
private void on_new_clicked( Gtk.ToolButton b )
{
stdout.printf( "on_new_clicked\n" );
@@ -189,10 +206,18 @@
}
static int main (string[] args) {
+ if ( args.length == 2 || args.length > 3 )
+ {
+ stdout.printf( "Usage: %s [ -e <initial command> ]\n", args[0] );
+ return 0;
+ }
+
Gtk.init(ref args);
-
var window = new MainWindow();
+ if ( args.length == 3 && args[1] == "-e" )
+ window.setup_command( args[2] );
window.run();
+
return 0;
}
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mokoterminal.vala
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mokoterminal.vala
2008-02-06 15:20:48 UTC (rev 4023)
+++
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/mokoterminal.vala
2008-02-06 16:08:19 UTC (rev 4024)
@@ -100,5 +100,10 @@
{
terminal.paste_primary();
}
+
+ public void paste_command( string command )
+ {
+ terminal.feed_child( command, command.size() );
+ }
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
