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. r1889 -
      trunk/src/target/OM-2007/applications/openmoko-dialer/src
      ([EMAIL PROTECTED])
   2. r1890 - trunk/oe/packages/linux/linux-gta01
      ([EMAIL PROTECTED])
   3. r1891 -
      trunk/src/target/OM-2007/applications/openmoko-dialer/src
      ([EMAIL PROTECTED])
   4. r1892 - trunk/src/target/gsm/src/gsmd ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-05-01 13:37:44 +0200 (Tue, 01 May 2007)
New Revision: 1889

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-history.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.h
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-talking.c
Log:
openmoko-dialer: Add static declarations and remove unnecessary/unused code


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-05-01 08:36:41 UTC (rev 1888)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
    2007-05-01 11:37:44 UTC (rev 1889)
@@ -37,7 +37,7 @@
 #include "dialer-window-history.h"
 #include "dialer-window-outgoing.h"
 
-void
+static void
 cb_delete_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   g_debug ("delete button clicked");
@@ -84,7 +84,7 @@
 
 }
 
-void
+static void
 cb_history_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   if (!appdata->window_history)
@@ -95,7 +95,7 @@
 
 }
 
-void
+static void
 window_dialer_dial_out (MokoDialerData * appdata)
 {
   gchar *codesinput;
@@ -156,7 +156,7 @@
 
 }
 
-void
+static void
 cb_dialer_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   window_dialer_dial_out (appdata);
@@ -164,7 +164,7 @@
 
 
 
-void
+static void
 on_dialer_autolist_user_selected (GtkWidget * widget, gpointer para_pointer,
                                   gpointer user_data)
 {
@@ -198,7 +198,7 @@
 
 }
 
-void
+static void
 on_dialer_autolist_user_confirmed (GtkWidget * widget, gpointer para_pointer,
                                    gpointer user_data)
 {
@@ -216,7 +216,7 @@
 
 }
 
-void
+static void
 on_dialer_autolist_nomatch (GtkWidget * widget, gpointer user_data)
 {
 
@@ -228,23 +228,8 @@
 
 }
 
-void
-on_dialer_menu_close (GtkWidget * widget, gpointer user_data)
-{
-  MokoDialerData *appdata = (MokoDialerData *) user_data;
-  gtk_main_quit ();
-}
 
-void
-on_dialer_menu_hide (GtkWidget * widget, MokoDialerData * appdata)
-{
-  gtk_widget_hide (appdata->window_dialer);
-}
-
-
-
-
-void
+static void
 on_dialer_panel_user_input (GtkWidget * widget, gchar parac,
                             gpointer user_data)
 {
@@ -281,20 +266,20 @@
 
 }
 
-void
+static void
 on_dialer_panel_user_hold (GtkWidget * widget, gchar parac,
                            gpointer user_data)
 {
   g_print ("on_dialer_panel_user_hold:%c\n", parac);
 }
 
-void
+static void
 on_window_dialer_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
   appdata->window_present = 0;
 }
 
-void
+static void
 on_window_dialer_show (GtkWidget * widget, MokoDialerData * appdata)
 {
   DBG_ENTER ();
@@ -327,13 +312,13 @@
     GtkMenu *appmenu = GTK_MENU (gtk_menu_new ());
     GtkWidget *closeitem = gtk_menu_item_new_with_label ("Close");
     g_signal_connect (G_OBJECT (closeitem), "activate",
-                      G_CALLBACK (on_dialer_menu_close), p_dialer_data);
+                      G_CALLBACK (gtk_main_quit), p_dialer_data);
     gtk_menu_shell_append (GTK_MENU_SHELL (appmenu), closeitem);
 
     GtkMenuItem *hideitem =
       GTK_MENU_ITEM (gtk_menu_item_new_with_label ("Hide"));
-    g_signal_connect (G_OBJECT (hideitem), "activate",
-                      G_CALLBACK (on_dialer_menu_hide), p_dialer_data);
+    g_signal_connect_swapped (G_OBJECT (hideitem), "activate",
+                      G_CALLBACK (gtk_widget_hide), 
p_dialer_data->window_dialer);
     gtk_menu_shell_append (GTK_MENU_SHELL (appmenu), GTK_WIDGET (hideitem));
 
 

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
   2007-05-01 08:36:41 UTC (rev 1888)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
   2007-05-01 11:37:44 UTC (rev 1889)
@@ -40,11 +40,11 @@
 
 /* function declarations */
 
-gint history_update_counter (MokoDialerData * p_dialer_data);
+static gint history_update_counter (MokoDialerData * p_dialer_data);
 
-GtkWidget *create_window_history_content (MokoDialerData * p_dialer_data);
-GtkWidget *history_create_menu_history (MokoDialerData * p_dialer_data);
-gint history_build_history_list_view (MokoDialerData * p_dialer_data);
+static GtkWidget *create_window_history_content (MokoDialerData * 
p_dialer_data);
+static GtkWidget *history_create_menu_history (MokoDialerData * p_dialer_data);
+static gint history_build_history_list_view (MokoDialerData * p_dialer_data);
 
 
 /**
@@ -57,14 +57,14 @@
  * @retval
  */
 
-int
+static int
 history_view_change_filter (MokoDialerData * p_dialer_data,
                             CallFilter type)
 {
  return 0;
 }
 
-void
+static void
 on_all_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
 {
   MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
@@ -75,7 +75,7 @@
 }
 
 
-void
+static void
 on_missed_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
 {
   MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
@@ -86,7 +86,7 @@
 }
 
 
-void
+static void
 on_dialed_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
 {
   MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
@@ -97,7 +97,7 @@
 }
 
 
-void
+static void
 on_received_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
 {
   MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
@@ -107,7 +107,7 @@
   history_update_counter (p_dialer_data);
 }
 
-gboolean
+static gboolean
 on_eventboxTop_button_release_event (GtkWidget * widget,
                                      GdkEventButton * event,
                                      MokoDialerData * appdata)
@@ -118,7 +118,7 @@
   return FALSE;
 }
 
-void
+static void
 cb_openmoko_history_wheel_press_left_up (GtkWidget * widget,
                                          MokoDialerData * appdata)
 {
@@ -154,7 +154,7 @@
 
 }
 
-void
+static void
 cb_openmoko_history_wheel_press_right_down (GtkWidget * widget,
                                             MokoDialerData * appdata)
 {
@@ -188,7 +188,7 @@
 }
 
 
-void
+static void
 cb_tool_button_history_delete_clicked (GtkButton * button,
                                        MokoDialerData * appdata)
 {
@@ -253,7 +253,7 @@
   DBG_ENTER ();
 }
 
-void
+static void
 cb_tool_button_history_call_clicked (GtkButton * button,
                                      MokoDialerData * appdata)
 {
@@ -263,7 +263,7 @@
 
 }
 
-void
+static void
 cb_tool_button_history_sms_clicked (GtkButton * button,
                                     MokoDialerData * appdata)
 {
@@ -273,7 +273,7 @@
 
 }
 
-void
+static void
 cb_tool_button_history_back_clicked (GtkButton * button,
                                      MokoDialerData * appdata)
 {
@@ -282,7 +282,7 @@
 }
 
 
-void
+static void
 on_window_history_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
 
@@ -291,7 +291,7 @@
 
 }
 
-void
+static void
 on_window_history_show (GtkWidget * widget, MokoDialerData * appdata)
 {
   DBG_ENTER ();
@@ -418,7 +418,7 @@
   return 1;
 }
 
-void
+static void
 on_treeviewHistory_cursor_changed (GtkTreeView * treeview, gpointer user_data)
 {
   GtkTreeIter iter;
@@ -450,7 +450,7 @@
 
 
 
-GtkWidget *
+static GtkWidget *
 create_window_history_content (MokoDialerData * p_dialer_data)
 {
 
@@ -583,7 +583,7 @@
  * @retval 1 everything is OK
  */
 
-gint
+static gint
 history_build_history_list_view (MokoDialerData * p_dialer_data)
 {
   GtkListStore *list_store;
@@ -699,7 +699,7 @@
  *
  * @return 1
  */
-gint
+static gint
 history_update_counter (MokoDialerData * p_dialer_data)
 {
   DBG_ENTER ();
@@ -748,7 +748,7 @@
 
 }
 
-GtkWidget *
+static GtkWidget *
 history_create_menu_history (MokoDialerData * p_dialer_data)
 {
   if (!p_dialer_data->menu_history)
@@ -860,7 +860,7 @@
  * @retval 0 error occured
  * @retval 1 everything is OK
  */
-gint
+static gint
 history_list_view_add (MokoDialerData * appdata, MokoJournalEntry * entry)
 {
 #if 0
@@ -948,7 +948,7 @@
 }
 
 
-gint
+static gint
 add_histroy_entry (MokoDialerData * appdata, CallFilter type,
                    const char *name, const char *number, const char *id,
                    char *time, char *date, int durationsec)

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
  2007-05-01 08:36:41 UTC (rev 1888)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
  2007-05-01 11:37:44 UTC (rev 1889)
@@ -38,9 +38,9 @@
 #include "dialer-window-talking.h"
 
 /* function declerations */
-void window_outgoing_setup_timer (MokoDialerData * appdata);
+static void window_outgoing_setup_timer (MokoDialerData * appdata);
 
-void
+static void
 cb_speaker_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   DBG_ENTER ();
@@ -65,7 +65,7 @@
   DBG_LEAVE ();
 }
 
-void
+static void
 cb_redial_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   DBG_ENTER ();
@@ -86,7 +86,7 @@
   DBG_LEAVE ();
 }
 
-void
+static void
 cb_cancel_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   DBG_ENTER ();
@@ -179,7 +179,7 @@
 
 
 
-void
+static void
 on_window_outgoing_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
   if (appdata->g_timer_data.ptimer != 0)
@@ -202,7 +202,7 @@
 
 }
 
-void
+static void
 window_outgoing_setup_timer (MokoDialerData * appdata)
 {
   time_t timep;
@@ -231,7 +231,7 @@
 
 }
 
-void
+static void
 on_window_outgoing_show (GtkWidget * widget, MokoDialerData * appdata)
 {
 

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.h
  2007-05-01 08:36:41 UTC (rev 1888)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.h
  2007-05-01 11:37:44 UTC (rev 1889)
@@ -20,20 +20,8 @@
 #ifndef _OPENMOKO_DIALER_WINDOW_OUTGOING_H
 #define _OPENMOKO_DIALER_WINDOW_OUTGOING_H
 
-#ifdef __cplusplus
+gint window_outgoing_init (MokoDialerData * p_dialer_data);
+void window_outgoing_prepare (MokoDialerData * appdata);
+void window_outgoing_fails (MokoDialerData * appdata);
 
-
-
-extern "C"
-{
 #endif
-
-  gint window_outgoing_init (MokoDialerData * p_dialer_data);
-  void window_outgoing_prepare (MokoDialerData * appdata);
-  void window_outgoing_fails (MokoDialerData * appdata);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c   
    2007-05-01 08:36:41 UTC (rev 1888)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c   
    2007-05-01 11:37:44 UTC (rev 1889)
@@ -93,14 +93,14 @@
 
 }
 
-void
+static void
 on_window_pin_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
   appdata->window_present = 0;
 
 }
 
-void
+static void
 on_window_pin_show (GtkWidget * widget, MokoDialerData * appdata)
 {
   DBG_ENTER ();

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-talking.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-talking.c
   2007-05-01 08:36:41 UTC (rev 1888)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-talking.c
   2007-05-01 11:37:44 UTC (rev 1889)
@@ -37,7 +37,7 @@
 #include "dialer-window-talking.h"
 #include "dialer-window-history.h"
 
-void
+static void
 openmoko_wheel_press_left_up_cb (GtkWidget * widget,
                                  MokoDialerData * appdata)
 {
@@ -57,7 +57,7 @@
 
 }
 
-void
+static void
 openmoko_wheel_press_right_down_cb (GtkWidget * widget,
                                     MokoDialerData * appdata)
 {
@@ -71,14 +71,14 @@
 }
 
 
-void
+static void
 cb_tool_button_speaker_clicked (GtkButton * button,
                                 MokoDialerData * appdata)
 {
   DBG_ENTER ();
 }
 
-void
+static void
 cb_tool_button_dtmf_talk_clicked (GtkButton * button,
                                   MokoDialerData * appdata)
 {
@@ -107,19 +107,7 @@
 
 }
 
-void
-cb_tool_button_hangup_clicked (GtkButton * button,
-                               MokoDialerData * appdata)
-{
-  /* TODO: MokoGsmdConnection->hangup
-   * gsm_hangup ();
-   */
-  gtk_widget_hide (appdata->window_talking);
-
-}
-
-
-void
+static void
 on_dtmf_panel_user_input (GtkWidget * widget, gchar parac, gpointer user_data)
 {
   char input[2];
@@ -180,7 +168,7 @@
 
 }
 
-gint
+static gint
 timer_talking_time_out (MokoDialerData * appdata)
 {
 //DBG_ENTER();
@@ -215,7 +203,7 @@
     return 1;
 }
 
-void
+static void
 on_window_talking_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
 
@@ -240,7 +228,7 @@
 
 }
 
-void
+static void
 on_window_talking_show (GtkWidget * widget, MokoDialerData * appdata)
 {
   DBG_ENTER ();
@@ -433,9 +421,9 @@
     image = file_new_image_from_relative_path ("hangup.png");
     moko_pixmap_button_set_finger_toolbox_btn_center_image
       (MOKO_PIXMAP_BUTTON (button), image);
-    g_signal_connect (G_OBJECT (button), "clicked",
-                      G_CALLBACK (cb_tool_button_hangup_clicked),
-                      p_dialer_data);
+    g_signal_connect_swapped (G_OBJECT (button), "clicked",
+                      G_CALLBACK (gtk_widget_hide),
+                      p_dialer_data->window_talking);
     gtk_widget_show (GTK_WIDGET (tools));
     gtk_widget_show (GTK_WIDGET (wheel));
 




--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-01 16:48:25 +0200 (Tue, 01 May 2007)
New Revision: 1890

Modified:
   trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
Log:
this is moko10, not moko8 (copy mistake)


Modified: trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01
===================================================================
--- trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01    
2007-05-01 11:37:44 UTC (rev 1889)
+++ trunk/oe/packages/linux/linux-gta01/defconfig-2.6.21.1-fic-gta01    
2007-05-01 14:48:25 UTC (rev 1890)
@@ -33,7 +33,7 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION="-moko8"
+CONFIG_LOCALVERSION="-moko10"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y




--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-01 18:49:58 +0200 (Tue, 01 May 2007)
New Revision: 1891

Modified:
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
Log:
openmoko-dialer: Use MokoMessageDialog for window-outgoing


Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
  2007-05-01 14:48:25 UTC (rev 1890)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
  2007-05-01 16:49:58 UTC (rev 1891)
@@ -16,19 +16,15 @@
  *  Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
  */
 
+#include <string.h>
+
 #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-message-dialog.h>
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #include "contacts.h"
 #include "dialer-main.h"
@@ -253,8 +249,6 @@
 gint
 window_outgoing_init (MokoDialerData * p_dialer_data)
 {
-
-  DBG_ENTER ();
   MokoFingerWindow *window;
   GtkWidget *vbox;
   GtkWidget *status;
@@ -278,16 +272,20 @@
 
     gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
 
+    /* Set up window */
+    window = moko_message_dialog_new ();
+    moko_message_dialog_set_image_from_stock (MOKO_MESSAGE_DIALOG (window), 
"connecting");
+    moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (window), "Calling 
... ");
+    gtk_window_set_title (GTK_WINDOW (window), "Outgoing Call");
 
-    GtkWidget *hbox2 = gtk_hbox_new (FALSE, 0);
+
+    /* Set up buttons */
     GtkWidget *button = gtk_button_new_with_label ("Speaker");
     gtk_button_set_image (GTK_BUTTON (button),
                           file_new_image_from_relative_path ("speaker.png"));
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_speaker_button_clicked), p_dialer_data);
     p_dialer_data->buttonSpeaker = button;
-//gtk_widget_set_size_request(button,100,32);
-    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
 
     button = gtk_button_new_with_label ("Redial");
     gtk_button_set_image (GTK_BUTTON (button),
@@ -295,7 +293,6 @@
     p_dialer_data->buttonRedial = button;
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_redial_button_clicked), p_dialer_data);
-    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
     g_object_set (G_OBJECT (button), "no-show-all", TRUE, NULL);
 
 
@@ -305,19 +302,12 @@
     p_dialer_data->buttonCancel = button;
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (cb_cancel_button_clicked), p_dialer_data);
-//gtk_widget_set_size_request(button,100,32);
-    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
 
-    gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50);
 
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), 
p_dialer_data->buttonSpeaker, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), 
p_dialer_data->buttonCancel, FALSE, FALSE, 0);
 
-//currently     MokoDialogWindow is not finished, wating...
-//   MokoDialogWindow* window = (MokoDialogWindow *)(moko_dialog_window_new());
-//  moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
 
-    window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
-    moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
-
     moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status),
                                         "Outgoing call");
     moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status),
@@ -326,9 +316,6 @@
     p_dialer_data->window_outgoing = GTK_WIDGET (window);
     p_dialer_data->status_outgoing = MOKO_DIALER_STATUS (status);
 
-//   
DBG_MESSAGE("p_dialer_data->status_outgoing=0X%x",p_dialer_data->status_outgoing);
-
-
     g_signal_connect ((gpointer) window, "show",
                       G_CALLBACK (on_window_outgoing_show), p_dialer_data);
     g_signal_connect ((gpointer) window, "hide",
@@ -336,10 +323,5 @@
 
   }
 
-
-
-// gtk_widget_show(p_dialer_data->window_outgoing);
-
-  DBG_LEAVE ();
   return 1;
 }




--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-02 01:39:49 +0200 (Wed, 02 May 2007)
New Revision: 1892

Modified:
   trunk/src/target/gsm/src/gsmd/unsolicited.c
Log:
make CLIP/COLP numbers zero-terminated (Closes: #525)


Modified: trunk/src/target/gsm/src/gsmd/unsolicited.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/unsolicited.c 2007-05-01 16:49:58 UTC (rev 
1891)
+++ trunk/src/target/gsm/src/gsmd/unsolicited.c 2007-05-01 23:39:49 UTC (rev 
1892)
@@ -254,7 +254,8 @@
        if (comma - param > GSMD_ADDR_MAXLEN)
                return -EINVAL;
 
-       memcpy(aux->u.clip.addr.number, param, comma-param);
+       aux->u.clip.addr.number[0] = '\0';
+       strncat(aux->u.clip.addr.number, param, comma-param);
        /* FIXME: parse of subaddr, etc. */
 
        return usock_evt_send(gsmd, ucmd, GSMD_EVT_IN_CLIP);
@@ -280,7 +281,8 @@
        if (comma - param > GSMD_ADDR_MAXLEN)
                return -EINVAL;
 
-       memcpy(aux->u.colp.addr.number, param, comma-param);
+       aux->u.colp.addr.number[0] = '\0';
+       strncat(aux->u.colp.addr.number, param, comma-param);
        /* FIXME: parse of subaddr, etc. */
 
        return usock_evt_send(gsmd, ucmd, GSMD_EVT_OUT_COLP);




--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to