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. r1721 - in trunk/src/target/OM-2007/openmoko-libs: .
libmokoui ([EMAIL PROTECTED])
2. r1722 - in trunk/oe/packages/initscripts: . initscripts-1.0
([EMAIL PROTECTED])
3. r1723 - in trunk/oe/packages/sysvinit: . sysvinit
sysvinit/fic-gta01 ([EMAIL PROTECTED])
4. r1724 - trunk/src/target/OM-2007/openmoko-libs/libmokoui
([EMAIL PROTECTED])
--- Begin Message ---
Author: rob
Date: 2007-04-10 19:14:57 +0200 (Tue, 10 Apr 2007)
New Revision: 1721
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.h
Log:
2007-04-10 Rob Bradford <[EMAIL PROTECTED]>
* libmokoui/moko-message-dialog.c:
(moko_message_dialog_set_message):
* libmokoui/moko-message-dialog.h:
Give the moko_dialog_set_message function a vsprintf varargs parameter
and use this when generating the message.
Patch from Chaowei Song <[EMAIL PROTECTED]>.
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-04-10 04:20:51 UTC
(rev 1720)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-04-10 17:14:57 UTC
(rev 1721)
@@ -1,3 +1,13 @@
+2007-04-10 Rob Bradford <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-message-dialog.c:
+ (moko_message_dialog_set_message):
+ * libmokoui/moko-message-dialog.h:
+ Give the moko_dialog_set_message function a vsprintf varargs parameter
+ and use this when generating the message.
+
+ Patch from Chaowei Song <[EMAIL PROTECTED]>.
+
2007-04-06 Dodji Seketeli
* openmoko-libs/libmokojournal/src/*: moved what
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
2007-04-10 04:20:51 UTC (rev 1720)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
2007-04-10 17:14:57 UTC (rev 1721)
@@ -201,13 +201,16 @@
}
void
-moko_message_dialog_set_message (MokoMessageDialog *dialog, const gchar
*new_message)
+moko_message_dialog_set_message (MokoMessageDialog *dialog, const gchar
*message_format, ...)
{
MokoMessageDialogPrivate* priv = MESSAGE_DIALOG_PRIVATE(dialog);
+ va_list args;
g_free (priv->message);
- priv->message = g_strdup (new_message);
+ va_start (args, message_format);
+ priv->message = g_strdup_vprintf (message_format, args);
+ va_end (args);
gtk_label_set (GTK_LABEL (priv->label), priv->message);
}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.h
2007-04-10 04:20:51 UTC (rev 1720)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.h
2007-04-10 17:14:57 UTC (rev 1721)
@@ -58,7 +58,9 @@
GType moko_message_dialog_get_type (void);
GtkWidget* moko_message_dialog_new (void);
-void moko_message_dialog_set_message (MokoMessageDialog *dialog, const gchar
*message);
+void moko_message_dialog_set_message (MokoMessageDialog *dialog,
+ const gchar *message_format,
+ ...)G_GNUC_PRINTF (2, 3);
void moko_message_dialog_set_image_from_stock (MokoMessageDialog *dialog,
const gchar *stock_id);
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-10 23:41:15 +0200 (Tue, 10 Apr 2007)
New Revision: 1722
Removed:
trunk/oe/packages/initscripts/initscripts-openprotium_1.0.bb
trunk/oe/packages/initscripts/initscripts-slugos_1.0.bb
Modified:
trunk/oe/packages/initscripts/initscripts-1.0/checkroot.sh
trunk/oe/packages/initscripts/initscripts_1.0.bb
Log:
oe/initscripts: add extra quotes fixing the checkroot.sh bug
Modified: trunk/oe/packages/initscripts/initscripts-1.0/checkroot.sh
===================================================================
--- trunk/oe/packages/initscripts/initscripts-1.0/checkroot.sh 2007-04-10
17:14:57 UTC (rev 1721)
+++ trunk/oe/packages/initscripts/initscripts-1.0/checkroot.sh 2007-04-10
21:41:15 UTC (rev 1722)
@@ -193,7 +193,7 @@
if ! grep -q "^$ROOTFSDEV\w" /proc/mounts; then
ROOTFSDEV="rootfs"
fi
-if [ $(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}') = rw ]; then
+if [ "$(grep "^$ROOTFSDEV\w" /proc/mounts | awk '{print $4}')" = rw ]; then
echo "Root filesystem already read-write, not remounting"
exit 0
fi
Deleted: trunk/oe/packages/initscripts/initscripts-openprotium_1.0.bb
===================================================================
--- trunk/oe/packages/initscripts/initscripts-openprotium_1.0.bb
2007-04-10 17:14:57 UTC (rev 1721)
+++ trunk/oe/packages/initscripts/initscripts-openprotium_1.0.bb
2007-04-10 21:41:15 UTC (rev 1722)
@@ -1,179 +0,0 @@
-#
-# OpenProtium stuff sorta specific for the storcenter.
-#
-# This is, in effect, an extended patch to fix various
-# problems in the initscripts on SlugOS. The problems
-# mostly come down to the order the scripts are executed
-# in.
-include initscripts_${PV}.bb
-
-RCONFLICTS = "initscripts"
-# All other standard definitions inherited from initscripts
-# Except the PR which is hacked here. The format used is
-# a suffix
-PR := "${PR}.11"
-
-FILESPATH = "[EMAIL PROTECTED]([ '${FILE_DIRNAME}/${P}',
'${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}'
], d)}"
-
-PACKAGES = "${PN}"
-
-SRC_URI += "file://openprotium/devfs.sh"
-SRC_URI += "file://openprotium/domainname.sh"
-SRC_URI += "file://openprotium/devices"
-SRC_URI += "file://openprotium/halt"
-SRC_URI += "file://openprotium/reboot"
-SRC_URI += "file://openprotium/flashclean"
-SRC_URI += "file://openprotium/checkroot.sh"
-
-# Without this it is not possible to patch checkroot.sh
-S = "${WORKDIR}"
-
-do_install_append() {
- # the image build command now installs this for slugos
- # except that mine doesn't. we don't need it, but we turnup
- # expects it to at least exist
- rm ${D}${sysconfdir}/device_table
- touch ${D}${sysconfdir}/device_table
-
- # openprotium specific scripts
- # install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/domainname.sh
${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/devfs.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/halt ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/reboot ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/devices ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/flashclean
${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openprotium/checkroot.sh
${D}${sysconfdir}/init.d
-
- # Remove the do install links (this detects a change to the
- # initscripts .bb file - it will cause a build failure here.)
- # This is a copy of the ln -sf lines from the initscripts
- # do_install.
- rm ${D}${sysconfdir}/rc2.d/S99rmnologin
- rm ${D}${sysconfdir}/rc3.d/S99rmnologin
- rm ${D}${sysconfdir}/rc4.d/S99rmnologin
- rm ${D}${sysconfdir}/rc5.d/S99rmnologin
- rm ${D}${sysconfdir}/rc6.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc6.d/S30urandom
- rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc6.d/S40umountfs
- rm ${D}${sysconfdir}/rcS.d/S30ramdisk
- rm ${D}${sysconfdir}/rc6.d/S90reboot
- rm ${D}${sysconfdir}/rc0.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc0.d/S30urandom
- rm ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc0.d/S40umountfs
- rm ${D}${sysconfdir}/rc0.d/S90halt
- rm ${D}${sysconfdir}/rcS.d/S02banner
- rm ${D}${sysconfdir}/rcS.d/S10checkroot.sh
-# rm ${D}${sysconfdir}/rcS.d/S30checkfs.sh
- rm ${D}${sysconfdir}/rcS.d/S35mountall.sh
- rm ${D}${sysconfdir}/rcS.d/S39hostname.sh
- rm ${D}${sysconfdir}/rcS.d/S45mountnfs.sh
- rm ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
-# rm ${D}${sysconfdir}/rcS.d/S55urandom
- rm ${D}${sysconfdir}/rcS.d/S99finish
- rm ${D}${sysconfdir}/rcS.d/S05devices
- # udev will run at S04 if installed
- rm ${D}${sysconfdir}/rcS.d/S03sysfs
- rm ${D}${sysconfdir}/rcS.d/S38devpts.sh
- rm -f ${D}${sysconfdir}/rcS.d/S06alignment
- rm ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
- rm ${D}${sysconfdir}/rc0.d/S25save-rtc.sh
- rm ${D}${sysconfdir}/rc6.d/S25save-rtc.sh
-
-
-
- # Check the result
- find ${D}${sysconfdir}/rc?.d ! -type d -print | {
- status=0
- while read d
- do
- oenote "initscripts-openprotium: unexpected link $d"
- status=1
- done
- test $status -eq 0 ||
- oefatal "initscripts-openprotium: new links break
do_install"
- }
-
- # Set the run-level links
- #
- # Startup (S) links - UNCHANGED
- #
- # Keep these in order of startup - S, then 1, 2-5, 0,6
- # according to the level in which the script starts (or stops) first.
- update-rc.d -r ${D} banner start 2 S .
- update-rc.d -r ${D} sysfs.sh start 3 S .
- # udev runs at S 04 .
- update-rc.d -r ${D} devices start 5 S .
- # update-rc.d -r ${D} alignment.sh start 7 S .
- # busybox hwclock.sh (slugos-init) starts here (08)
- # slugos-init umountinitrd runs here (09)
-
- update-rc.d -r ${D} checkroot.sh start 10 S .
- # slugos buffer syslog starts here (11)
- # sysconfsetup runs at S 12
- # modutils.sh runs at S 20
- # checkfs.sh is currently disabled from S 30 (and won't work on SlugOS)
- # ramdisk is not used on SlugOS, would run at S 30
- update-rc.d -r ${D} mountall.sh start 35 S .
- # base-files populate-volatile.sh runs at S37
- update-rc.d -r ${D} devpts.sh start 38 S .
- # slugos file syslog starts here (39)
- update-rc.d -r ${D} populate-volatile.sh start 37 S .
-
- # set hostname and domainname before the network script works (by
- # entering them at level 40), networking may reset them.
- update-rc.d -r ${D} domainname.sh start 40 S .
- update-rc.d -r ${D} hostname.sh start 40 S .
- # network runs at S 40
- # slugos network syslog starts here (44)
- update-rc.d -r ${D} mountnfs.sh start 45 S .
-
- update-rc.d -r ${D} bootmisc.sh start 55 S .
- # urandom is currently disabled from S 55 (and won't work with tmpfs
/var)
-
- # ipkg-cl configure runs at S 98
- update-rc.d -r ${D} finish start 99 S .
-
- #
- # User (2-5) links - UNCHANGED
- # rmnologin is the only thing added to user levels
- update-rc.d -r ${D} rmnologin start 99 2 3 4 5 .
- update-rc.d -r ${D} flashclean start 99 5 .
-
- #
- # Shutdown (0,6) links - !!!CHANGED!!!
- #
- # The problem here is that netbase installs K40networking but portmap
- # installs S32portmap. One of these has to change! The safe change
- # is to make the networking stop at S40, so all network related shutdown
- # must be in a K script or <S40.
- #
- # S20sendsigs is a disaster. It needs to happen before the umounts
- # but after the portmapper (which it would otherwise kill).
- #
- # urandom would stop at (S)30
-
- # This is the special, correct, slugos umountnfs.sh (it looks in
- # the /proc/mounts information, not /etc/fstab)
- update-rc.d -r ${D} umountnfs.sh start 31 0 6 .
- update-rc.d -r ${D} save-rtc.sh start 25 0 6 .
- # portmap stops at 32
- # slugos network syslog stops here (39)
- # networking stops at 40 (nothing else does, believe me.)
-
- # busybox hwclock.sh (slugos-init) stops here (45)
- # slugos file syslog stops here (47)
- # slugos buffer syslog stops here (49)
- # udev stops here (55)
- # Remove any errant processes
- update-rc.d -r ${D} sendsigs start 60 0 6 .
-
- # This is the special, correct, slugos umountfs, it will umount
- # any network file systems which failed to umount before.
- update-rc.d -r ${D} umountfs start 70 0 6 .
-
- update-rc.d -r ${D} halt start 90 0 .
- update-rc.d -r ${D} reboot start 90 6 .
-}
Deleted: trunk/oe/packages/initscripts/initscripts-slugos_1.0.bb
===================================================================
--- trunk/oe/packages/initscripts/initscripts-slugos_1.0.bb 2007-04-10
17:14:57 UTC (rev 1721)
+++ trunk/oe/packages/initscripts/initscripts-slugos_1.0.bb 2007-04-10
21:41:15 UTC (rev 1722)
@@ -1,164 +0,0 @@
-# SlugOS specific stuff for the init scripts.
-#
-# This is, in effect, an extended patch to fix various
-# problems in the initscripts on SlugOS. The problems
-# mostly come down to the order the scripts are executed
-# in.
-include initscripts_${PV}.bb
-
-RCONFLICTS = "initscripts"
-# All other standard definitions inherited from initscripts
-# Except the PR which is hacked here. The format used is
-# a suffix
-PR := "${PR}.11"
-
-FILESPATH = "[EMAIL PROTECTED]([ '${FILE_DIRNAME}/${P}',
'${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}'
], d)}"
-
-PACKAGES = "${PN}"
-
-SRC_URI += "file://alignment.sh"
-SRC_URI += "file://domainname.sh"
-SRC_URI += "file://devices.patch;patch=1"
-
-# Without this it is not possible to patch checkroot.sh
-S = "${WORKDIR}"
-
-do_install_append() {
- # the image build command now installs this for slugos
- rm ${D}${sysconfdir}/device_table
-
- # slugos specific scripts
- install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/domainname.sh ${D}${sysconfdir}/init.d
-
- # Remove the do install links (this detects a change to the
- # initscripts .bb file - it will cause a build failure here.)
- # This is a copy of the ln -sf lines from the initscripts
- # do_install.
- rm ${D}${sysconfdir}/rc2.d/S99rmnologin
- rm ${D}${sysconfdir}/rc3.d/S99rmnologin
- rm ${D}${sysconfdir}/rc4.d/S99rmnologin
- rm ${D}${sysconfdir}/rc5.d/S99rmnologin
- rm ${D}${sysconfdir}/rc6.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc6.d/S30urandom
- rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc6.d/S40umountfs
- rm ${D}${sysconfdir}/rcS.d/S30ramdisk
- rm ${D}${sysconfdir}/rc6.d/S90reboot
- rm ${D}${sysconfdir}/rc0.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc0.d/S30urandom
- rm ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc0.d/S40umountfs
- rm ${D}${sysconfdir}/rc0.d/S90halt
- rm ${D}${sysconfdir}/rcS.d/S02banner
- rm ${D}${sysconfdir}/rcS.d/S10checkroot.sh
-# rm ${D}${sysconfdir}/rcS.d/S30checkfs.sh
- rm ${D}${sysconfdir}/rcS.d/S35mountall.sh
- rm ${D}${sysconfdir}/rcS.d/S39hostname.sh
- rm ${D}${sysconfdir}/rcS.d/S45mountnfs.sh
- rm ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
-# rm ${D}${sysconfdir}/rcS.d/S55urandom
- rm ${D}${sysconfdir}/rcS.d/S99finish
- rm ${D}${sysconfdir}/rcS.d/S05devices
- # udev will run at S04 if installed
- rm ${D}${sysconfdir}/rcS.d/S03sysfs
- rm ${D}${sysconfdir}/rcS.d/S38devpts.sh
- rm -f ${D}${sysconfdir}/rcS.d/S06alignment
- rm ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
- rm ${D}${sysconfdir}/rc0.d/S25save-rtc.sh
- rm ${D}${sysconfdir}/rc6.d/S25save-rtc.sh
-
-
-
- # Check the result
- find ${D}${sysconfdir}/rc?.d ! -type d -print | {
- status=0
- while read d
- do
- oenote "initscripts-slugos: unexpected link $d"
- status=1
- done
- test $status -eq 0 ||
- oefatal "initscripts-slugos: new links break do_install"
- }
-
- # Set the run-level links
- #
- # Startup (S) links - UNCHANGED
- #
- # Keep these in order of startup - S, then 1, 2-5, 0,6
- # according to the level in which the script starts (or stops) first.
- update-rc.d -r ${D} banner start 2 S .
- update-rc.d -r ${D} sysfs.sh start 3 S .
- # udev runs at S 04 .
- update-rc.d -r ${D} devices start 5 S .
- update-rc.d -r ${D} alignment.sh start 7 S .
- # busybox hwclock.sh (slugos-init) starts here (08)
- # slugos-init umountinitrd runs here (09)
-
- update-rc.d -r ${D} checkroot.sh start 10 S .
- # slugos buffer syslog starts here (11)
- # sysconfsetup runs at S 12
- # modutils.sh runs at S 20
- # checkfs.sh is currently disabled from S 30 (and won't work on SlugOS)
- # ramdisk is not used on SlugOS, would run at S 30
- update-rc.d -r ${D} mountall.sh start 35 S .
- # base-files populate-volatile.sh runs at S37
- update-rc.d -r ${D} devpts.sh start 38 S .
- # slugos file syslog starts here (39)
- update-rc.d -r ${D} populate-volatile.sh start 37 S .
-
- # set hostname and domainname before the network script works (by
- # entering them at level 40), networking may reset them.
- update-rc.d -r ${D} domainname.sh start 40 S .
- update-rc.d -r ${D} hostname.sh start 40 S .
- # network runs at S 40
- # slugos network syslog starts here (44)
- update-rc.d -r ${D} mountnfs.sh start 45 S .
-
- update-rc.d -r ${D} bootmisc.sh start 55 S .
- # urandom is currently disabled from S 55 (and won't work with tmpfs
/var)
-
- # ipkg-cl configure runs at S 98
- update-rc.d -r ${D} finish start 99 S .
-
- #
- # User (2-5) links - UNCHANGED
- # rmnologin is the only thing added to user levels
- update-rc.d -r ${D} rmnologin start 99 2 3 4 5 .
-
- #
- # Shutdown (0,6) links - !!!CHANGED!!!
- #
- # The problem here is that netbase installs K40networking but portmap
- # installs S32portmap. One of these has to change! The safe change
- # is to make the networking stop at S40, so all network related shutdown
- # must be in a K script or <S40.
- #
- # S20sendsigs is a disaster. It needs to happen before the umounts
- # but after the portmapper (which it would otherwise kill).
- #
- # urandom would stop at (S)30
-
- # This is the special, correct, slugos umountnfs.sh (it looks in
- # the /proc/mounts information, not /etc/fstab)
- update-rc.d -r ${D} umountnfs.sh start 31 0 6 .
- update-rc.d -r ${D} save-rtc.sh start 25 0 6 .
- # portmap stops at 32
- # slugos network syslog stops here (39)
- # networking stops at 40 (nothing else does, believe me.)
-
- # busybox hwclock.sh (slugos-init) stops here (45)
- # slugos file syslog stops here (47)
- # slugos buffer syslog stops here (49)
- # udev stops here (55)
- # Remove any errant processes
- update-rc.d -r ${D} sendsigs start 60 0 6 .
-
- # This is the special, correct, slugos umountfs, it will umount
- # any network file systems which failed to umount before.
- update-rc.d -r ${D} umountfs start 70 0 6 .
-
- update-rc.d -r ${D} halt start 90 0 .
- update-rc.d -r ${D} reboot start 90 6 .
-}
Modified: trunk/oe/packages/initscripts/initscripts_1.0.bb
===================================================================
--- trunk/oe/packages/initscripts/initscripts_1.0.bb 2007-04-10 17:14:57 UTC
(rev 1721)
+++ trunk/oe/packages/initscripts/initscripts_1.0.bb 2007-04-10 21:41:15 UTC
(rev 1722)
@@ -5,7 +5,7 @@
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r89"
+PR = "r90"
SRC_URI = "file://halt \
file://ramdisk \
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-10 23:42:58 +0200 (Tue, 10 Apr 2007)
New Revision: 1723
Removed:
trunk/oe/packages/sysvinit/sysvinit/htcuniversal/
trunk/oe/packages/sysvinit/sysvinit/mnci/
trunk/oe/packages/sysvinit/sysvinit/openmn/
trunk/oe/packages/sysvinit/sysvinit/rt3000/
trunk/oe/packages/sysvinit/sysvinit/slugos/
Modified:
trunk/oe/packages/sysvinit/sysvinit/fic-gta01/inittab
trunk/oe/packages/sysvinit/sysvinit_2.86.bb
Log:
oe/sysvinit: fix double tty1 bug in inittab. close #430
Modified: trunk/oe/packages/sysvinit/sysvinit/fic-gta01/inittab
===================================================================
--- trunk/oe/packages/sysvinit/sysvinit/fic-gta01/inittab 2007-04-10
21:41:15 UTC (rev 1722)
+++ trunk/oe/packages/sysvinit/sysvinit/fic-gta01/inittab 2007-04-10
21:42:58 UTC (rev 1723)
@@ -42,5 +42,4 @@
# <id>:<runlevels>:<action>:<process>
S:2:respawn:/sbin/getty 115200 ttySAC0
-1:2345:respawn:/sbin/getty 38400 tty1
Modified: trunk/oe/packages/sysvinit/sysvinit_2.86.bb
===================================================================
--- trunk/oe/packages/sysvinit/sysvinit_2.86.bb 2007-04-10 21:41:15 UTC (rev
1722)
+++ trunk/oe/packages/sysvinit/sysvinit_2.86.bb 2007-04-10 21:42:58 UTC (rev
1723)
@@ -2,7 +2,7 @@
SECTION = "base"
LICENSE = "GPL"
HOMEPAGE = "http://freshmeat.net/projects/sysvinit/";
-PR = "r33"
+PR = "r34"
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-11 01:37:04 +0200 (Wed, 11 Apr 2007)
New Revision: 1724
Removed:
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
Log:
libmokoui: remove outdated code (moko-search-bar)
GtkTreeView: add fixed mode to improve performance
GtkTreeView: try to set the adjustment to scroll the full height of entries...
doesn't work though :(
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
2007-04-10 21:42:58 UTC (rev 1723)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
2007-04-10 23:37:04 UTC (rev 1724)
@@ -16,7 +16,6 @@
moko-panel-applet.h \
moko-pixmap-button.h \
moko-paned-window.h \
- moko-search-bar.h \
moko-tool-box.h \
moko-tree-view.h \
moko-window.h
@@ -35,7 +34,6 @@
moko-panel-applet.c \
moko-pixmap-button.c \
moko-paned-window.c \
- moko-search-bar.c \
moko-tree-view.c \
moko-tool-box.c \
moko-window.c
Deleted: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c
2007-04-10 21:42:58 UTC (rev 1723)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c
2007-04-10 23:37:04 UTC (rev 1724)
@@ -1,66 +0,0 @@
-
-/* moko_search_bar.c
- *
- * Authored by Michael 'Mickey' Lauer <[EMAIL PROTECTED]>
- *
- * Copyright (C) 2006-2007 OpenMoko Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser Public License as published by
- * the Free Software Foundation; version 2 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser Public License for more details.
- *
- * Current Version: $Rev$ ($Date) [$Author: mickey $]
- */
-
-#include "moko-search-bar.h"
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkentry.h>
-
-G_DEFINE_TYPE (MokoSearchBar, moko_search_bar, GTK_TYPE_TOOLBAR)
-
-#define MOKO_SEARCH_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
MOKO_TYPE_SEARCH_BAR, MokoSearchBarPrivate))
-
-typedef struct _MokoSearchBarPrivate MokoSearchBarPrivate;
-
-struct _MokoSearchBarPrivate
-{
- GtkWidget* alignment; /* GtkAlignment */
- GtkWindow* entry; /* GtkEntry */
-};
-
-static void
-moko_search_bar_class_init (MokoSearchBarClass *klass);
-static void
-moko_search_bar_init (MokoSearchBar *self);
-
-static void
-moko_search_bar_class_init (MokoSearchBarClass *klass)
-{
- /* GObjectClass *object_class = G_OBJECT_CLASS (klass); */
-
- g_type_class_add_private (klass, sizeof (MokoSearchBarPrivate));
-}
-
-static void
-moko_search_bar_init (MokoSearchBar *self)
-{
- GtkToolItem* item = gtk_tool_item_new();
- gtk_widget_set_size_request( GTK_WIDGET(item), 320, 10 ); //FIXME get from
style
- GtkWidget* entry = gtk_entry_new();
- gtk_widget_set_name( entry, "moko_search_entry" );
- gtk_entry_set_has_frame( GTK_ENTRY (entry), FALSE );
- gtk_entry_set_text( GTK_ENTRY(entry), "foo" );
- gtk_container_add( GTK_CONTAINER(item), entry );
- gtk_toolbar_insert( GTK_TOOLBAR (self), GTK_TOOL_ITEM(item), 0 );
-}
-
-GtkWidget*
-moko_search_bar_new (void)
-{
- return GTK_WIDGET(g_object_new(moko_search_bar_get_type(), NULL));
-}
Deleted: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h
2007-04-10 21:42:58 UTC (rev 1723)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h
2007-04-10 23:37:04 UTC (rev 1724)
@@ -1,50 +0,0 @@
-
-/* moko_search_bar.h
- *
- * Authored by Michael 'Mickey' Lauer <[EMAIL PROTECTED]>
- *
- * Copyright (C) 2006-2007 OpenMoko Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser Public License as published by
- * the Free Software Foundation; version 2 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser Public License for more details.
- *
- * Current Version: $Rev$ ($Date) [$Author: mickey $]
- */
-
-#ifndef _MOKO_SEARCH_BAR_H_
-#define _MOKO_SEARCH_BAR_H_
-
-#include <glib-object.h>
-#include <gtk/gtktoolbar.h>
-
-G_BEGIN_DECLS
-
-#define MOKO_TYPE_SEARCH_BAR (moko_search_bar_get_type())
-#define MOKO_SEARCH_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
MOKO_TYPE_SEARCH_BAR, MokoSearchBar))
-#define MOKO_SEARCH_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
MOKO_TYPE_SEARCH_BAR, MokoSearchBarClass))
-#define MOKO_IS_SEARCH_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
MOKO_TYPE_SEARCH_BAR))
-#define MOKO_IS_SEARCH_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
MOKO_TYPE_SEARCH_BAR))
-#define MOKO_SEARCH_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
MOKO_TYPE_SEARCH_BAR, MokoSearchBarClass))
-
-typedef struct {
- GtkToolbar parent;
-} MokoSearchBar;
-
-typedef struct {
- GtkToolbarClass parent_class;
-} MokoSearchBarClass;
-
-GType moko_search_bar_get_type (void);
-
-GtkWidget* moko_search_bar_new (void);
-
-G_END_DECLS
-
-#endif // _MOKO_SEARCH_BAR_H_
-
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
2007-04-10 21:42:58 UTC (rev 1723)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
2007-04-10 23:37:04 UTC (rev 1724)
@@ -83,6 +83,9 @@
{
gtk_tree_view_column_set_alignment( column, 0.5 );
gtk_tree_view_column_set_spacing( column, 4 );
+ gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
+ //FIXME grab from state information
+ gtk_tree_view_column_set_fixed_width( column, 100 );
gtk_tree_view_append_column( GTK_TREE_VIEW(self), column );
g_object_set( G_OBJECT(column),
@@ -90,14 +93,33 @@
"reorderable", TRUE,
"sort-indicator", TRUE,
NULL );
+
}
GtkWidget* moko_tree_view_put_into_scrolled_window(MokoTreeView* self)
{
+ // compute value for vadjustment
+ gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(self), TRUE );
+ GtkTreeViewColumn* first_column = gtk_tree_view_get_column(
GTK_TREE_VIEW(self), 0 );
+ g_assert( first_column ); // fail here if no columns added yet
+ gint cr_x_offset;
+ gint cr_y_offset;
+ gint cr_width;
+ gint cr_height;
+ gtk_tree_view_column_cell_get_size( first_column, NULL, &cr_x_offset,
&cr_y_offset, &cr_width, &cr_height );
+
GtkWidget* scrolledwindow = gtk_scrolled_window_new( NULL, NULL );
//FIXME get from style or (even better) set as initial size hint in
MokoPanedWindow (also via style sheet of course)
gtk_widget_set_size_request( scrolledwindow, 0, 170 );
- gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW (scrolledwindow),
GTK_POLICY_NEVER, GTK_POLICY_ALWAYS );
- gtk_container_add( GTK_CONTAINER (scrolledwindow), GTK_WIDGET (self) );
+ gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(scrolledwindow),
GTK_POLICY_NEVER, GTK_POLICY_ALWAYS );
+ gtk_container_add( GTK_CONTAINER(scrolledwindow), GTK_WIDGET(self) );
+
+ //FIXME this doesn't work :/ the idea is to set the step and page
increment, so that we never scroll
+ //to anything else but a fully visible entry (as opposed to half way
visible)
+ GtkAdjustment* vadjustment = gtk_tree_view_get_vadjustment(
GTK_TREE_VIEW(self) );
+ g_debug( "vadjustment page increment = %d", vadjustment->page_increment );
+ vadjustment->step_increment = 1;
+ vadjustment->page_increment = 1;
+ vadjustment->page_size = 1;
return scrolledwindow;
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
