r1889 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Tue May 1 13:37:46 CEST 2007
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));
More information about the commitlog
mailing list
