r1618 - trunk/src/target/OM-2007/applications/openmoko-messages/src
alex_tang at sita.openmoko.org
alex_tang at sita.openmoko.org
Mon Apr 2 11:08:23 CEST 2007
Author: alex_tang
Date: 2007-04-02 11:08:14 +0200 (Mon, 02 Apr 2007)
New Revision: 1618
Modified:
trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h
trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h
trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-dialog-window.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c
Log:
Do some clean work
1.free used strings
2.remove comments and functions which will not be used any more
3.clean some definitions
4.review detail-area and rewrite member definition
5.move page enum from main.h to detail-area.h
6.clean compile warning and DETAIL_AREA cast to MOKO_DETAIL_AREA warning
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c 2007-04-02 08:36:14 UTC (rev 1617)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c 2007-04-02 09:08:14 UTC (rev 1618)
@@ -72,6 +72,7 @@
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(d->filter));
gchar* str = g_strdup_printf("folder %s has %d messages",text,get_model_number(d));
send_signal_to_footer(d->bus,str);
+ g_free(str);
return FALSE;
}
@@ -153,12 +154,12 @@
void cb_mode_read (GtkMenuItem* item, MessengerData* d)
{
g_debug ("mode read");
- message* msg;
GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW( d->view ));
GtkTreeModel* model;
GtkTreeIter iter;
gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
+ message* msg = NULL;
if ( has_selection )
{
msg = g_malloc(sizeof(message));
@@ -166,19 +167,18 @@
gtk_tree_model_get( model, &iter, COLUMN_SUBJECT, &msg->subject, -1 );
gtk_tree_model_get( model, &iter, COLUMN_FOLDER, &msg->folder, -1 );
}
- else msg = NULL;
detail_read_message (DETAIL_AREA(d->details),msg);
}
void cb_mode_reply (GtkMenuItem* item, MessengerData* d)
{
g_debug ("mode reply");
- message* msg;
GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW( d->view ));
GtkTreeModel* model;
GtkTreeIter iter;
gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
+ message* msg = NULL;
if ( has_selection )
{
msg = g_malloc(sizeof(message));
@@ -186,7 +186,6 @@
gtk_tree_model_get( model, &iter, COLUMN_SUBJECT, &msg->subject, -1 );
gtk_tree_model_get( model, &iter, COLUMN_FOLDER, &msg->folder, -1 );
}
- else msg = NULL;
SmsDialogWindow* sms_window = sms_dialog_window_new();
if (msg != NULL)
@@ -194,19 +193,20 @@
sms_dialog_window_set_title (sms_window,"Reply SMS");
sms_dialog_reply_message (sms_window,msg);
}
- else sms_dialog_window_set_title (sms_window,"New SMS");
+ else
+ sms_dialog_window_set_title (sms_window,"New SMS");
gtk_widget_show_all ( GTK_WIDGET(sms_window) );
}
void cb_mode_forward (GtkMenuItem* item, MessengerData* d)
{
g_debug ("mode forward");
- message* msg;
GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW( d->view ));
GtkTreeModel* model;
GtkTreeIter iter;
gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
+ message* msg = NULL;
if ( has_selection )
{
msg = g_malloc(sizeof(message));
@@ -217,7 +217,6 @@
COLUMN_CONTENT, &msg->content,
-1 );
}
- else msg = NULL;
SmsDialogWindow* sms_window = sms_dialog_window_new();
sms_dialog_window_set_title (sms_window,"Forward SMS");
@@ -270,6 +269,7 @@
}
gtk_widget_destroy (dialog);
}
+ g_free(oldName);
}
void cb_delete_message (GtkMenuItem* item, MessengerData* d)
@@ -311,7 +311,6 @@
void cb_frBtn_clicked (GtkButton* button, MessengerData* d)
{
GSList *c;
- gchar* folder;
GtkWidget* menuitem = gtk_menu_get_attach_widget (GTK_MENU(d->filtmenu));
GtkWidget* menulabel = GTK_BIN(menuitem)->child;
@@ -321,6 +320,7 @@
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(d->filter));
c = d->folderlist;
+ gchar* folder = NULL;
for (; c; c = g_slist_next(c) )
{
folder = (gchar*) c->data;
@@ -336,6 +336,10 @@
moko_menu_box_set_filter_menu(menubox, GTK_MENU(d->filtmenu));
gtk_widget_show_all (GTK_WIDGET(menubox));
gtk_widget_hide (d->frWin);
+
+ g_free(newName);
+ g_free(oldName);
+ g_free(folder);
}
void cb_frResetBtn_clicked (GtkButton* button, GtkWidget* entry)
@@ -383,7 +387,7 @@
GtkWidget* menuitem = gtk_menu_get_attach_widget (GTK_MENU(d->filtmenu));
GtkWidget* menulabel = GTK_BIN(menuitem)->child;
- GtkWidget* frLabel = gtk_label_new (g_strdup_printf("Please input new folder name for %s:", gtk_label_get_text (GTK_LABEL(menulabel))));
+ GtkWidget* frLabel = gtk_label_new (g_strdup_printf("Please input new folder name for %s:", gtk_label_get_text (GTK_LABEL(menulabel))));
gtk_misc_set_alignment (GTK_MISC(frLabel),0,0.5);
gtk_box_pack_start (GTK_BOX(frBox), frLabel, FALSE, TRUE, 0);
@@ -410,13 +414,15 @@
}
gtk_widget_show_all ( GTK_WIDGET(d->frWin) );
}
+
+ g_free(oldName);
}
void cb_nfBtn_clicked (GtkButton* button, MessengerData* d)
{
gchar* folder = g_strdup(gtk_entry_get_text(GTK_ENTRY(d->nfEntry)));
g_debug ("new folder %s",folder);
- d->folderlist = g_slist_append (d->folderlist,folder);
+ d->folderlist = g_slist_append (d->folderlist,g_strdup(folder));
d->filtmenu = reload_filter_menu (d,d->folderlist);
MokoMenuBox* menubox = (MokoMenuBox*)moko_paned_window_get_menubox( d->window );
g_signal_connect( G_OBJECT(menubox), "filter_changed", G_CALLBACK(cb_filter_changed), d );
@@ -425,6 +431,7 @@
foldersdb_update (d->folderlist);
update_folder_sensitive(d, d->folderlist);
gtk_widget_hide (d->nfWin);
+ g_free(folder);
}
void cb_nfResetBtn_clicked (GtkButton* button, MessengerData* d)
@@ -456,6 +463,7 @@
moko_menu_box_set_active_filter (menubox,str);
gtk_widget_show_all (GTK_WIDGET(menubox));
update_folder_sensitive (d, d->folderlist);
+ g_free(str);
/*result inform */
GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW(gtk_widget_get_parent_window(GTK_WIDGET(button))),
@@ -488,6 +496,7 @@
/*set the default filter item to "Inbox" */
gchar* str = g_strdup("Inbox");
moko_menu_box_set_active_filter (menubox,str);
+ g_free(str);
gtk_widget_show_all (GTK_WIDGET(menubox));
update_folder_sensitive (d, d->folderlist);
}
@@ -503,14 +512,13 @@
GtkTreeIter iter;
GtkTreeIter childiter;
GtkTreeView* view;
- message* msg;
GdkPixbuf* icon;
GError* error = NULL;
view = gtk_tree_selection_get_tree_view( selection );
if ( gtk_tree_selection_get_selected( selection, &model, &iter ) )
{
- msg = g_malloc(sizeof(message));
+ message* msg = g_malloc(sizeof(message));
gtk_tree_model_get( model, &iter, COLUMN_FROM, &msg->name, -1 );
gtk_tree_model_get( model, &iter, COLUMN_SUBJECT, &msg->subject, -1 );
gtk_tree_model_get( model, &iter, COLUMN_FOLDER, &msg->folder, -1 );
@@ -526,6 +534,7 @@
COLUMN_STATUS, msg->status,
-1);
}
+
detail_read_message (DETAIL_AREA(d->details),msg);
}
}
@@ -552,6 +561,7 @@
g_debug ("search %s, result has %d messages",d->s_key,get_model_number(d));
gchar* str = g_strdup_printf("search %s, result has %d messages",d->s_key,get_model_number(d));
send_signal_to_footer(d->bus,str);
+ g_free(str);
}
void cb_search_on (MessengerData* d)
@@ -595,7 +605,7 @@
return;
g_debug ("start to add %d contacts to entry", g_list_length(contacts));
gchar* nameList = NULL;
- gchar* name;
+ const gchar* name = NULL;
GList* nextContext = contacts;
EContact *contact;
for ( ; nextContext != NULL; nextContext = nextContext->next){
@@ -612,6 +622,5 @@
else
gtk_entry_set_text (GTK_ENTRY(toEntry),nameList);
g_free(nameList);
- g_free(name);
}
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c 2007-04-02 08:36:14 UTC (rev 1617)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c 2007-04-02 09:08:14 UTC (rev 1618)
@@ -18,28 +18,22 @@
*/
#include "detail-area.h"
-#include "main.h"
GtkWidget* detail_area_mode_read (DetailArea* self);
-G_DEFINE_TYPE (DetailArea, detail_area, GTK_TYPE_SCROLLED_WINDOW)
+G_DEFINE_TYPE (DetailArea, detail_area, MOKO_TYPE_DETAILS_WINDOW)
#define DETAIL_AREA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DETAIL_AREA, DetailAreaPrivate))
-typedef struct _DetailAreaPrivate
- {}
-DetailAreaPrivate;
+typedef struct _DetailAreaPrivate{
+ GtkWidget* from_label;
+ GtkWidget* date_label;
+ GtkWidget* details;
+}DetailAreaPrivate;
/* parent class pointer */
GtkWindowClass* parent_class = NULL;
-/* forward declarations */
-gboolean
-_expose_event_callback(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
- return TRUE;
-}
-
static void
detail_area_dispose (GObject *object)
{
@@ -57,11 +51,10 @@
detail_area_class_init (DetailAreaClass *klass)
{
/* hook parent */
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GObjectClass* object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent(klass);
- /* register private data */
- g_type_class_add_private (klass, sizeof (DetailAreaPrivate));
+ g_type_class_add_private (klass, sizeof(DetailAreaPrivate));
object_class->dispose = detail_area_dispose;
object_class->finalize = detail_area_finalize;
@@ -73,8 +66,6 @@
{
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(self), GTK_POLICY_NEVER, GTK_POLICY_NEVER );
- self->readAttributes = g_malloc (sizeof(ReadAttributes));
- self->editAttributes = g_malloc (sizeof(EditAttributes));
self->notebook = GTK_NOTEBOOK( gtk_notebook_new() );
gtk_notebook_append_page (self->notebook,detail_area_mode_read(self),NULL);
gtk_notebook_set_show_tabs (self->notebook,FALSE);
@@ -93,24 +84,24 @@
GtkWidget* detail_area_mode_read (DetailArea* self)
{
+ DetailAreaPrivate* priv = DETAIL_AREA_GET_PRIVATE(self);
+
/* create detail box */
self->detailbox = GTK_VBOX(gtk_vbox_new(FALSE,0));
- ReadAttributes* readAttributes = self->readAttributes;
-
GtkWidget* headerbox = gtk_vbox_new(FALSE,0);
GtkWidget* hbox = gtk_hbox_new(FALSE,0);
- readAttributes->from_label = gtk_label_new ("Alex");
- gtk_misc_set_alignment (GTK_MISC (readAttributes->from_label),1,0.5);
- readAttributes->date_label = gtk_label_new ("Hello");
- gtk_misc_set_alignment (GTK_MISC (readAttributes->date_label),1,0.5);
+ priv->from_label = gtk_label_new ("Alex");
+ gtk_misc_set_alignment (GTK_MISC (priv->from_label),1,0.5);
+ priv->date_label = gtk_label_new ("Hello");
+ gtk_misc_set_alignment (GTK_MISC (priv->date_label),1,0.5);
GtkWidget* cellalign = gtk_alignment_new (0.5, 0.5, 1, 1);
gtk_alignment_set_padding (GTK_ALIGNMENT(cellalign), 5,5,5,5);
GtkWidget* label = gtk_label_new ("From:");
gtk_misc_set_alignment (GTK_MISC (label),1,0.5);
gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,0);
- gtk_box_pack_start(GTK_BOX(hbox),readAttributes->from_label,FALSE,FALSE,0);
+ gtk_box_pack_start(GTK_BOX(hbox),priv->from_label,FALSE,FALSE,0);
gtk_container_add(GTK_CONTAINER(cellalign),hbox);
gtk_box_pack_start(GTK_BOX(headerbox),cellalign,FALSE,FALSE,0);
@@ -120,7 +111,7 @@
label = gtk_label_new ("Date:");
gtk_misc_set_alignment (GTK_MISC (label),1,0.5);
gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,0);
- gtk_box_pack_start(GTK_BOX(hbox),readAttributes->date_label,FALSE,FALSE,0);
+ gtk_box_pack_start(GTK_BOX(hbox),priv->date_label,FALSE,FALSE,0);
gtk_container_add(GTK_CONTAINER(cellalign),hbox);
gtk_box_pack_start(GTK_BOX(headerbox),cellalign,FALSE,FALSE,0);
@@ -128,13 +119,13 @@
GtkWidget* detailAlign = gtk_alignment_new(0, 0, 0, 0);
gtk_alignment_set_padding (GTK_ALIGNMENT(detailAlign), 10, 10, 10, 50);
/*GtkWidget* details = gtk_label_new("this is the detail");*/
- readAttributes->details = gtk_label_new( "Add your widget for showing details for the selected\n"
+ priv->details = gtk_label_new( "Add your widget for showing details for the selected\n"
"\ndata entry here\n \n \n \n \n \n \n \nThis particular label\n \nis very long\n"
"\nto make the fullscreen\n \ntrigger more interesting\n \n \n");
- gtk_widget_set_size_request (readAttributes->details,420,-1);
- gtk_label_set_line_wrap (GTK_LABEL(readAttributes->details),TRUE);
- gtk_misc_set_alignment (GTK_MISC (readAttributes->details),0.1,0.5);
- gtk_container_add (GTK_CONTAINER(detailAlign),readAttributes->details);
+ gtk_widget_set_size_request (priv->details,420,-1);
+ gtk_label_set_line_wrap (GTK_LABEL(priv->details),TRUE);
+ gtk_misc_set_alignment (GTK_MISC (priv->details),0.1,0.5);
+ gtk_container_add (GTK_CONTAINER(detailAlign),priv->details);
gtk_box_pack_start(GTK_BOX(self->detailbox),headerbox,FALSE,TRUE,0);
gtk_box_pack_start(GTK_BOX(self->detailbox),hseparator,FALSE,TRUE,0);
gtk_box_pack_start(GTK_BOX(self->detailbox),detailAlign,FALSE,TRUE,0);
@@ -144,19 +135,20 @@
void detail_read_message (DetailArea* self, message* msg)
{
- ReadAttributes* readAttributes = self->readAttributes;
+ DetailAreaPrivate* priv = DETAIL_AREA_GET_PRIVATE(self);
+
if(msg != NULL)
{
- gtk_label_set_text(GTK_LABEL(readAttributes->from_label), msg->name);
- gtk_label_set_text(GTK_LABEL(readAttributes->date_label), msg->subject);
- gtk_label_set_text(GTK_LABEL(readAttributes->details), msg->folder);
+ gtk_label_set_text(GTK_LABEL(priv->from_label), msg->name);
+ gtk_label_set_text(GTK_LABEL(priv->date_label), msg->subject);
+ gtk_label_set_text(GTK_LABEL(priv->details), msg->folder);
g_free(msg);
}
else
{
- gtk_label_set_text(GTK_LABEL(readAttributes->from_label), "");
- gtk_label_set_text(GTK_LABEL(readAttributes->date_label), "");
- gtk_label_set_text(GTK_LABEL(readAttributes->details), "please select a message");
+ gtk_label_set_text(GTK_LABEL(priv->from_label), "");
+ gtk_label_set_text(GTK_LABEL(priv->date_label), "");
+ gtk_label_set_text(GTK_LABEL(priv->details), "please select a message");
}
gtk_notebook_set_current_page (self->notebook,PAGE_MODE_READ);
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h 2007-04-02 08:36:14 UTC (rev 1617)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.h 2007-04-02 09:08:14 UTC (rev 1618)
@@ -36,13 +36,15 @@
#define IS_DETAIL_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DETAIL_AREA))
#define DETAIL_AREA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DETAIL_AREA, DetailAreaClass))
-typedef struct _Read_Attributes
- {
- GtkWidget* from_label;
- GtkWidget* date_label;
- GtkWidget* details;
- }
-ReadAttributes;
+enum {
+ PAGE_EDIT_MODE,
+ PAGE_NEW_MAIL,
+ PAGE_MODE_READ,
+ PAGE_MODE_REPLY,
+ PAGE_MODE_FORWARD,
+ PAGE_MODE_MMSHIP,
+ NUM_PAGES,
+};
typedef struct _Edit_Attributes
{
@@ -62,8 +64,6 @@
MokoFixed* entryarea;
GSList* folderlist;
guint* page;
- ReadAttributes* readAttributes;
- EditAttributes* editAttributes;
}
DetailArea;
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c 2007-04-02 08:36:14 UTC (rev 1617)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c 2007-04-02 09:08:14 UTC (rev 1618)
@@ -304,6 +304,10 @@
return FALSE;
}
+ g_free(subject);
+ g_free(from);
+ g_free(folder);
+
return TRUE;
}
@@ -401,7 +405,8 @@
d->details = detail_area_new();
gtk_widget_show (d->details);
gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(d->details), detail_area_get_notebook(DETAIL_AREA(d->details)));
- moko_paned_window_set_lower_pane( MOKO_PANED_WINDOW(d->window), GTK_WIDGET(moko_details_window_put_in_box(d->details)));
+ moko_paned_window_set_lower_pane( MOKO_PANED_WINDOW(d->window),
+ GTK_WIDGET(moko_details_window_put_in_box(MOKO_DETAILS_WINDOW(d->details))));
}
void main_quit(GtkMenuItem* item, MessengerData* d)
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h 2007-04-02 08:36:14 UTC (rev 1617)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h 2007-04-02 09:08:14 UTC (rev 1618)
@@ -69,16 +69,6 @@
NUM_COLS,
};
-enum {
- PAGE_EDIT_MODE,
- PAGE_NEW_MAIL,
- PAGE_MODE_READ,
- PAGE_MODE_REPLY,
- PAGE_MODE_FORWARD,
- PAGE_MODE_MMSHIP,
- NUM_PAGES,
-};
-
GtkWidget* reload_filter_menu (MessengerData* d, GSList* folderlist);
void setup_ui( MessengerData* d );
void populate_navigation_area( MessengerData* d );
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c 2007-04-02 08:36:14 UTC (rev 1617)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c 2007-04-02 09:08:14 UTC (rev 1618)
@@ -16,6 +16,7 @@
*
* Current Version: $Rev$ ($Date: 2006/10/05 17:38:14 $) [$Author: alex $]
*/
+
#include "sms-contact-window.h"
G_DEFINE_TYPE (SmsContactWindow, sms_contact_window, MOKO_TYPE_WINDOW)
@@ -94,9 +95,9 @@
data->contacts = contacts;
g_debug ("list length %d", g_list_length(c));
+ const gchar *name , *phoneNum;
for (;c;c=c->next){
EContact *contact = E_CONTACT (c->data);
- const gchar *name, *phoneNum;
name = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
phoneNum = e_contact_get_const (contact, E_CONTACT_PHONE_BUSINESS);
gtk_list_store_append(contacts_liststore, &iter);
@@ -179,7 +180,6 @@
/* loading contacts */
g_idle_add((GSourceFunc)open_book,data);
- //loadBook(data);
gtk_widget_show_all(priv->vbox);
gtk_container_add(GTK_CONTAINER(self), priv->vbox);
@@ -257,6 +257,7 @@
contactListItem->data);
}
}
+ g_free(name);
return FALSE;
}
@@ -285,19 +286,14 @@
{
GtkTreeModel* model;
GtkTreeIter iter;
- //GtkTreeView* view = gtk_tree_selection_get_tree_view( selection );
if ( gtk_tree_selection_get_selected( selection, &model, &iter ) )
{
- gchar* name;
- gchar* phoneNum;
- gboolean selected;
GtkListStore* liststore = data->contacts_liststore;
+ gboolean selected;
gtk_tree_model_get( model, &iter,
CONTACT_SEL_COL, &selected,
- CONTACT_NAME_COL, &name,
- CONTACT_CELLPHONE_COL, &phoneNum,
-1);
if (selected)
@@ -305,7 +301,6 @@
else
gtk_list_store_set (liststore, &iter, CONTACT_SEL_COL, TRUE, -1);
}
-
}
static void contact_select_done(SmsContactWindow* self)
@@ -323,3 +318,4 @@
SmsContactWindowPrivate* priv = SMS_CONTACT_WINDOW_GET_PRIVATE(self);
return priv->data->contacts;
}
+
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h 2007-04-02 08:36:14 UTC (rev 1617)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h 2007-04-02 09:08:14 UTC (rev 1618)
@@ -16,6 +16,7 @@
*
* Current Version: $Rev$ ($Date: 2006/10/05 17:38:14 $) [$Author: alex $]
*/
+
#ifndef _SMS_CONTACT_WINDOW_H_
#define _SMS_CONTACT_WINDOW_H_
@@ -58,7 +59,7 @@
{
MokoWindowClass parent_class;
/* class members */
- void (*contact_select_done)(void);
+ void (*contact_select_done) (SmsContactWindow* self);
}SmsContactWindowClass;
typedef struct
@@ -75,3 +76,4 @@
G_END_DECLS
#endif
+
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-dialog-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-dialog-window.c 2007-04-02 08:36:14 UTC (rev 1617)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-dialog-window.c 2007-04-02 09:08:14 UTC (rev 1618)
@@ -69,58 +69,6 @@
static void
-shutdown_loop (SmsDialogRunInfo *ri)
-{
- if (g_main_loop_is_running (ri->loop))
- g_main_loop_quit (ri->loop);
-}
-
-static void
-run_unmap_handler (SmsDialogWindow* dialog, gpointer data)
-{
- SmsDialogRunInfo *ri = data;
-
- shutdown_loop (ri);
-}
-
-static void
-run_response_handler (SmsDialogWindow* dialog,
- gint response_id,
- gpointer data)
-{
- SmsDialogRunInfo *ri;
-
- ri = data;
-
- ri->response_id = response_id;
-
- shutdown_loop (ri);
-}
-
-static gint
-run_delete_handler (SmsDialogWindow* dialog,
- GdkEventAny *event,
- gpointer data)
-{
- SmsDialogRunInfo *ri = data;
-
- shutdown_loop (ri);
-
- return TRUE; /* Do not destroy */
-}
-
-static void
-run_destroy_handler (SmsDialogWindow* dialog, gpointer data)
-{
- SmsDialogRunInfo *ri = data;
-
- /* shutdown_loop will be called by run_unmap_handler */
-
- ri->destroyed = TRUE;
-}
-
-
-static void
sms_dialog_window_dispose(GObject* object)
{
if (G_OBJECT_CLASS (sms_dialog_window_parent_class)->dispose)
@@ -157,9 +105,7 @@
if ( parent )
{
gtk_window_set_transient_for( GTK_WINDOW(self), GTK_WINDOW(parent) );
-#ifndef DEBUG_THIS_FILE
gtk_window_set_modal( GTK_WINDOW(self), TRUE );
-#endif
gtk_window_set_destroy_with_parent( GTK_WINDOW(self), TRUE );
}
}
@@ -195,8 +141,6 @@
if ( !priv->vbox )
{
GtkWidget* image;
- GtkWidget* smsSendBtn;
- GtkWidget* emailBtn;
priv->vbox = gtk_vbox_new( FALSE, 0 );
gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(priv->eventbox), FALSE, FALSE, 0 );
@@ -217,7 +161,7 @@
image = gtk_image_new_from_file (PKGDATADIR "/Address.png");
moko_pixmap_button_set_center_image ( MOKO_PIXMAP_BUTTON(self->addressBtn ),image);
- smsSendBtn = moko_tool_box_add_action_button (MOKO_TOOL_BOX(priv->toolbox));
+ GtkWidget* smsSendBtn = moko_tool_box_add_action_button (MOKO_TOOL_BOX(priv->toolbox));
gtk_widget_set_name( GTK_WIDGET(smsSendBtn), "mokostylusbutton-white" );
image = gtk_image_new_from_file (PKGDATADIR "/Send.png");
moko_pixmap_button_set_center_image ( MOKO_PIXMAP_BUTTON(smsSendBtn),image);
@@ -283,8 +227,6 @@
if ( !priv->vbox )
{
GtkWidget* image;
- GtkWidget* smsSendBtn;
- GtkWidget* emailBtn;
priv->vbox = gtk_vbox_new( FALSE, 0 );
gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(priv->eventbox), FALSE, FALSE, 0 );
@@ -305,12 +247,12 @@
image = gtk_image_new_from_file (PKGDATADIR "/Address.png");
moko_pixmap_button_set_center_image ( MOKO_PIXMAP_BUTTON(self->addressBtn),image);
- emailBtn = moko_tool_box_add_action_button (MOKO_TOOL_BOX(priv->toolbox));
+ GtkWidget* emailBtn = moko_tool_box_add_action_button (MOKO_TOOL_BOX(priv->toolbox));
gtk_widget_set_name( GTK_WIDGET(emailBtn), "mokostylusbutton-white" );
image = gtk_image_new_from_file (PKGDATADIR "/Attached.png");
moko_pixmap_button_set_center_image ( MOKO_PIXMAP_BUTTON(emailBtn),image);
- smsSendBtn = moko_tool_box_add_action_button (MOKO_TOOL_BOX(priv->toolbox));
+ GtkWidget* smsSendBtn = moko_tool_box_add_action_button (MOKO_TOOL_BOX(priv->toolbox));
gtk_widget_set_name( GTK_WIDGET(smsSendBtn), "mokostylusbutton-white" );
image = gtk_image_new_from_file (PKGDATADIR "/Send.png");
moko_pixmap_button_set_center_image ( MOKO_PIXMAP_BUTTON(smsSendBtn),image);
@@ -437,6 +379,7 @@
gchar* text = g_strdup_printf("\n\n\n>%s",msg->content);
gtk_text_buffer_set_text (buffer, text, strlen(text));
gtk_widget_grab_focus (priv->txtView);
+ g_free(text);
}
gboolean on_sms_txtView_key_release_event (GtkWidget *widget,
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c 2007-04-02 08:36:14 UTC (rev 1617)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c 2007-04-02 09:08:14 UTC (rev 1618)
@@ -143,9 +143,7 @@
if ( parent )
{
gtk_window_set_transient_for( GTK_WINDOW(self), GTK_WINDOW(parent) );
-#ifndef DEBUG_THIS_FILE
gtk_window_set_modal( GTK_WINDOW(self), TRUE );
-#endif
gtk_window_set_destroy_with_parent( GTK_WINDOW(self), TRUE );
}
@@ -215,7 +213,7 @@
}
-void membeship_rdo_btn_clicked ( GtkButton* button, SmsMembershipWindow* self)
+void membership_rdo_btn_clicked ( GtkButton* button, SmsMembershipWindow* self)
{
GtkTreeModel* model;
GtkTreeIter iter;
@@ -234,6 +232,7 @@
gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(priv->filter),&childiter,&iter);
gtk_list_store_set(priv->liststore, &childiter, COLUMN_FOLDER, gtk_button_get_label(button), -1);
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(priv->filter));
+ g_free(folder);
}
}
@@ -246,19 +245,7 @@
/* application menu */
appmenu = NULL;
- /*GtkMenuItem* mmitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Message Membership" ));
- GtkMenuItem* fnitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Folder Rename" ));
- GtkMenuItem* accountitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Account" ));
- GtkMenuItem* helpitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Help" ));
- GtkWidget* sepitem = gtk_separator_menu_item_new();
- GtkMenuItem* closeitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Close" ));
- gtk_menu_shell_append( GTK_MENU_SHELL(appmenu), GTK_WIDGET(mmitem) );
- gtk_menu_shell_append( GTK_MENU_SHELL(appmenu), GTK_WIDGET(fnitem) );
- gtk_menu_shell_append( GTK_MENU_SHELL(appmenu), GTK_WIDGET(accountitem) );
- gtk_menu_shell_append( GTK_MENU_SHELL(appmenu), GTK_WIDGET(helpitem) );
- gtk_menu_shell_append( GTK_MENU_SHELL(appmenu), GTK_WIDGET(sepitem) );
- gtk_menu_shell_append( GTK_MENU_SHELL(appmenu), GTK_WIDGET(closeitem) );*/
-
+
GtkWidget* rdobtnbox = gtk_vbox_new(FALSE, 0) ;
GtkWidget *rdo_btn = NULL;
GSList *rdo_btn_group;
@@ -282,7 +269,7 @@
else
rdo_btn = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (rdo_btn), folder);
priv->rdoBtnList = g_slist_append (priv->rdoBtnList,rdo_btn);
- g_signal_connect (G_OBJECT(rdo_btn), "released", G_CALLBACK (membeship_rdo_btn_clicked), self);
+ g_signal_connect (G_OBJECT(rdo_btn), "released", G_CALLBACK (membership_rdo_btn_clicked), self);
gtk_box_pack_start (GTK_BOX (rdobtnbox), rdo_btn, FALSE, TRUE, 0);
}
@@ -363,10 +350,14 @@
gchar* folder;
gtk_tree_model_get (model, iter, COLUMN_FOLDER, &folder, -1);
- if(!g_strcasecmp(folder,self->currentfolder))
+ if(!g_strcasecmp(folder,self->currentfolder)){
+ g_free (folder);
return TRUE;
- else
+ }
+ else{
+ g_free (folder);
return FALSE;
+ }
}
void sms_membership_window_set_messages (SmsMembershipWindow* self,
More information about the commitlog
mailing list
