From fc177ec09903f18845177968321e9d72d4e12a03 Mon Sep 17 00:00:00 2001 From: Javier Fernandez Garcia-Boente Date: Wed, 20 Jun 2007 07:12:04 +0000 Subject: [PATCH] * Fixes: NB#59203 pmo-trunk-r2322 --- src/maemo/modest-main-window.c | 2 +- src/modest-tny-send-queue.c | 52 ++++++++++++++++++++-------------------- src/modest-ui-actions.c | 2 +- src/modest-ui-dimming-rules.c | 6 ++--- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 32f6b89..5be7081 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -212,7 +212,7 @@ static const GtkActionEntry modest_folder_view_action_entries [] = { /* Folder View CSM actions */ { "FolderViewCSMNewFolder", NULL, N_("mcen_ti_new_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) }, { "FolderViewCSMRenameFolder", NULL, N_("mcen_me_user_renamefolder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, - { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, NULL }, + { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_paste)}, { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) }, { "FolderViewCSMSearchMessages", NULL, N_("mcen_me_inbox_search"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_search_messages) }, { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) }, diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index d3c5db9..390f7e3 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -43,7 +43,7 @@ static void modest_tny_send_queue_finalize (GObject *obj); static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class); /* Signal handlers */ -static void _on_msg_start_sending (TnySendQueue *self, TnyMsg *msg, gpointer user_data); +/* static void _on_msg_start_sending (TnySendQueue *self, TnyMsg *msg, gpointer user_data); */ static void _on_msg_has_been_sent (TnySendQueue *self, TnyMsg *msg, gpointer user_data); static void _on_msg_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data); @@ -308,11 +308,11 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account) /* Connect signals to control when a msg is being or has been sent */ /* TODO: this signal was implemented in tinymail camel send queue, but im waiting for implement some unit tests nbefore commited changes */ - if (FALSE) { - g_signal_connect (G_OBJECT(self), "msg-sending", - G_CALLBACK(_on_msg_start_sending), - NULL); - } +/* if (FALSE) { */ +/* g_signal_connect (G_OBJECT(self), "msg-sending", */ +/* G_CALLBACK(_on_msg_start_sending), */ +/* NULL); */ +/* } */ g_signal_connect (G_OBJECT(self), "msg-sent", G_CALLBACK(_on_msg_has_been_sent), @@ -363,31 +363,31 @@ modest_tny_send_queue_get_msg_status (ModestTnySendQueue *self, const gchar *msg return ((SendInfo*)item->data)->status; } -static void -_on_msg_start_sending (TnySendQueue *self, - TnyMsg *msg, - gpointer user_data) -{ - ModestTnySendQueuePrivate *priv; - TnyHeader *header; - GList *item; - SendInfo *info; +/* static void */ +/* _on_msg_start_sending (TnySendQueue *self, */ +/* TnyMsg *msg, */ +/* gpointer user_data) */ +/* { */ +/* ModestTnySendQueuePrivate *priv; */ +/* TnyHeader *header; */ +/* GList *item; */ +/* SendInfo *info; */ - priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); +/* priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); */ - header = tny_msg_get_header(msg); - item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header)); +/* header = tny_msg_get_header(msg); */ +/* item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header)); */ - if (item != NULL) - { - info = item->data; - info->status = MODEST_TNY_SEND_QUEUE_SENDING; +/* if (item != NULL) */ +/* { */ +/* info = item->data; */ +/* info->status = MODEST_TNY_SEND_QUEUE_SENDING; */ - g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); - } +/* g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); */ +/* } */ - priv->current = item; -} +/* priv->current = item; */ +/* } */ static void _on_msg_has_been_sent (TnySendQueue *self, diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 2079d84..a8294d6 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -1206,7 +1206,7 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view, return; /* Update Main window title */ - if (GTK_WIDGET_HAS_FOCUS (header_view)) { + if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { const gchar *subject = tny_header_get_subject (header); if (subject && strlen(subject) > 0) gtk_window_set_title (GTK_WINDOW (main_window), subject); diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index f02ed03..3a78d2b 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -1029,9 +1029,9 @@ _invalid_msg_selected (ModestMainWindow *win, /* Check dimmed rule (TODO: check focus on widgets */ if (!result) { - result = (selected_headers == NULL); -/* result = ((selected_headers == NULL) || */ -/* (GTK_WIDGET_HAS_FOCUS (folder_view))); */ +/* result = (selected_headers == NULL); */ + result = ((selected_headers == NULL) || + (gtk_widget_is_focus (folder_view))); if (result) modest_dimming_rule_set_notification (rule, _("mcen_ib_no_message_selected")); } -- 1.7.9.5