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. r2226 - in
trunk/src/target/OM-2007/applications/openmoko-today: . src
([EMAIL PROTECTED])
2. r2227 - in
trunk/src/target/OM-2007/applications/openmoko-dialer: . data src
([EMAIL PROTECTED])
3. r2228 - in trunk/src/target/OM-2007/openmoko-libs: .
libmokoui ([EMAIL PROTECTED])
4. r2229 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
5. r2230 - in
trunk/src/target/OM-2007/artwork/icons/openmoko-standard:
32x32/stock 36x36/stock ([EMAIL PROTECTED])
6. r2231 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
7. r2232 - in trunk/src/target/OM-2007/artwork/icons: .
openmoko-standard/36x36/stock ([EMAIL PROTECTED])
--- Begin Message ---
Author: alphaone
Date: 2007-06-12 17:37:24 +0200 (Tue, 12 Jun 2007)
New Revision: 2226
Modified:
trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
Log:
* src/today-events-area.c: (init_left_hand_side): Check if icon is
NULL befor unref'ing (prevents segfaulting on older gtk versions)
Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-06-12 15:03:17 UTC (rev 2225)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-06-12 15:37:24 UTC (rev 2226)
@@ -1,3 +1,8 @@
+2007-06-12 Daniel Willmann <[EMAIL PROTECTED]>
+
+ * src/today-events-area.c: (init_left_hand_side): Check if icon is
+ NULL befor unref'ing (prevents segfaulting on older gtk versions)
+
2007-06-06 Thomas Wood <[EMAIL PROTECTED]>
* src/today-events-area.c: (get_property), (init_left_hand_side): Add
icon to
Modified:
trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
2007-06-12 15:03:17 UTC (rev 2225)
+++
trunk/src/target/OM-2007/applications/openmoko-today/src/today-events-area.c
2007-06-12 15:37:24 UTC (rev 2226)
@@ -544,7 +544,8 @@
icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
"openmoko-sketchbook", 32, 0, NULL);
image = gtk_image_new_from_pixbuf (icon);
- g_object_unref (icon);
+ if (icon)
+ g_object_unref (icon);
vbox = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 6);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-06-12 17:40:05 +0200 (Tue, 12 Jun 2007)
New Revision: 2227
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.h
Log:
* openmoko-dialer: Apply patch from bug 532 (make distcheck and
autotools-related improvements)
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
2007-06-12 15:37:24 UTC (rev 2226)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
2007-06-12 15:40:05 UTC (rev 2227)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(openmoko-dialer, %(APPVERSION), %(APPCONTACT))
+AC_INIT(openmoko-dialer, 0.1, http://www.openmoko.org/)
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(src/dialer-main.c)
AM_CONFIG_HEADER(config.h)
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-06-12 15:37:24 UTC (rev 2226)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/data/Makefile.am
2007-06-12 15:40:05 UTC (rev 2227)
@@ -1,7 +1,7 @@
+# A shell check command that I find convenient:
+# ls -1 *.png | xargs --replace=pngimg sh -c '(grep -qw "pngimg" Makefile.am
|| echo "Missing pngimg")'
-resourcedir = $(pkgdatadir)
-
-EXTRA_DIST =unkown.png\
+dist_pkgdata_DATA =unkown.png\
dialed.png\
missed.png\
received.png\
@@ -10,38 +10,6 @@
phone.png\
delete.png\
dtmf.png\
- sms.png\
- all.png\
- history.png\
- delete_01.png\
- answer.png\
- cancel.png\
- hangup.png\
- redial.png\
- failure.png\
- incoming_0.png\
- incoming_1.png\
- incoming_2.png\
- incoming_3.png\
- outgoing_0.png\
- outgoing_1.png\
- outgoing_2.png\
- outgoing_3.png\
- talking_0.png\
- talking_1.png\
- talking_2.png\
- talking_3.png\
- exit.png
-
-resource_DATA =unkown.png\
- dialed.png\
- missed.png\
- received.png\
- speaker.png\
- email.png\
- phone.png\
- delete.png\
- dtmf.png\
talking.png\
sms.png\
all.png\
@@ -64,7 +32,9 @@
talking_1.png\
talking_2.png\
talking_3.png\
- exit.png
+ exit.png\
+ connecting.png\
+ incall.png
#
# desktop integration: .desktop file
#
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
2007-06-12 15:37:24 UTC (rev 2226)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
2007-06-12 15:40:05 UTC (rev 2227)
@@ -21,7 +21,27 @@
dialer-window-talking.c\
dialer-window-pin.c\
moko-dialer-status.c\
-alsa.c
+alsa.c \
+alsa.h \
+common.h \
+contacts.h \
+dialer-callbacks-connection.h \
+dialer-main.h \
+dialer-window-dialer.h \
+dialer-window-history.h \
+dialer-window-incoming.h \
+dialer-window-outgoing.h \
+dialer-window-pin.h \
+dialer-window-talking.h \
+error.h \
+moko-dialer-autolist.h \
+moko-dialer-declares.h \
+moko-dialer-includes.h \
+moko-dialer-panel.h \
+moko-dialer-status.h \
+moko-dialer-textview.h \
+moko-dialer-tip.h \
+moko-digit-button.h
openmoko_dialer_LDADD = @LIBS@
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.h
2007-06-12 15:37:24 UTC (rev 2226)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.h
2007-06-12 15:40:05 UTC (rev 2227)
@@ -17,6 +17,11 @@
#ifndef ALSA_H
#define ALSA_H
+/* The following define is used to refrain the compiler from
+ * stopping with an error while the ALSA headers fails with
+ * ANSI C source.
+ */
+#define _POSIX_C_SOURCE 199309
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-06-12 18:09:05 +0200 (Tue, 12 Jun 2007)
New Revision: 2228
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
Log:
* libmokoui/moko-stock.c:
* libmokoui/moko-stock.h:
Add Dial and History stock items for openmoko-dialer
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-06-12 15:40:05 UTC
(rev 2227)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-06-12 16:09:05 UTC
(rev 2228)
@@ -1,3 +1,10 @@
+2007-06-12 Thomas Wood <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-stock.c:
+ * libmokoui/moko-stock.h:
+
+ Add Dial and History stock items for openmoko-dialer
+
2007-06-05 Thomas Wood <[EMAIL PROTECTED]>
* libmokoui/moko-finger-tool-box.c: (cb_configure): Use bg_pixmap as
reference
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
2007-06-12 15:40:05 UTC (rev 2227)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
2007-06-12 16:09:05 UTC (rev 2228)
@@ -27,7 +27,9 @@
static const GtkStockItem moko_items [] =
{
{ MOKO_STOCK_CALL_ANSWER, N_("Answer"), 0, 0, GETTEXT_PACKAGE },
+ { MOKO_STOCK_CALL_DIAL, N_("Dial"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_HANGUP, N_("Hang Up"), 0, 0, GETTEXT_PACKAGE },
+ { MOKO_STOCK_CALL_HISTORY, N_("History"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_HOLD, N_("Hold"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_REDIAL, N_("Redial"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_REJECT, N_("Reject"), 0, 0, GETTEXT_PACKAGE },
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
2007-06-12 15:40:05 UTC (rev 2227)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
2007-06-12 16:09:05 UTC (rev 2228)
@@ -36,7 +36,9 @@
#define _MOKO_STOCK_H_
#define MOKO_STOCK_CALL_ANSWER "moko-call-answer"
+#define MOKO_STOCK_CALL_DIAL "moko-call-dial"
#define MOKO_STOCK_CALL_HANGUP "moko-call-hangup"
+#define MOKO_STOCK_CALL_HISTORY "moko-call-history"
#define MOKO_STOCK_CALL_HOLD "moko-call-hold"
#define MOKO_STOCK_CALL_REDIAL "moko-call-redial"
#define MOKO_STOCK_CALL_REJECT "moko-call-reject"
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-06-12 18:21:24 +0200 (Tue, 12 Jun 2007)
New Revision: 2229
Modified:
trunk/src/target/u-boot/patches/uboot-s3c2440.patch
Log:
use correct PLL dividers for 12MHz (hxd8 has 16.9344, gta02 12 DUH!)
Modified: trunk/src/target/u-boot/patches/uboot-s3c2440.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-06-12 16:09:05 UTC
(rev 2228)
+++ trunk/src/target/u-boot/patches/uboot-s3c2440.patch 2007-06-12 16:21:24 UTC
(rev 2229)
@@ -483,7 +483,7 @@
===================================================================
--- u-boot.orig/include/common.h
+++ u-boot/include/common.h
-@@ -452,7 +452,7 @@
+@@ -454,7 +454,7 @@
ulong get_OPB_freq (void);
ulong get_PCI_freq (void);
#endif
@@ -752,7 +752,7 @@
/*
-@@ -142,14 +146,27 @@
+@@ -142,14 +146,32 @@
# define pWTCON 0x15300000
# define INTMSK 0x14400008 /* Interupt-Controller base
addresses */
# define CLKDIVN 0x14800014 /* clock divisor register */
@@ -772,8 +772,13 @@
+# define CLKDIVN_val 3 /* FCLK:HCLK:PCLK = 1:2:4 */
+#elif defined(CONFIG_S3C2440)
+# define INTSUBMSK_val 0xffff
++#if (CONFIG_SYS_CLK_FREQ == 16934400)
+# define MPLLCON_val ((0x61 << 12) + (0x1 << 4) + 0x2) /* 296.35 MHz */
-+# define UPLLCON_val ((0x3c << 12) + (0x4 << 4) + 0x2)
++# define UPLLCON_val ((0x3c << 12) + (0x4 << 4) + 0x2) /* 47.98 MHz */
++#else if (CONFIG_SYS_CLK_FREQ == 12000000)
++# define MPLLCON_val ((0x44 << 12) + (0x1 << 4) + 0x1) /* 304.00 MHz */
++# define UPLLCON_val ((0x38 << 12) + (0x2 << 4) + 0x2) /* 48.00 MHz */
++#endif
+# define CLKDIVN_val 7 /* FCLK:HCLK:PCLK = 1:3:6 */
+# define CAMDIVN 0x4C000018
+#endif
@@ -782,7 +787,7 @@
ldr r0, =pWTCON
mov r1, #0x0
str r1, [r0]
-@@ -160,24 +177,34 @@
+@@ -160,24 +182,34 @@
mov r1, #0xffffffff
ldr r0, =INTMSK
str r1, [r0]
@@ -824,7 +829,7 @@
str r1, [r0]
/* Page 7-19, seven nops between UPLL and MPLL */
-@@ -189,12 +216,12 @@
+@@ -189,12 +221,12 @@
nop
nop
@@ -839,7 +844,7 @@
str r1, [r0]
#if 1
-@@ -222,7 +249,7 @@
+@@ -222,7 +254,7 @@
str r1, [r0, #0x28]
#endif
@@ -848,7 +853,7 @@
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_LL_INIT_NAND_ONLY
-@@ -274,7 +301,7 @@
+@@ -279,7 +311,7 @@
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && defined(CONFIG_LL_INIT_NAND_ONLY)
bl cpu_init_crit
#endif
@@ -857,7 +862,7 @@
/* ensure some refresh has happened */
ldr r1, =0xfffff
1: subs r1, r1, #1
-@@ -285,11 +312,12 @@
+@@ -290,11 +322,12 @@
ldr r0, [ r1 ]
tst r0, #0x02 /* is this resume from power down */
ldrne pc, [r1, #4] /* gstatus3 */
@@ -871,7 +876,7 @@
@ reset NAND
mov r1, #S3C2410_NAND_BASE
ldr r2, =0xf842 @ initial value enable
tacls=3,rph0=6,rph1=0
-@@ -309,6 +337,17 @@
+@@ -314,6 +347,17 @@
ldr r2, [r1, #oNFCONF]
orr r2, r2, #0x800 @ disable chip
str r2, [r1, #oNFCONF]
@@ -889,7 +894,7 @@
#if 0
@ get ready to call C functions (for nand_read())
-@@ -377,7 +416,7 @@
+@@ -382,7 +426,7 @@
#endif /* CONFIG_S3C2410_NAND_BOOT */
done_relocate:
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-06-12 18:50:49 +0200 (Tue, 12 Jun 2007)
New Revision: 2230
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-call-dial.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-call-history.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-back-ltr.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-forward-ltr.png
Removed:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-back.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-forward.png
Modified:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/Makefile.am
Log:
* icons: add call history and dial icons
* icons: rename go-back and go-forward files
Modified:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/Makefile.am
2007-06-12 16:21:24 UTC (rev 2229)
+++
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/Makefile.am
2007-06-12 16:50:49 UTC (rev 2230)
@@ -2,6 +2,6 @@
size = 32x32
context = stock
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = moko-history-call-in.png moko-history-call-missed.png
moko-history-call-out.png moko-history-im.png moko-history-mail.png
+icons_DATA = moko-call-dial.png moko-call-history.png moko-history-call-in.png
moko-history-call-missed.png moko-history-call-out.png moko-history-im.png
moko-history-mail.png
EXTRA_DIST = $(icons_DATA)
MAINTAINERCLEANFILES = Makefile.in
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-call-dial.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-call-dial.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-call-history.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-call-history.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-back-ltr.png
(from rev 2225,
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-back.png)
Deleted:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-back.png
===================================================================
(Binary files differ)
Copied:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-forward-ltr.png
(from rev 2225,
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-forward.png)
Deleted:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/gtk-go-forward.png
===================================================================
(Binary files differ)
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-06-12 18:52:17 +0200 (Tue, 12 Jun 2007)
New Revision: 2231
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
Log:
openmoko-dialer: use stock icons in delete/history/dial buttons
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-06-12 16:50:49 UTC (rev 2230)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-06-12 16:52:17 UTC (rev 2231)
@@ -16,11 +16,7 @@
* Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
*/
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-#include <libmokoui/moko-pixmap-button.h>
-
+#include <libmokoui/moko-ui.h>
#include <gtk/gtkalignment.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkhbox.h>
@@ -366,44 +362,33 @@
//the buttons
GtkWidget *vbox2 = gtk_vbox_new (FALSE, 10);
- GtkWidget *button1 = moko_pixmap_button_new ();
+ GtkWidget *button1 = gtk_button_new ();
+ gtk_button_set_image (GTK_BUTTON (button1), gtk_image_new_from_stock
(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON));
g_signal_connect (G_OBJECT (button1), "clicked",
G_CALLBACK (cb_delete_button_clicked), p_dialer_data);
gtk_widget_set_name (button1, "mokofingerbutton-orange");
- moko_pixmap_button_set_finger_toolbox_btn_center_image
- (MOKO_PIXMAP_BUTTON (button1),
- file_new_image_from_relative_path ("delete.png"));
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
- (button1), "Delete");
gtk_box_pack_start (GTK_BOX (vbox2), button1, FALSE, FALSE, 0);
- GtkWidget *button3 = moko_pixmap_button_new ();
+ GtkWidget *button3 = gtk_button_new ();
+ gtk_button_set_image (GTK_BUTTON (button3), gtk_image_new_from_stock
(MOKO_STOCK_CALL_HISTORY, GTK_ICON_SIZE_BUTTON));
+
g_signal_connect (G_OBJECT (button3), "clicked",
G_CALLBACK (cb_history_button_clicked), p_dialer_data);
gtk_widget_set_name (button3, "mokofingerbutton-orange");
- moko_pixmap_button_set_finger_toolbox_btn_center_image
- (MOKO_PIXMAP_BUTTON (button3),
- file_new_image_from_relative_path ("history.png"));
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
- (button3), "History");
gtk_box_pack_start (GTK_BOX (vbox2), button3, FALSE, FALSE, 0);
- GtkWidget *button2 = moko_pixmap_button_new ();
+ GtkWidget *button2 = gtk_button_new ();
g_signal_connect (G_OBJECT (button2), "clicked",
G_CALLBACK (cb_dialer_button_clicked), p_dialer_data);
gtk_widget_set_name (button2, "mokofingerbutton-black");
- moko_pixmap_button_set_finger_toolbox_btn_center_image
- (MOKO_PIXMAP_BUTTON (button2),
- file_new_image_from_relative_path ("phone.png"));
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
- (button2), "Dial");
+ gtk_button_set_image (GTK_BUTTON (button3), gtk_image_new_from_stock
(MOKO_STOCK_CALL_DIAL, GTK_ICON_SIZE_BUTTON));
+
gtk_box_pack_start (GTK_BOX (vbox2), button2, TRUE, TRUE, 0);
-
gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-06-12 18:58:17 +0200 (Tue, 12 Jun 2007)
New Revision: 2232
Modified:
trunk/src/target/OM-2007/artwork/icons/configure.ac
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/Makefile.am
Log:
icons: fix build and distcheck
Modified: trunk/src/target/OM-2007/artwork/icons/configure.ac
===================================================================
--- trunk/src/target/OM-2007/artwork/icons/configure.ac 2007-06-12 16:52:17 UTC
(rev 2231)
+++ trunk/src/target/OM-2007/artwork/icons/configure.ac 2007-06-12 16:58:17 UTC
(rev 2232)
@@ -29,8 +29,6 @@
openmoko-standard/48x48/categories/Makefile
openmoko-standard/48x48/places/Makefile
openmoko-standard/48x48/actions/Makefile
-openmoko-standard/scalable/Makefile
-openmoko-standard/scalable/stock/Makefile
])
AC_OUTPUT
Modified:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/Makefile.am
2007-06-12 16:52:17 UTC (rev 2231)
+++
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/Makefile.am
2007-06-12 16:58:17 UTC (rev 2232)
@@ -2,6 +2,6 @@
size = 36x36
context = stock
iconsdir = $(themedir)/$(size)/$(context)
-icons_DATA = contact-new.png folder-new.png gtk-about.png gtk-add.png
gtk-apply.png gtk-bold.png gtk-cancel.png gtk-cdrom.png gtk-clear.png
gtk-close.png gtk-color-picker.png gtk-connect.png gtk-convert.png gtk-copy.png
gtk-cut.png gtk-delete.png gtk-dialog-authentication.png gtk-dialog-error.png
gtk-dialog-question.png gtk-dialog-warning.png gtk-directory.png
gtk-disconnect.png gtk-dnd-multiple.png gtk-dnd.png gtk-edit.png
gtk-execute.png gtk-file.png gtk-find-and-replace.png gtk-find.png
gtk-floppy.png gtk-fullscreen.png gtk-go-back.png gtk-go-down.png
gtk-go-forward.png gtk-goto-bottom.png gtk-goto-first.png gtk-goto-last.png
gtk-goto-top.png gtk-go-up.png gtk-harddisk.png gtk-help.png gtk-home.png
gtk-indent-ltr.png gtk-indent-rtl.png gtk-index.png gtk-info.png gtk-italic.png
gtk-jump-to-ltr.png gtk-jump-to-rtl.png gtk-justify-center.png
gtk-justify-fill.png gtk-justify-left.png gtk-justify-right.png
gtk-leave-fullscreen.png gtk-media-forward.png gtk-media-next.png
gtk-media-pause.png gtk-media-play-ltr.png gtk-media-play-rtl.png
gtk-media-previous-ltr.png gtk-media-record.png gtk-media-rewind-ltr.png
gtk-media-stop.png gtk-missing-image.png gtk-network.png.png gtk-new.png
gtk-no.png gtk-ok.png gtk-open.png gtk-orientation-landscape.png
gtk-orientation-portrait.png gtk-orientation-reverse-landscape.png
gtk-orientation-reverse-portrait.png gtk-paste.png gtk-preferences.png
gtk-print.png gtk-print-preview.png gtk-properties.png gtk-quit.png
gtk-redo.png gtk-refresh.png gtk-remove.png gtk-revert-to-saved-ltr.png
gtk-revert-to-saved-rtl.png gtk-save-as.png gtk-save.png gtk-select-color.png
gtk-select-font.png gtk-sort-ascending.png gtk-sort-descending.png
gtk-spell-check.png gtk-strikethrough.png gtk-undelete-ltr.png
gtk-undelete-rtl.png gtk-underline.png gtk-undo-ltr.png gtk-unindent-ltr.png
gtk-unindent-rtl.png gtk-yes.png gtk-zoom-100.png gtk-zoom-fit.png
gtk-zoom-in.png gtk-zoom-out.png mail-forward.png mail-message-new.png
mail-read.png mail-reply.png mail-send-recieve.png moko-call-hold.png
moko-call-redial.png moko-contact-delete.png moko-contact-groups.png
moko-contact-mode.png moko-folder-delete.png moko-history.png
moko-mail-delete.png moko-phone-book.png moko-sms-new.png moko-speaker.png
moko-view.png system-search.png
+icons_DATA = contact-new.png folder-new.png gtk-about.png gtk-add.png
gtk-apply.png gtk-bold.png gtk-cancel.png gtk-cdrom.png gtk-clear.png
gtk-close.png gtk-color-picker.png gtk-connect.png gtk-convert.png gtk-copy.png
gtk-cut.png gtk-delete.png gtk-dialog-authentication.png gtk-dialog-error.png
gtk-dialog-question.png gtk-dialog-warning.png gtk-directory.png
gtk-disconnect.png gtk-dnd-multiple.png gtk-dnd.png gtk-edit.png
gtk-execute.png gtk-file.png gtk-find-and-replace.png gtk-find.png
gtk-floppy.png gtk-fullscreen.png gtk-go-back-ltr.png gtk-go-down.png
gtk-go-forward-ltr.png gtk-goto-bottom.png gtk-goto-first.png gtk-goto-last.png
gtk-goto-top.png gtk-go-up.png gtk-harddisk.png gtk-help.png gtk-home.png
gtk-indent-ltr.png gtk-indent-rtl.png gtk-index.png gtk-info.png gtk-italic.png
gtk-jump-to-ltr.png gtk-jump-to-rtl.png gtk-justify-center.png
gtk-justify-fill.png gtk-justify-left.png gtk-justify-right.png
gtk-leave-fullscreen.png gtk-media-forward.png gtk-media-next.png
gtk-media-pause.png gtk-media-play-ltr.png gtk-media-play-rtl.png
gtk-media-previous-ltr.png gtk-media-record.png gtk-media-rewind-ltr.png
gtk-media-stop.png gtk-missing-image.png gtk-network.png.png gtk-new.png
gtk-no.png gtk-ok.png gtk-open.png gtk-orientation-landscape.png
gtk-orientation-portrait.png gtk-orientation-reverse-landscape.png
gtk-orientation-reverse-portrait.png gtk-paste.png gtk-preferences.png
gtk-print.png gtk-print-preview.png gtk-properties.png gtk-quit.png
gtk-redo.png gtk-refresh.png gtk-remove.png gtk-revert-to-saved-ltr.png
gtk-revert-to-saved-rtl.png gtk-save-as.png gtk-save.png gtk-select-color.png
gtk-select-font.png gtk-sort-ascending.png gtk-sort-descending.png
gtk-spell-check.png gtk-strikethrough.png gtk-undelete-ltr.png
gtk-undelete-rtl.png gtk-underline.png gtk-undo-ltr.png gtk-unindent-ltr.png
gtk-unindent-rtl.png gtk-yes.png gtk-zoom-100.png gtk-zoom-fit.png
gtk-zoom-in.png gtk-zoom-out.png mail-forward.png mail-message-new.png
mail-read.png mail-reply.png mail-send-recieve.png moko-call-hold.png
moko-call-redial.png moko-contact-delete.png moko-contact-groups.png
moko-contact-mode.png moko-folder-delete.png moko-history.png
moko-mail-delete.png moko-phone-book.png moko-sms-new.png moko-speaker.png
moko-view.png system-search.png
EXTRA_DIST = $(icons_DATA)
MAINTAINERCLEANFILES = Makefile.in
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
