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. r2019 - in trunk/src/target/OM-2007/artwork/icons: .
openmoko-standard openmoko-standard/32x32
openmoko-standard/32x32/stock ([EMAIL PROTECTED])
2. r2020 - in
trunk/src/target/OM-2007/applications/openmoko-contacts: . src
([EMAIL PROTECTED])
3. r2021 -
trunk/src/target/OM-2007/artwork/icons/openmoko-standard
([EMAIL PROTECTED])
4. r2022 - in trunk/src/target/OM-2007/openmoko-libs: .
libmokoui ([EMAIL PROTECTED])
5. r2023 - in trunk/src/target/OM-2007/openmoko-libs: .
libmokoui ([EMAIL PROTECTED])
6. r2024 - in
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup: .
src ([EMAIL PROTECTED])
7. r2025 - in trunk/src/host/qemu-neo1973: gnokiigsm hw
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-05-18 17:16:09 +0200 (Fri, 18 May 2007)
New Revision: 2019
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/Makefile.am
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-call-in.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-call-missed.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-call-out.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-im.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-mail.png
Modified:
trunk/src/target/OM-2007/artwork/icons/configure.ac
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/Makefile.am
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/index.theme
Log:
icons: add moko history stock icons
Modified: trunk/src/target/OM-2007/artwork/icons/configure.ac
===================================================================
--- trunk/src/target/OM-2007/artwork/icons/configure.ac 2007-05-18 15:00:58 UTC
(rev 2018)
+++ trunk/src/target/OM-2007/artwork/icons/configure.ac 2007-05-18 15:16:09 UTC
(rev 2019)
@@ -15,6 +15,7 @@
openmoko-standard/32x32/apps/Makefile
openmoko-standard/32x32/categories/Makefile
openmoko-standard/32x32/places/Makefile
+openmoko-standard/32x32/stock/Makefile
openmoko-standard/32x32/actions/Makefile
openmoko-standard/36x36/Makefile
openmoko-standard/36x36/stock/Makefile
Modified:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/Makefile.am
2007-05-18 15:00:58 UTC (rev 2018)
+++ trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/Makefile.am
2007-05-18 15:16:09 UTC (rev 2019)
@@ -1,2 +1,2 @@
-SUBDIRS=actions apps categories places
+SUBDIRS=actions apps categories places stock
MAINTAINERCLEANFILES = Makefile.in
Added:
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-05-18 15:00:58 UTC (rev 2018)
+++
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/Makefile.am
2007-05-18 15:16:09 UTC (rev 2019)
@@ -0,0 +1,7 @@
+themedir = $(datadir)/icons/openmoko-standard
+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
+EXTRA_DIST = $(icons_DATA)
+MAINTAINERCLEANFILES = Makefile.in
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-call-in.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-call-in.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-call-missed.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-call-missed.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-call-out.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-call-out.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-im.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-im.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-mail.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/32x32/stock/moko-history-mail.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/target/OM-2007/artwork/icons/openmoko-standard/index.theme
===================================================================
--- trunk/src/target/OM-2007/artwork/icons/openmoko-standard/index.theme
2007-05-18 15:00:58 UTC (rev 2018)
+++ trunk/src/target/OM-2007/artwork/icons/openmoko-standard/index.theme
2007-05-18 15:16:09 UTC (rev 2019)
@@ -2,7 +2,7 @@
Name=OpenMoko
Comment=OpenMoko Icon Theme
-Directories=22x22/stock,32x32/actions,32x32/apps,32x32/categories,32x32/places,36x36/stock,48x48/actions,48x48/apps,48x48/categories,48x48/places,128x128/actions,128x128/apps,128x128/categories,128x128/places,
+Directories=22x22/stock,32x32/actions,32x32/apps,32x32/categories,32x32/places,32x32/stock,36x36/stock,48x48/actions,48x48/apps,48x48/categories,48x48/places,128x128/actions,128x128/apps,128x128/categories,128x128/places,
[22x22/stock]
Size=22
@@ -29,6 +29,11 @@
Context=places
Type=Fixed
+[32x32/stock]
+Size=32
+Context=stock
+Type=Fixed
+
[36x36/stock]
Size=36
Context=stock
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-18 18:42:12 +0200 (Fri, 18 May 2007)
New Revision: 2020
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-history.c
Log:
Patch by: Neil J Patel <[EMAIL PROTECTED]>
* src/contacts-callbacks-ui.c: (contacts_delete_cb):
* src/contacts-history.c: (contacts_history_refresh_ui):
- Replaces GtkDialog with MokoMessageDialog.
- Shows 'No communication history', when there is no
communication history.
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-05-18 15:16:09 UTC (rev 2019)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-05-18 16:42:12 UTC (rev 2020)
@@ -2,6 +2,18 @@
Patch by: Neil J Patel <[EMAIL PROTECTED]>
+ * src/contacts-callbacks-ui.c: (contacts_delete_cb):
+ * src/contacts-history.c: (contacts_history_refresh_ui):
+ - Replaces GtkDialog with MokoMessageDialog.
+ - Shows 'No communication history', when there is no
+ communication history.
+
+
+
+2007-05-18 Thomas Wood <[EMAIL PROTECTED]>
+
+ Patch by: Neil J Patel <[EMAIL PROTECTED]>
+
* src/Makefile.am:
* src/contacts-callbacks-ui.c: (contacts_selection_cb):
* src/contacts-defs.h:
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
2007-05-18 15:16:09 UTC (rev 2019)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
2007-05-18 16:42:12 UTC (rev 2020)
@@ -34,6 +34,7 @@
#include "contacts-callbacks-ebook.h"
#include "contacts-main.h"
#include "contacts-history-view.h"
+#include "contacts-omoko.h"
void
contacts_chooser_add_cb (GtkWidget *button, ContactsData *data)
@@ -195,7 +196,7 @@
GtkWidget *dialog, *main_window;
gint result, count_selected;
EContact *contact;
- GList *widgets, *selected_paths, *current_path;
+ GList *selected_paths, *current_path;
GList *contact_list = NULL;
const gchar *name;
gchar *message = NULL;
@@ -241,14 +242,19 @@
main_window = data->ui->main_window;
- dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
- 0, GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_CANCEL,
- message);
- gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_DELETE,
- GTK_RESPONSE_YES, NULL);
+ main_window = data->ui->main_window;
+ dialog = moko_message_dialog_new ();
+
+ moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (dialog),
+ "%s", message);
+ moko_message_dialog_set_image_from_stock (MOKO_MESSAGE_DIALOG (dialog),
+ GTK_STOCK_DIALOG_QUESTION);
+
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_DELETE, GTK_RESPONSE_YES,
+ NULL);
- widgets = contacts_set_widgets_desensitive (main_window);
result = gtk_dialog_run (GTK_DIALOG (dialog));
switch (result) {
case GTK_RESPONSE_YES:
@@ -261,8 +267,6 @@
g_list_foreach (contact_list, (GFunc) g_free, NULL);
g_list_free (contact_list);
gtk_widget_destroy (dialog);
- contacts_set_widgets_sensitive (widgets);
- g_list_free (widgets);
}
void
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-history.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-history.c
2007-05-18 15:16:09 UTC (rev 2019)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-history.c
2007-05-18 16:42:12 UTC (rev 2020)
@@ -491,7 +491,6 @@
correspond to the the priv->uid
FIXME : MokoJournal should have a special function for this.
*/
- g_print ("%s\n", priv->uid);
gint len = moko_journal_get_nb_entries (priv->journal);
gint i;
for (i = 0; i < len; i++) {
@@ -507,6 +506,13 @@
/* Sort the list in order of time, most recent first */
children = g_list_sort (children, (GCompareFunc)_sort_by_date);
+ if (!children) {
+ GtkWidget *label = gtk_label_new ("No communication history");
+ gtk_box_pack_start (GTK_BOX (history), label, TRUE, TRUE, 0);
+ gtk_widget_show_all (GTK_WIDGET (history));
+ return;
+ }
+
/* Finally, go through the sorted list creating the widgets and adding them
*/
for (c = children; c != NULL; c = c->next) {
GtkWidget *preview = NULL;
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-18 19:17:11 +0200 (Fri, 18 May 2007)
New Revision: 2021
Modified:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/index.theme
Log:
icons: add scalable icons to index.theme
Modified: trunk/src/target/OM-2007/artwork/icons/openmoko-standard/index.theme
===================================================================
--- trunk/src/target/OM-2007/artwork/icons/openmoko-standard/index.theme
2007-05-18 16:42:12 UTC (rev 2020)
+++ trunk/src/target/OM-2007/artwork/icons/openmoko-standard/index.theme
2007-05-18 17:17:11 UTC (rev 2021)
@@ -2,8 +2,15 @@
Name=OpenMoko
Comment=OpenMoko Icon Theme
-Directories=22x22/stock,32x32/actions,32x32/apps,32x32/categories,32x32/places,32x32/stock,36x36/stock,48x48/actions,48x48/apps,48x48/categories,48x48/places,128x128/actions,128x128/apps,128x128/categories,128x128/places,
+Directories=22x22/stock,32x32/actions,32x32/apps,32x32/categories,32x32/places,32x32/stock,36x36/stock,48x48/actions,48x48/apps,48x48/categories,48x48/places,128x128/actions,128x128/apps,128x128/categories,128x128/places,scalable/stock
+[scalable/stock]
+Size=32
+Context=stock
+Type=Scalable
+MinSize=8
+MaxSize=256
+
[22x22/stock]
Size=22
Context=stock
@@ -77,4 +84,4 @@
[128x128/places]
Size=128
Context=places
-Type=Fixed
\ No newline at end of file
+Type=Fixed
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-18 19:19:19 +0200 (Fri, 18 May 2007)
New Revision: 2022
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
Log:
* libmokoui/moko-finger-tool-box.c: (cb_configure): Remove useless code
(also currently is causing a crash)
* libmokoui/moko-pixmap-button.c:
(moko_pixmap_button_set_center_stock): Load center stock icons at the
size they have been supplied by designers (36x36)
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-18 17:17:11 UTC
(rev 2021)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-18 17:19:19 UTC
(rev 2022)
@@ -1,5 +1,13 @@
2007-05-18 Thomas Wood <[EMAIL PROTECTED]>
+ * libmokoui/moko-finger-tool-box.c: (cb_configure): Remove useless code
+ (also currently is causing a crash)
+ * libmokoui/moko-pixmap-button.c:
+ (moko_pixmap_button_set_center_stock): Load center stock icons at the
+ size they have been supplied by designers (36x36)
+
+2007-05-18 Thomas Wood <[EMAIL PROTECTED]>
+
Patch by: Neil J Patel <[EMAIL PROTECTED]>
* libmokojournal/src/moko-journal.c:
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
2007-05-18 17:17:11 UTC (rev 2021)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
2007-05-18 17:19:19 UTC (rev 2022)
@@ -245,9 +245,7 @@
gtk_widget_show( image );
gtk_widget_show( window );
#endif
- GdkPixmap* pixmap;
- gdk_pixbuf_render_pixmap_and_mask( pixbuf, &pixmap, &priv->mask, 1);
- g_object_unref( pixmap );
+ gdk_pixbuf_render_pixmap_and_mask( pixbuf, NULL, &priv->mask, 1);
gtk_widget_shape_combine_mask(priv->popup, priv->mask, 0, 0);
priv->buttonWidth = w;
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
2007-05-18 17:17:11 UTC (rev 2021)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
2007-05-18 17:19:19 UTC (rev 2022)
@@ -261,7 +261,13 @@
GtkWidget *loweralignment = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_box_pack_start (GTK_BOX (priv->buttonvbox), loweralignment, TRUE,
TRUE, 0);
- priv->centerimage = gtk_image_new_from_stock (stock_name,
GTK_ICON_SIZE_DND);
+ GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default
(),
+ stock_name,
+ 36,
+ 0, NULL);
+ priv->centerimage = gtk_image_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+
gtk_container_add (GTK_CONTAINER (loweralignment), priv->centerimage);
gtk_widget_show_all (GTK_WIDGET (priv->buttonvbox));
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-18 19:40:21 +0200 (Fri, 18 May 2007)
New Revision: 2023
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
Log:
* libmokoui/moko-pixmap-button.c:
(moko_pixmap_button_set_center_stock): Add check before g_object_unref ()
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-18 17:19:19 UTC
(rev 2022)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-18 17:40:21 UTC
(rev 2023)
@@ -1,5 +1,10 @@
2007-05-18 Thomas Wood <[EMAIL PROTECTED]>
+ * libmokoui/moko-pixmap-button.c:
+ (moko_pixmap_button_set_center_stock): Add check before g_object_unref
()
+
+2007-05-18 Thomas Wood <[EMAIL PROTECTED]>
+
* libmokoui/moko-finger-tool-box.c: (cb_configure): Remove useless code
(also currently is causing a crash)
* libmokoui/moko-pixmap-button.c:
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
2007-05-18 17:19:19 UTC (rev 2022)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
2007-05-18 17:40:21 UTC (rev 2023)
@@ -266,7 +266,8 @@
36,
0, NULL);
priv->centerimage = gtk_image_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
+ if (pixbuf)
+ g_object_unref (pixbuf);
gtk_container_add (GTK_CONTAINER (loweralignment), priv->centerimage);
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-05-18 22:22:05 +0200 (Fri, 18 May 2007)
New Revision: 2024
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c
Log:
2007-05-18 Stefan Schmidt,,, <[EMAIL PROTECTED]>
Reviewed by NOBODY (OOPS!).
* src/openmoko-panel-startup.c:
(show_hourglass):
(hide_hourglass):
(mb_panel_applet_create):
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog
2007-05-18 17:40:21 UTC (rev 2023)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog
2007-05-18 20:22:05 UTC (rev 2024)
@@ -1,3 +1,12 @@
+2007-05-18 Stefan Schmidt,,, <[EMAIL PROTECTED]>
+
+ Reviewed by NOBODY (OOPS!).
+
+ * src/openmoko-panel-startup.c:
+ (show_hourglass):
+ (hide_hourglass):
+ (mb_panel_applet_create):
+
2007-05-18 Stefan Schmidt <[EMAIL PROTECTED]>
* src/openmoko-panel-startup.c:
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c
2007-05-18 17:40:21 UTC (rev 2023)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c
2007-05-18 20:22:05 UTC (rev 2024)
@@ -41,14 +41,9 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
-/* FIXME */
-#define USE_LIBSN
+#define SN_API_NOT_YET_FROZEN 1
+#include <libsn/sn.h>
-#ifdef USE_LIBSN
- #define SN_API_NOT_YET_FROZEN 1
- #include <libsn/sn.h>
-#endif
-
#include <string.h>
#define TIMEOUT 20
@@ -60,7 +55,6 @@
const char *last_icon;
guint timeout_id;
GdkWindow *root_window;
- GtkWidget* eventbox;
SnDisplay *sn_display;
} StartupApplet;
@@ -97,14 +91,14 @@
static void show_hourglass(StartupApplet *applet)
{
g_message("Entered %s", G_STRFUNC);
- gtk_widget_show_all(GTK_WIDGET (applet->eventbox));
+ gtk_widget_show_all(GTK_WIDGET (applet->image));
hourglass_shown = TRUE;
}
static void hide_hourglass(StartupApplet *applet)
{
g_message("Entered %s", G_STRFUNC);
- gtk_widget_hide_all(GTK_WIDGET (applet->eventbox));
+ gtk_widget_hide_all(GTK_WIDGET (applet->image));
hourglass_shown = FALSE;
}
@@ -260,8 +254,6 @@
/* Create applet data structure */
applet = g_slice_new(StartupApplet);
- //applet->last_icon = NULL;
-
/* Create image */
applet->image = GTK_IMAGE(gtk_image_new());
@@ -293,18 +285,11 @@
*/
XSelectInput (xdisplay, DefaultRootWindow(xdisplay),
PropertyChangeMask);
- /* Get root window */
- //applet->root_window = gdk_screen_get_root_window
- // (gtk_widget_get_screen(
GTK_WIDGET (applet->image)));
-
applet->root_window =
gdk_window_lookup_for_display(gdk_x11_lookup_xdisplay(xdisplay), 0);
gdk_window_add_filter (applet->root_window, (GdkFilterFunc)
filter_func, applet);
/* Show! */
- applet->eventbox = gtk_event_box_new();
- gtk_container_add(GTK_CONTAINER(applet->eventbox),
GTK_WIDGET(applet->image));
- gtk_event_box_set_visible_window(applet->eventbox, FALSE);
moko_panel_applet_set_widget( MOKO_PANEL_APPLET(mokoapplet),
GTK_WIDGET(applet->image) );
gtk_widget_show_all(GTK_WIDGET(mokoapplet));
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-05-18 22:48:49 +0200 (Fri, 18 May 2007)
New Revision: 2025
Modified:
trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c
trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.h
trunk/src/host/qemu-neo1973/gnokiigsm/compat.h
trunk/src/host/qemu-neo1973/gnokiigsm/datapump.c
trunk/src/host/qemu-neo1973/gnokiigsm/datapump.h
trunk/src/host/qemu-neo1973/gnokiigsm/statemachine.h
trunk/src/host/qemu-neo1973/gnokiigsm/virtmodem.c
trunk/src/host/qemu-neo1973/hw/modem.c
Log:
Adapt GSM emulator more to qemu APIs.
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c 2007-05-18 20:22:05 UTC
(rev 2024)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c 2007-05-18 20:48:49 UTC
(rev 2025)
@@ -1,4 +1,8 @@
/*
+ * Copyright (c) 2007 OpenMoko, Inc.
+ * Modified for use in QEMU by Andrzej Zaborowski <[EMAIL PROTECTED]>
+ */
+/*
$Id: at-emulator.c,v 1.45 2006/10/03 21:26:37 pkot Exp $
@@ -97,15 +101,12 @@
static char imei[64], model[64], revision[64], manufacturer[64];
/* Local variables */
-static int PtyRDFD; /* File descriptor for reading and writing
to/from */
-static int PtyWRFD; /* pty interface - only different in debug
mode. */
-
static u8 ModemRegisters[MAX_MODEM_REGISTERS];
static char CmdBuffer[MAX_CMD_BUFFERS][CMD_BUFFER_LENGTH];
static int CurrentCmdBuffer;
static int CurrentCmdBufferIndex;
static int IncomingCallNo;
-static int MessageFormat; /* Message Format (text or pdu) */
+static int MessageFormat; /* Message Format (text or pdu) */
static int CallerIDMode;
/* Current command parser */
@@ -117,11 +118,8 @@
/* If initialised in debug mode, stdin/out is used instead
of ptys for interface. */
-bool gn_atem_initialise(int read_fd, int write_fd, struct gn_statemachine
*vmsm)
+bool gn_atem_initialise(struct gn_statemachine *vmsm)
{
- PtyRDFD = read_fd;
- PtyWRFD = write_fd;
-
gn_data_clear(&data);
memset(&sms, 0, sizeof(sms));
memset(&callinfo, 0, sizeof(callinfo));
@@ -197,14 +195,14 @@
gn_sm_functions(GN_OP_CancelCall, &data, sm);
IncomingCallNo = -1;
}
- dp_Initialise(PtyRDFD, PtyWRFD);
+ dp_Initialise();
}
static void gn_atem_answer_phone(void)
{
/* For now we'll also initialise the datapump + rlp code again */
- dp_Initialise(PtyRDFD, PtyWRFD);
+ dp_Initialise();
data.call_notification = dp_CallPassup;
gn_sm_functions(GN_OP_SetCallNotification, &data, sm);
data.call_info->call_id = IncomingCallNo;
@@ -378,7 +376,7 @@
/* Dial Data :-) */
/* FIXME - should parse this better */
/* For now we'll also initialise the datapump + rlp
code again */
- dp_Initialise(PtyRDFD, PtyWRFD);
+ dp_Initialise();
buf++;
if (toupper(*buf) == 'T' || toupper(*buf) == 'P') buf++;
while (*buf == ' ') buf++;
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.h
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.h 2007-05-18 20:22:05 UTC
(rev 2024)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.h 2007-05-18 20:48:49 UTC
(rev 2025)
@@ -35,7 +35,7 @@
#include "gnokii.h"
/* Prototypes */
-bool gn_atem_initialise(int read_fd, int write_fd, struct gn_statemachine
*sm);
+bool gn_atem_initialise(struct gn_statemachine *sm);
void gn_atem_incoming_data_handle(const char *buffer, int length);
void gn_atem_registers_init(void);
void gn_atem_string_out(char *buffer);
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/compat.h
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/compat.h 2007-05-18 20:22:05 UTC
(rev 2024)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/compat.h 2007-05-18 20:48:49 UTC
(rev 2025)
@@ -61,11 +61,6 @@
#include "config-host.h"
#define VERSION "QEMU " QEMU_VERSION
-struct gsmmodem_info_s {
- void (*write)(void *opaque, const char *fmt, ...);
- void *opaque;
-};
-
#define GNOKII_API
#undef timerisset
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/datapump.c
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/datapump.c 2007-05-18 20:22:05 UTC
(rev 2024)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/datapump.c 2007-05-18 20:48:49 UTC
(rev 2025)
@@ -62,15 +62,11 @@
extern bool CommandMode;
/* Local variables */
-static int PtyRDFD; /* File descriptor for reading and writing
to/from */
-static int PtyWRFD; /* pty interface - only different in debug
mode. */
u8 pluscount;
bool connected;
-bool dp_Initialise(int read_fd, int write_fd)
+bool dp_Initialise(void)
{
- PtyRDFD = read_fd;
- PtyWRFD = write_fd;
rlp_initialise(DP_SendRLPFrame, DP_CallBack);
rlp_user_request_set(Attach_Req, true);
pluscount = 0;
@@ -78,6 +74,8 @@
data.rlp_rx_callback = rlp_f96_frame_display;
gn_sm_functions(GN_OP_SetRLPRXCallback, &data, sm);
+ CommandMode = true;
+
return true;
}
@@ -88,7 +86,9 @@
switch(ind) {
case Data:
- if (CommandMode == false) write(PtyWRFD, buffer, length);
+ if (CommandMode == false)
+ sm->info->write(sm->info->opaque,
+ "%*s", length, buffer);
break;
case Conn_Ind:
if (CommandMode == false) gn_atem_modem_result(MR_CARRIER);
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/datapump.h
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/datapump.h 2007-05-18 20:22:05 UTC
(rev 2024)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/datapump.h 2007-05-18 20:48:49 UTC
(rev 2025)
@@ -35,7 +35,7 @@
#include "gnokii.h"
/* Prototypes */
-bool dp_Initialise(int read_fd, int write_fd);
+bool dp_Initialise(void);
void dp_CallPassup(gn_call_status call_status, gn_call_info *call_info,
struct gn_statemachine *state);
#endif /* _gnokii_data_datapump_h */
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/statemachine.h
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/statemachine.h 2007-05-18
20:22:05 UTC (rev 2024)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/statemachine.h 2007-05-18
20:48:49 UTC (rev 2025)
@@ -98,6 +98,13 @@
struct gsmmodem_info_s *info;
};
+struct gsmmodem_info_s {
+ gn_error (*gn_sm_functions)(gn_operation op, gn_data *data,
+ struct gn_statemachine *sm);
+ void (*write)(void *opaque, const char *fmt, ...);
+ void *opaque;
+};
+
GNOKII_API gn_state gn_sm_loop(int timeout, struct gn_statemachine *state);
/* General way to call any driver function */
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/virtmodem.c
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/virtmodem.c 2007-05-18 20:22:05 UTC
(rev 2024)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/virtmodem.c 2007-05-18 20:48:49 UTC
(rev 2025)
@@ -1,4 +1,8 @@
/*
+ * Copyright (c) 2007 OpenMoko, Inc.
+ * Modified for use in QEMU by Andrzej Zaborowski <[EMAIL PROTECTED]>
+ */
+/*
$Id: virtmodem.c,v 1.49 2006/10/19 16:05:35 dforsi Exp $
@@ -58,6 +62,46 @@
#include "datapump.h"
#include "device.h"
+/* Functions from parts of GNOKII not included in QEMU */
+GNOKII_API void gn_data_clear(gn_data *data)
+{
+ memset(data, 0, sizeof(gn_data));
+}
+
+GNOKII_API gn_state gn_sm_loop(int timeout, struct gn_statemachine *state)
+{
+ return GN_SM_Initialised;
+}
+
+GNOKII_API gn_error gn_sm_functions(gn_operation op, gn_data *data,
+ struct gn_statemachine *sm)
+{
+ return sm->info->gn_sm_functions(op, data, sm);
+}
+
+GNOKII_API gn_error gn_sms_get(gn_data *data, struct gn_statemachine *state)
+{
+ return gn_sm_functions(GN_OP_GetSMS, data, state);
+}
+
+GNOKII_API gn_error gn_sms_send(gn_data *data, struct gn_statemachine *state)
+{
+ return gn_sm_functions(GN_OP_SendSMS, data, state);
+}
+
+bool GTerminateThread = false;
+
+GNOKII_API gn_error gn_cfg_phone_load(const char *iname,
+ struct gn_statemachine *state)
+{
+ return GN_ERR_NOTSUPPORTED;
+}
+
+GNOKII_API gn_error gn_gsm_initialise(struct gn_statemachine *sm)
+{
+ return GN_ERR_NOTSUPPORTED;
+}
+
/* Defines */
#ifndef AF_LOCAL
@@ -112,12 +156,12 @@
return (false);
}
- if (gn_atem_initialise(PtyRDFD, PtyWRFD, sm) != true) {
+ if (gn_atem_initialise(sm) != true) {
fprintf (stderr, _("gn_vm_initialise - gn_atem_initialise
failed!\n"));
return (false);
}
- if (dp_Initialise(PtyRDFD, PtyWRFD) != true) {
+ if (dp_Initialise() != true) {
fprintf (stderr, _("gn_vm_Initialise - dp_Initialise
failed!\n"));
return (false);
}
Modified: trunk/src/host/qemu-neo1973/hw/modem.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/modem.c 2007-05-18 20:22:05 UTC (rev
2024)
+++ trunk/src/host/qemu-neo1973/hw/modem.c 2007-05-18 20:48:49 UTC (rev
2025)
@@ -14,109 +14,82 @@
#include "at-emulator.h"
#include "datapump.h"
+struct modem_s {
+ int enable;
+ CharDriverState chr;
+#define FIFO_LEN 4096
+ int out_start;
+ int out_len;
+ char outfifo[FIFO_LEN];
+ QEMUTimer *out_tm;
+ int64_t baud_delay;
+
+ struct gn_statemachine state;
+ struct gsmmodem_info_s info;
+};
+
#define TICALYPSO_MANF "<manufacturer>"
#define TICALYPSO_MODEL "<model>"
#define TICALYPSO_REV "<revision>"
#define TICALYPSO_IMEI "<serial number>"
-bool GTerminateThread = false;
-
-GNOKII_API gn_error gn_cfg_phone_load(const char *iname,
- struct gn_statemachine *state)
+static gn_error modem_ops(gn_operation op, gn_data *data,
+ struct gn_statemachine *sm)
{
- return GN_ERR_NOTSUPPORTED;
-}
+ switch (op) {
+ case GN_OP_MakeCall:
+ fprintf(stderr, "%s: calling %s: busy.\n", __FUNCTION__,
+ data->call_info->number);
+ return GN_ERR_LINEBUSY;
-GNOKII_API gn_error gn_sm_functions(gn_operation op, gn_data *data,
- struct gn_statemachine *sm)
-{
- switch (op) {
- case GN_OP_MakeCall:
- fprintf(stderr, "%s: calling %s: busy.\n", __FUNCTION__,
- data->call_info->number);
- return GN_ERR_LINEBUSY;
+ case GN_OP_CancelCall:
+ fprintf(stderr, "%s: hangup.\n", __FUNCTION__);
+ break;
- case GN_OP_CancelCall:
- fprintf(stderr, "%s: hangup.\n", __FUNCTION__);
- break;
+ case GN_OP_GetSMS:
+ fprintf(stderr, "%s: SMS number %i requested\n",
+ __FUNCTION__, data->sms->number);
+ return GN_ERR_EMPTYLOCATION;
- case GN_OP_DeleteSMS:
- fprintf(stderr, "%s: deleting SMS number %i\n", __FUNCTION__,
- data->sms->number);
- return GN_ERR_EMPTYLOCATION;
+ case GN_OP_DeleteSMS:
+ fprintf(stderr, "%s: deleting SMS number %i\n", __FUNCTION__,
+ data->sms->number);
+ return GN_ERR_EMPTYLOCATION;
- case GN_OP_GetRFLevel:
- *data->rf_level = 32.0f; /* Some -50 dBm */
- break;
+ case GN_OP_SendSMS:
+ fprintf(stderr, "%s: SMS type 0x%02x sent\n",
+ __FUNCTION__, data->sms->type);
+ return GN_ERR_NOTSUPPORTED;
- case GN_OP_GetImei:
- strcpy(data->imei, TICALYPSO_IMEI);
- break;
+ case GN_OP_GetRFLevel:
+ *data->rf_level = 32.0f; /* Some -50 dBm */
+ break;
- case GN_OP_GetRevision:
- strcpy(data->revision, TICALYPSO_REV);
- break;
+ case GN_OP_GetImei:
+ strcpy(data->imei, TICALYPSO_IMEI);
+ break;
- case GN_OP_GetModel:
- strcpy(data->revision, TICALYPSO_MODEL);
- break;
+ case GN_OP_GetRevision:
+ strcpy(data->revision, TICALYPSO_REV);
+ break;
- case GN_OP_Identify:
- strcpy(data->model, TICALYPSO_MODEL);
- strcpy(data->revision, TICALYPSO_REV);
- strcpy(data->imei, TICALYPSO_IMEI);
- strcpy(data->manufacturer, TICALYPSO_MANF);
- break;
+ case GN_OP_GetModel:
+ strcpy(data->revision, TICALYPSO_MODEL);
+ break;
- default:
- return GN_ERR_NOTSUPPORTED;
- }
- return GN_ERR_NONE;
-}
+ case GN_OP_Identify:
+ strcpy(data->model, TICALYPSO_MODEL);
+ strcpy(data->revision, TICALYPSO_REV);
+ strcpy(data->imei, TICALYPSO_IMEI);
+ strcpy(data->manufacturer, TICALYPSO_MANF);
+ break;
-GNOKII_API gn_error gn_gsm_initialise(struct gn_statemachine *sm)
-{
- return GN_ERR_NOTSUPPORTED;
+ default:
+ return GN_ERR_NOTSUPPORTED;
+ }
+ return GN_ERR_NONE;
}
-GNOKII_API void gn_data_clear(gn_data *data)
-{
- memset(data, 0, sizeof(gn_data));
-}
-
-GNOKII_API gn_state gn_sm_loop(int timeout, struct gn_statemachine *state)
-{
- return GN_ERR_NOTSUPPORTED;
-}
-
-GNOKII_API gn_error gn_sms_get(gn_data *data, struct gn_statemachine *state)
-{
- fprintf(stderr, "%s: SMS number %i requested\n",
- __FUNCTION__, data->sms->number);
- return GN_ERR_EMPTYLOCATION;
-}
-
-GNOKII_API gn_error gn_sms_send(gn_data *data, struct gn_statemachine *state)
-{
- fprintf(stderr, "%s: SMS type 0x%02x sent\n",
- __FUNCTION__, data->sms->type);
- return GN_ERR_NOTSUPPORTED;
-}
-
-struct modem_s {
- int enable;
- CharDriverState chr;
-#define FIFO_LEN 4096
- int out_start;
- int out_len;
- char outfifo[FIFO_LEN];
- QEMUTimer *out_tm;
- int64_t baud_delay;
-
- struct gn_statemachine state;
- struct gsmmodem_info_s info;
-};
-
static void modem_reset(struct modem_s *s)
{
s->out_len = 0;
@@ -223,12 +196,13 @@
s->state.info = &s->info;
s->info.write = modem_resp;
+ s->info.gn_sm_functions = modem_ops;
s->info.opaque = s;
- if (!gn_atem_initialise(0, 1, &s->state))
+ if (!gn_atem_initialise(&s->state))
goto fail;
- if (!dp_Initialise(0, 1))
+ if (!dp_Initialise())
goto fail;
return &s->chr;
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
