[anjal] Fix warnings in mail message view
- From: Srinivasa Ragavan <sragavan src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjal] Fix warnings in mail message view
- Date: Fri, 29 May 2009 08:00:33 -0400 (EDT)
commit 0bef11857335063d33baf6366f93e4b578e49e63
Author: Srinivasa Ragavan <sragavan novell com>
Date: Fri May 29 10:13:20 2009 +0530
Fix warnings in mail message view
---
src/em-format-webkit.h | 2 +-
src/mail-message-view.c | 242 ++++++++++++++++++++++-------------------------
2 files changed, 115 insertions(+), 129 deletions(-)
diff --git a/src/em-format-webkit.h b/src/em-format-webkit.h
index cae7d45..40c5bed 100644
--- a/src/em-format-webkit.h
+++ b/src/em-format-webkit.h
@@ -244,5 +244,5 @@ void em_format_webkit_clear_pobject(EMFormatWebKit *emf);
EMFormatWebKitJob *em_format_webkit_job_new(EMFormatWebKit *emfh, void (*callback)(struct _EMFormatWebKitJob *job, int cancelled), void *data)
;
void em_format_webkit_job_queue(EMFormatWebKit *emfh, struct _EMFormatWebKitJob *job);
-
+void em_format_webkit_set_message_view (EMFormatWebKit *efw, struct _MailMessageView *mmv, GtkWidget *body);
#endif /* ! EM_FORMAT_WEBKIT_H */
diff --git a/src/mail-message-view.c b/src/mail-message-view.c
index aa26466..f8841ae 100644
--- a/src/mail-message-view.c
+++ b/src/mail-message-view.c
@@ -42,12 +42,19 @@
#include "e-util/e-icon-factory.h"
#include "mail/em-composer-utils.h"
#include "mail-shell.h"
+#include <math.h>
+#include <e-util/e-util.h>
+#include <composer/e-composer-header-table.h>
extern char *scolor_norm;
extern char *scolor_sel;
extern GdkColor *pcolor_fg_norm;
extern GdkColor *pcolor_fg_sel;
extern char *unread_image;
+struct _MailComposerView;
+
+void e_msg_composer_set_lite (void);
+void mail_composer_view_replace_composer (struct _MailComposerView *, GtkWidget *composer);
struct _MailMessageViewPrivate {
CamelFolder *folder;
@@ -68,16 +75,6 @@ struct _MailMessageViewPrivate {
CamelOperation *cancel;
};
-typedef enum {
- E_COMPOSER_HEADER_FROM,
- E_COMPOSER_HEADER_TO,
- E_COMPOSER_HEADER_CC,
- E_COMPOSER_HEADER_BCC,
- E_COMPOSER_HEADER_ACTIONS,
- E_COMPOSER_HEADER_SUBJECT,
- E_COMPOSER_NUM_HEADERS
-} EComposerHeaderType;
-
G_DEFINE_TYPE (MailMessageView, mail_message_view, GTK_TYPE_VBOX)
struct _EComposerHeaderTable *e_msg_composer_get_header_table (struct _EMsgComposer *);
@@ -92,10 +89,10 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
-
+#if NOT_USED
static const char *norm_color = "#d3d7cf";
static const char *sel_color = "#729fcf";
-
+#endif
static void unread_toggled (GtkWidget *w, GdkEventButton *event, MailMessageView *mmv);
static void
@@ -121,7 +118,7 @@ mail_message_view_finalize (GObject *object)
if (shell->composer)
gtk_widget_destroy (shell->composer);
g_object_unref (shell->efwd);
- g_free (priv->uid);
+ g_free ((char *)priv->uid);
g_free (priv->normal[0]);
g_free (priv->normal[1]);
g_free (priv->bold[0]);
@@ -184,12 +181,12 @@ mmv_message_opened(CamelFolder *folder, const char *uid, CamelMimeMessage *msg,
MailMessageView *shell = (MailMessageView *)data;
shell->priv->cancel = NULL;
mail_indicate_new_mail (FALSE);
- em_format_webkit_set_message_view (shell->efwd, shell, shell->body);
+ em_format_webkit_set_message_view ((EMFormatWebKit *)shell->efwd, shell, shell->body);
em_format_format((EMFormat *)shell->efwd, folder, uid, msg);
shell->priv->msg = msg;
gtk_widget_hide (shell->priv->spinner);
gdk_window_invalidate_rect (((GtkWidget *)shell)->window, NULL, TRUE);
- gtk_widget_queue_draw (shell);
+ gtk_widget_queue_draw ((GtkWidget *)shell);
}
static void
@@ -237,15 +234,15 @@ mmv_show (MailMessageView *mmv)
gtk_widget_show_all (mmv->footer);
gtk_widget_hide (mmv->discard);
gtk_widget_hide (mmv->pop_out);
- gtk_arrow_set (mmv->priv->arrow, GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+ gtk_arrow_set ((GtkArrow *)mmv->priv->arrow, GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gdk_window_invalidate_rect (((GtkWidget *)mmv)->window, NULL, TRUE);
- gtk_widget_queue_draw (mmv);
+ gtk_widget_queue_draw ((GtkWidget *)mmv);
}
static void
mmv_hide (MailMessageView *mmv)
{
- gtk_arrow_set (mmv->priv->arrow, GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ gtk_arrow_set ((GtkArrow *)mmv->priv->arrow, GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
gtk_widget_hide (mmv->body);
gtk_widget_hide_all (mmv->footer);
gtk_widget_hide (mmv->frame);
@@ -255,10 +252,10 @@ mmv_hide (MailMessageView *mmv)
gtk_widget_hide (mmv->comp_view);
if (GTK_WIDGET_VISIBLE(mmv->main_header)) {
gtk_widget_hide (mmv->main_header);
- gtk_label_set_markup (mmv->more_details, _("<u>show details</u>"));
+ gtk_label_set_markup ((GtkLabel *)mmv->more_details, _("<u>show details</u>"));
}
gdk_window_invalidate_rect (((GtkWidget *)mmv)->window, NULL, TRUE);
- gtk_widget_queue_draw (mmv);
+ gtk_widget_queue_draw ((GtkWidget *)mmv);
}
static void
@@ -281,34 +278,34 @@ static void
mmv_delete (MailMessageView *mmv, gboolean del)
{
if (del) {
- camel_message_info_set_flags(mmv->priv->info, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED );
+ camel_message_info_set_flags((CamelMessageInfo *)mmv->priv->info, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED );
g_signal_emit (mmv, signals[MESSAGE_REMOVED], 0);
} else
- camel_message_info_set_flags(mmv->priv->info, CAMEL_MESSAGE_DELETED, 0 );
+ camel_message_info_set_flags((CamelMessageInfo *)mmv->priv->info, CAMEL_MESSAGE_DELETED, 0 );
}
static void
mmv_junk (MailMessageView *mmv, gboolean junk)
{
if (junk)
- camel_message_info_set_flags(mmv->priv->info, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_JUNK_LEARN);
+ camel_message_info_set_flags((CamelMessageInfo *)mmv->priv->info, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_JUNK_LEARN);
else
- camel_message_info_set_flags(mmv->priv->info, CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN, CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN);
+ camel_message_info_set_flags((CamelMessageInfo *)mmv->priv->info, CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN, CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN);
}
static void
mmv_read (MailMessageView *mmv, gboolean read)
{
if (read) {
- camel_message_info_set_flags(mmv->priv->info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
+ camel_message_info_set_flags((CamelMessageInfo *)mmv->priv->info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
gtk_widget_set_sensitive (mmv->priv->unread_image, FALSE);
- gtk_label_set_markup (mmv->sub_details, mmv->priv->normal[0]);
- gtk_label_set_markup (mmv->date_details, mmv->priv->normal[1]);
+ gtk_label_set_markup ((GtkLabel *)mmv->sub_details, mmv->priv->normal[0]);
+ gtk_label_set_markup ((GtkLabel *)mmv->date_details, mmv->priv->normal[1]);
} else {
- camel_message_info_set_flags(mmv->priv->info, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, 0);
+ camel_message_info_set_flags((CamelMessageInfo *)mmv->priv->info, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, 0);
gtk_widget_set_sensitive (mmv->priv->unread_image, TRUE);
- gtk_label_set_markup (mmv->sub_details, mmv->priv->bold[0]);
- gtk_label_set_markup (mmv->date_details, mmv->priv->bold[1]);
+ gtk_label_set_markup ((GtkLabel *)mmv->sub_details, mmv->priv->bold[0]);
+ gtk_label_set_markup ((GtkLabel *)mmv->date_details, mmv->priv->bold[1]);
}
}
@@ -326,7 +323,7 @@ mmv_key_press (GtkWidget *w, GdkEventKey *event, MailMessageView *mmv)
case GDK_Right:
if (event->state & GDK_SHIFT_MASK) {
if (!GTK_WIDGET_VISIBLE(mmv->main_header)) {
- gtk_label_set_markup (mmv->more_details, _("<u>hide details</u>"));
+ gtk_label_set_markup ((GtkLabel *)mmv->more_details, _("<u>hide details</u>"));
gtk_widget_show (mmv->main_header);
}
break;
@@ -339,7 +336,7 @@ mmv_key_press (GtkWidget *w, GdkEventKey *event, MailMessageView *mmv)
if (event->state & GDK_SHIFT_MASK) {
if (GTK_WIDGET_VISIBLE(mmv->main_header)) {
gtk_widget_hide (mmv->main_header);
- gtk_label_set_markup (mmv->more_details, _("<u>show details</u>"));
+ gtk_label_set_markup ((GtkLabel *)mmv->more_details, _("<u>show details</u>"));
}
break;
}
@@ -407,16 +404,17 @@ popout_composer_cb (GtkWidget *w, MailMessageView *mmv)
gtk_widget_hide (mmv->discard);
gtk_widget_hide (mmv->pop_out);
mcv = mail_shell_create_composer ();
- mail_composer_view_replace_composer (mcv, mmv->composer);
+ mail_composer_view_replace_composer ((struct _MailComposerView *)mcv, mmv->composer);
mmv->frame = gtk_frame_new (NULL);
mmv->cbox = gtk_hbox_new (FALSE, 0);
- gtk_frame_set_shadow_type (mmv->frame, GTK_SHADOW_IN);
+ gtk_frame_set_shadow_type ((GtkFrame *)mmv->frame, GTK_SHADOW_IN);
mmv->composer = NULL;
mmv->comp_view = NULL;
/* FIXME: Destroy the composer in here */
}
+#ifdef NOT_USED
static gboolean
key_press_cb (GtkWidget *w, GdkEventKey *event, gpointer web)
{
@@ -432,13 +430,12 @@ key_press_cb (GtkWidget *w, GdkEventKey *event, gpointer web)
}
return FALSE;
}
+#endif
static void
construct_reply_composer (MailMessageView *mmv, int mode)
{
- MailEditor *editor;
struct _EComposerHeaderTable *table;
- WebKitWebView *web_view;
e_msg_composer_set_lite();
@@ -446,8 +443,8 @@ construct_reply_composer (MailMessageView *mmv, int mode)
GtkWidget *box = gtk_vbox_new (FALSE, 0);
gtk_widget_show(box);
- mmv->composer = (struct _EMsgComposer *)em_utils_reply_to_message (mmv->priv->folder, mmv->priv->uid, mmv->priv->msg, mode, NULL);
- mmv->comp_view = g_object_get_data(mmv->composer,"vbox");
+ mmv->composer = (GtkWidget *)em_utils_reply_to_message (mmv->priv->folder, mmv->priv->uid, mmv->priv->msg, mode, NULL);
+ mmv->comp_view = g_object_get_data((GObject *)mmv->composer,"vbox");
gtk_widget_reparent (mmv->comp_view, box);
gtk_widget_set_size_request (mmv->comp_view, -1, 400);
@@ -459,13 +456,13 @@ construct_reply_composer (MailMessageView *mmv, int mode)
/* Hide most of the basic headers. We'll add an option for enabling them later.
Our objective is to make the inline composer as sleek as it can get.
*/
- table = e_msg_composer_get_header_table (mmv->composer);
+ table = e_msg_composer_get_header_table ((struct _EMsgComposer *)mmv->composer);
e_composer_header_table_set_header_visible (table, E_COMPOSER_HEADER_FROM, FALSE);
e_composer_header_table_set_header_visible (table, E_COMPOSER_HEADER_SUBJECT, FALSE);
- gtk_container_add (mmv->frame, box);
- gtk_box_pack_start (mmv->cbox, mmv->frame, TRUE, TRUE, 36);
- gtk_box_pack_start (mmv, mmv->cbox, FALSE, FALSE, 6);
- g_signal_connect (mmv->composer, "send", mmv_mail_send, mmv);
+ gtk_container_add ((GtkContainer *)mmv->frame, box);
+ gtk_box_pack_start ((GtkBox *)mmv->cbox, mmv->frame, TRUE, TRUE, 36);
+ gtk_box_pack_start ((GtkBox *)mmv, mmv->cbox, FALSE, FALSE, 6);
+ g_signal_connect (mmv->composer, "send", G_CALLBACK(mmv_mail_send), mmv);
}
gtk_widget_show (mmv->discard);
gtk_widget_show (mmv->pop_out);
@@ -498,11 +495,11 @@ static void
more_details_cb (GtkWidget *w, GdkEventButton *event, MailMessageView *mmv)
{
if (!GTK_WIDGET_VISIBLE(mmv->main_header)) {
- gtk_label_set_markup (mmv->more_details, _("<u>hide details</u>"));
+ gtk_label_set_markup ((GtkLabel *)mmv->more_details, _("<u>hide details</u>"));
gtk_widget_show (mmv->main_header);
} else {
gtk_widget_hide (mmv->main_header);
- gtk_label_set_markup (mmv->more_details, _("<u>show details</u>"));
+ gtk_label_set_markup ((GtkLabel *)mmv->more_details, _("<u>show details</u>"));
}
}
@@ -571,7 +568,7 @@ filter_date (time_t date)
static void
mmv_set_flags (MailMessageView *mmv, guint32 mask, guint32 set)
{
- camel_message_info_set_flags(mmv->priv->info, mask, set);
+ camel_message_info_set_flags((CamelMessageInfo *)mmv->priv->info, mask, set);
}
static int
@@ -580,8 +577,8 @@ mark_mail_read (GtkWidget *w, GdkEventExpose *event, MailMessageView *mmv)
if ((mmv->priv->info->flags & CAMEL_MESSAGE_SEEN) == 0)
mmv_set_flags (mmv, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
gtk_widget_set_sensitive (mmv->priv->unread_image, FALSE);
- gtk_label_set_markup (mmv->sub_details, mmv->priv->normal[0]);
- gtk_label_set_markup (mmv->date_details, mmv->priv->normal[1]);
+ gtk_label_set_markup ((GtkLabel *)mmv->sub_details, mmv->priv->normal[0]);
+ gtk_label_set_markup ((GtkLabel *)mmv->date_details, mmv->priv->normal[1]);
g_signal_handlers_disconnect_by_func(w, mark_mail_read, mmv);
return FALSE;
@@ -593,12 +590,12 @@ mmv_finished_loading_webkit (WebKitWebView *webkitwebview, WebKitWebFrame *arg1
{
MailMessageView *mmview = (MailMessageView *) user_data;
gtk_widget_hide(mmview->priv->spinner);
- gtk_widget_set_size_request (webkitwebview, -1, webkit_web_frame_get_height(arg1));
+ gtk_widget_set_size_request ((GtkWidget *)webkitwebview, -1, webkit_web_frame_get_height(arg1));
/* Connect on expose, and mark mail as read on expose, when the mail is actually seen */
- g_signal_connect (webkitwebview, "expose-event" , mark_mail_read, mmview);
+ g_signal_connect (webkitwebview, "expose-event" , G_CALLBACK(mark_mail_read), mmview);
g_signal_emit (mmview, signals[MESSAGE_LOADED], 0);
gdk_window_invalidate_rect (((GtkWidget *)mmview)->window, NULL, TRUE);
- gtk_widget_queue_draw (mmview);
+ gtk_widget_queue_draw ((GtkWidget *)mmview);
}
@@ -606,7 +603,7 @@ static void
mmv_finished_webkit (WebKitWebView *webkitwebview, WebKitWebFrame *arg1, gpointer user_data)
{
MailMessageView *mmview = (MailMessageView *) user_data;
- gtk_label_set_text (mmview->priv->spinner_label, _("Formatting message"));
+ gtk_label_set_text ((GtkLabel *)mmview->priv->spinner_label, _("Formatting message"));
gtk_widget_show(mmview->priv->spinner);
}
#endif
@@ -691,7 +688,6 @@ draw_rounded_rectangle (cairo_t *cr, gdouble x, gdouble y, gdouble width, gdoubl
static int
mmv_arrow_expose (GtkWidget *widget, GdkEventExpose *event, MailMessageView *mmv)
{
- GtkArrow *arrow = (GtkArrow *)widget;
if (GTK_WIDGET_DRAWABLE (widget)) {
GtkArrow *arrow = GTK_ARROW (widget);
GtkMisc *misc = GTK_MISC (widget);
@@ -751,12 +747,7 @@ mmv_arrow_expose (GtkWidget *widget, GdkEventExpose *event, MailMessageView *mmv
if (1) {
GdkWindow *window = widget->window;
GdkRectangle *area = &event->area;
- GtkStateType state = widget->state;
- GtkStyle *style = widget->style;
- GtkShadowType shadow = shadow_type;
- const gchar *detail = "arrow";
GtkArrowType arrow_type = effective_arrow_type;
- gboolean fill = TRUE;
width = height = extent;
cairo_t *cr = gdk_cairo_create (window);
gdk_cairo_set_source_color (cr, active ? pcolor_fg_sel : pcolor_fg_norm);
@@ -808,9 +799,7 @@ mmv_foot_color_expose (GtkWidget *w, GdkEventExpose *event, GtkWidget *widget)
cairo_t *cr = gdk_cairo_create (widget->window);
int wid = w->allocation.width;
int heig = w->allocation.height;
- GtkStyle *style = gtk_widget_get_default_style ();
GdkColor colr;
- GdkRectangle rect = {0, 0, wid, heig};
gdk_color_parse ("#edd400", &colr);
gdk_cairo_set_source_color (cr, &colr);
@@ -830,7 +819,6 @@ mmv_sh_color_expose (GtkWidget *w, GdkEventExpose *event, MailMessageView *mmv)
cairo_t *cr = gdk_cairo_create (w->window);
int wid = w->allocation.width;
int heig = w->allocation.height;
- GtkStyle *style = gtk_widget_get_default_style ();
GdkColor colr;
gdk_color_parse (mmv->priv->active_color, &colr);
@@ -852,16 +840,16 @@ mmv_sh_color_expose (GtkWidget *w, GdkEventExpose *event, MailMessageView *mmv)
GtkWidget *
mmv_create_webview (MailMessageView *mmv, GtkWidget *box)
{
- WebKitWebView *web = webkit_web_view_new ();
+ WebKitWebView *web = (WebKitWebView *)webkit_web_view_new ();
g_signal_connect (web, "load-started", G_CALLBACK(mmv_finished_webkit), mmv);
g_signal_connect (web, "load-finished", G_CALLBACK(mmv_finished_loading_webkit), mmv);
- gtk_box_pack_start (box, web, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)box, (GtkWidget *)web, FALSE, FALSE, 0);
webkit_web_view_set_editable (web, FALSE);
- gtk_widget_show (web);
+ gtk_widget_show ((GtkWidget *)web);
- return web;
+ return (GtkWidget *)web;
}
#endif
@@ -874,7 +862,7 @@ mmv_create_mozview (MailMessageView *mmv, GtkWidget *box)
g_signal_connect (web, "net_stop", mmv_finished_mozilla, mmv);
- gtk_box_pack_start (box, web, TRUE, TRUE, 0);
+ gtk_box_pack_start (GtkBox *)(box, web, TRUE, TRUE, 0);
gtk_widget_show (web);
return web;
@@ -905,7 +893,7 @@ get_current_renderer()
{
if (!current_renderer) {
int i, len = G_N_ELEMENTS (web_renderers);
- char *rend = g_getenv("ANJAL_RENDERER");
+ char *rend = (char *)g_getenv("ANJAL_RENDERER");
if (len == 0)
g_assert(0);
@@ -965,13 +953,13 @@ unread_toggled (GtkWidget *w, GdkEventButton *event, MailMessageView *mmv)
if (camel_message_info_flags(mmv->priv->info) & CAMEL_MESSAGE_SEEN) {
mmv_set_flags(mmv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, 0);
gtk_widget_set_sensitive (mmv->priv->unread_image, TRUE);
- gtk_label_set_markup (mmv->sub_details, mmv->priv->bold[0]);
- gtk_label_set_markup (mmv->date_details, mmv->priv->bold[1]);
+ gtk_label_set_markup ((GtkLabel *)mmv->sub_details, mmv->priv->bold[0]);
+ gtk_label_set_markup ((GtkLabel *)mmv->date_details, mmv->priv->bold[1]);
} else {
mmv_set_flags(mmv, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
gtk_widget_set_sensitive (mmv->priv->unread_image, FALSE);
- gtk_label_set_markup (mmv->sub_details, mmv->priv->normal[0]);
- gtk_label_set_markup (mmv->date_details, mmv->priv->normal[1]);
+ gtk_label_set_markup ((GtkLabel *)mmv->sub_details, mmv->priv->normal[0]);
+ gtk_label_set_markup ((GtkLabel *)mmv->date_details, mmv->priv->normal[1]);
}
}
@@ -1017,7 +1005,7 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
GdkPixbuf *img;
CamelMessageInfoBase *info;
GtkWidget *box, *header_row, *details_row;
- GtkWidget *reply, *reply_all, *forward, *discard;
+ GtkWidget *reply, *reply_all, *forward;
char *str ,**strv;
gchar *boldmsg, *header_text;
@@ -1038,73 +1026,73 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
//gtk_container_set_focus_child (mmview, mmview->short_header);
g_signal_connect (mmview->short_header, "button-press-event", G_CALLBACK(mmv_collapse_view), mmview);
- info = camel_folder_get_message_info (folder, uid);
+ info = (CamelMessageInfoBase *)camel_folder_get_message_info (folder, uid);
mmview->priv->info = info;
header_row = gtk_hbox_new (FALSE, 0);
- gtk_container_add (mmview->short_header, header_row);
+ gtk_container_add ((GtkContainer *)mmview->short_header, header_row);
gtk_widget_show (header_row);
gtk_widget_set_size_request (header_row, -1, 28);
- gtk_box_pack_start (box, mmview->short_header, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)box, mmview->short_header, FALSE, FALSE, 0);
details_row = gtk_hbox_new (FALSE, 0);
gtk_widget_show (details_row);
- gtk_box_pack_start (box, details_row, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)box, details_row, FALSE, FALSE, 0);
// gtk_container_add (mmview->short_header, box);
/* To draw focus */
mmview->priv->focus = gtk_button_new (); gtk_widget_show (mmview->priv->focus);
- g_signal_connect (mmview->priv->focus, "focus-out-event", mmv_focus_out, mmview);
- g_signal_connect (mmview->priv->focus, "focus-in-event", mmv_focus_in, mmview);
- g_signal_connect (mmview->priv->focus, "key-press-event", mmv_key_press, mmview);
+ g_signal_connect (mmview->priv->focus, "focus-out-event", G_CALLBACK(mmv_focus_out), mmview);
+ g_signal_connect (mmview->priv->focus, "focus-in-event", G_CALLBACK(mmv_focus_in), mmview);
+ g_signal_connect (mmview->priv->focus, "key-press-event", G_CALLBACK(mmv_key_press), mmview);
gtk_widget_set_size_request (mmview->priv->focus, 0, 0);
- gtk_box_pack_start (header_row, mmview->priv->focus, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)header_row, mmview->priv->focus, FALSE, FALSE, 0);
mmview->priv->header_row = header_row;
EXPOSE(header_row, mmview);
mmview->priv->arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
gtk_widget_show (mmview->priv->arrow);
- gtk_box_pack_start (header_row, mmview->priv->arrow, FALSE, FALSE, 2);
+ gtk_box_pack_start ((GtkBox *)header_row, mmview->priv->arrow, FALSE, FALSE, 2);
g_signal_connect (mmview->priv->arrow, "expose-event", G_CALLBACK(mmv_arrow_expose), mmview);
tmp = gtk_event_box_new ();
EXPOSE(tmp, mmview);
mmview->priv->unread_image = gtk_image_new ();
EXPOSE(mmview->priv->unread_image, mmview);
- gtk_image_set_from_pixbuf (mmview->priv->unread_image, gdk_pixbuf_new_from_file(unread_image, NULL));
+ gtk_image_set_from_pixbuf ((GtkImage *)mmview->priv->unread_image, gdk_pixbuf_new_from_file(unread_image, NULL));
gtk_widget_show (mmview->priv->unread_image);
if (camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN)
gtk_widget_set_sensitive (mmview->priv->unread_image, FALSE);
gtk_widget_show (tmp);
- gtk_container_add (tmp, mmview->priv->unread_image);
- gtk_box_pack_start (header_row, tmp, FALSE, FALSE, 2);
+ gtk_container_add ((GtkContainer *)tmp, mmview->priv->unread_image);
+ gtk_box_pack_start ((GtkBox *)header_row, tmp, FALSE, FALSE, 2);
g_signal_connect (tmp, "button-press-event", G_CALLBACK(unread_toggled), mmview);
g_signal_connect (tmp, "enter-notify-event", G_CALLBACK(unread_enter), mmview);
g_signal_connect (tmp, "leave-notify-event", G_CALLBACK(unread_leave), mmview);
- str = camel_message_info_from(info);
+ str = (char *)camel_message_info_from(info);
strv = g_strsplit (str, "<", 2);
mmview->priv->normal[0] = g_strdup_printf("%s - %s", *strv, camel_message_info_subject(info));
mmview->priv->bold[0] = g_strdup_printf("<b>%s - %s</b>", *strv, camel_message_info_subject(info));
tmp = gtk_label_new (NULL);
gtk_widget_modify_fg (tmp, GTK_STATE_NORMAL, pcolor_fg_norm);
- gtk_label_set_ellipsize (tmp, PANGO_ELLIPSIZE_END);
- gtk_label_set_max_width_chars (tmp, 75);
+ gtk_label_set_ellipsize ((GtkLabel *)tmp, PANGO_ELLIPSIZE_END);
+ gtk_label_set_max_width_chars ((GtkLabel *)tmp, 75);
mmview->sub_details = tmp;
gtk_widget_show(tmp);
if (camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN)
- gtk_label_set_markup (mmview->sub_details, mmview->priv->normal[0]);
+ gtk_label_set_markup ((GtkLabel *)mmview->sub_details, mmview->priv->normal[0]);
else
- gtk_label_set_markup (mmview->sub_details, mmview->priv->bold[0]);
+ gtk_label_set_markup ((GtkLabel *)mmview->sub_details, mmview->priv->bold[0]);
- gtk_box_pack_start (header_row, tmp, FALSE, FALSE, 2);
+ gtk_box_pack_start ((GtkBox *)header_row, tmp, FALSE, FALSE, 2);
menu = gtk_button_new ();
g_object_set (menu, "focus-on-click", FALSE, NULL);
- gtk_container_add (menu, gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_ETCHED_OUT));
+ gtk_container_add ((GtkContainer *)menu, gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_ETCHED_OUT));
gtk_widget_show_all (menu);
/* gtk_box_pack_end (header_row, menu, FALSE, FALSE, 2); */
/*
@@ -1122,35 +1110,35 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
gtk_widget_modify_fg (tmp, GTK_STATE_NORMAL, pcolor_fg_norm);
mmview->date_details = tmp;
gtk_widget_show(tmp);
- gtk_box_pack_end (header_row, tmp, FALSE, FALSE, 6);
+ gtk_box_pack_end ((GtkBox *)header_row, tmp, FALSE, FALSE, 6);
if (camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN)
- gtk_label_set_markup (mmview->date_details, mmview->priv->normal[1]);
+ gtk_label_set_markup ((GtkLabel *)mmview->date_details, mmview->priv->normal[1]);
else
- gtk_label_set_markup (mmview->date_details, mmview->priv->bold[1]);
+ gtk_label_set_markup ((GtkLabel *)mmview->date_details, mmview->priv->bold[1]);
mmview->details_event = gtk_event_box_new ();
g_signal_connect (mmview->details_event, "button-press-event", G_CALLBACK(more_details_cb), mmview);
mmview->more_details = gtk_label_new (_("<u>show details</u>"));
gtk_widget_modify_fg (mmview->more_details, GTK_STATE_NORMAL, pcolor_fg_norm);
- gtk_container_add (mmview->details_event, mmview->more_details);
+ gtk_container_add ((GtkContainer *)mmview->details_event, mmview->more_details);
gtk_label_set_use_markup (GTK_LABEL (mmview->more_details), TRUE);
EXPOSE(mmview->more_details, mmview);
- gtk_box_pack_end (header_row, mmview->details_event, FALSE, FALSE, 12);
+ gtk_box_pack_end ((GtkBox *)header_row, mmview->details_event, FALSE, FALSE, 12);
gtk_widget_show_all (mmview->details_event);
gtk_widget_show(mmview->short_header);
- gtk_box_pack_start (mmview, box, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)mmview, box, FALSE, FALSE, 0);
/* Full Headers */
table = (GtkTable *) gtk_table_new (1, 2, FALSE);
- mmview->main_header = (GtkVBox *) gtk_hbox_new (FALSE, 12);
+ mmview->main_header = gtk_hbox_new (FALSE, 12);
tmp = gtk_image_new_from_icon_name ("stock_person", GTK_ICON_SIZE_DIALOG);
gtk_widget_show(tmp);
- gtk_box_pack_start (GTK_BOX (mmview->main_header), tmp, FALSE, FALSE, 3);
+ gtk_box_pack_start ((GtkBox *)GTK_BOX (mmview->main_header), tmp, FALSE, FALSE, 3);
- gtk_box_pack_start (GTK_BOX (mmview->main_header), GTK_WIDGET (table), TRUE, TRUE, 3);
+ gtk_box_pack_start ((GtkBox *)GTK_BOX (mmview->main_header), GTK_WIDGET (table), TRUE, TRUE, 3);
gtk_table_set_col_spacings (table ,12);
gtk_table_set_row_spacings (table, 6);
@@ -1162,7 +1150,7 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5);
gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
gtk_table_attach (table, widget , 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
- str = camel_message_info_from(info);
+ str = (char *)camel_message_info_from(info);
widget = gtk_label_new (*strv);
gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
gtk_table_attach (table, widget , 1, 2, row, row + 1, GTK_FILL|GTK_EXPAND, 0, 0, 0);
@@ -1182,7 +1170,7 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
row++;
/* The Cc field */
- header_text = camel_message_info_cc(info);
+ header_text = (char *)camel_message_info_cc(info);
if (header_text) {
boldmsg = g_strdup_printf ("<b>%s</b>", _("Cc:"));
widget = gtk_label_new (boldmsg);
@@ -1213,25 +1201,25 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
/* Delete / junk buttons */
vbox = gtk_vbox_new (FALSE, 2);
- gtk_box_pack_end (mmview->main_header, vbox, FALSE, FALSE, 0);
+ gtk_box_pack_end ((GtkBox *)mmview->main_header, vbox, FALSE, FALSE, 0);
tmp = gtk_button_new ();
g_object_set (tmp, "focus-on-click", FALSE, NULL);
g_signal_connect (tmp, "clicked", G_CALLBACK(delete_clicked), mmview);
- gtk_button_set_relief(tmp, GTK_RELIEF_NONE);
+ gtk_button_set_relief((GtkButton *)tmp, GTK_RELIEF_NONE);
img = e_icon_factory_get_icon ("stock_delete", E_ICON_SIZE_BUTTON);
- gtk_button_set_label (tmp, _("Delete"));
- gtk_button_set_image (tmp, gtk_image_new_from_pixbuf(img));
- gtk_box_pack_start (vbox, tmp, FALSE, FALSE, 0);
+ gtk_button_set_label ((GtkButton *)tmp, _("Delete"));
+ gtk_button_set_image ((GtkButton *)tmp, gtk_image_new_from_pixbuf(img));
+ gtk_box_pack_start ((GtkBox *)vbox, tmp, FALSE, FALSE, 0);
tmp = gtk_button_new ();
g_object_set (tmp, "focus-on-click", FALSE, NULL);
g_signal_connect (tmp, "clicked", G_CALLBACK(junk_clicked), mmview);
- gtk_button_set_relief(tmp, GTK_RELIEF_NONE);
+ gtk_button_set_relief((GtkButton *)tmp, GTK_RELIEF_NONE);
img = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_BUTTON);
- gtk_button_set_label (tmp, _("Junk"));
- gtk_button_set_image (tmp, gtk_image_new_from_pixbuf(img));
- gtk_box_pack_start (vbox, tmp, FALSE, FALSE, 0);
+ gtk_button_set_label ((GtkButton *)tmp, _("Junk"));
+ gtk_button_set_image ((GtkButton *)tmp, gtk_image_new_from_pixbuf(img));
+ gtk_box_pack_start ((GtkBox *)vbox, tmp, FALSE, FALSE, 0);
- gtk_box_pack_start (mmview, mmview->main_header, TRUE, TRUE, 0);
+ gtk_box_pack_start ((GtkBox *)mmview, mmview->main_header, TRUE, TRUE, 0);
gtk_widget_show_all (mmview->main_header);
@@ -1247,16 +1235,16 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
tmp = gtk_label_new (_("Downloading message"));
mmview->priv->spinner_label = tmp;
vbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (vbox, e_spinner_new_spinning_small_shown (), FALSE, FALSE, 3);
- gtk_box_pack_start (vbox, tmp, FALSE, FALSE, 3);
+ gtk_box_pack_start ((GtkBox *)vbox, e_spinner_new_spinning_small_shown (), FALSE, FALSE, 3);
+ gtk_box_pack_start ((GtkBox *)vbox, tmp, FALSE, FALSE, 3);
gtk_widget_show(tmp);
gtk_widget_hide (vbox);
mmview->priv->spinner = vbox;
- gtk_box_pack_start (mmview->body, mmview->priv->spinner, FALSE, FALSE, 0);
- gtk_box_pack_start (mmview, mmview->body, FALSE, FALSE, 2);
+ gtk_box_pack_start ((GtkBox *)mmview->body, mmview->priv->spinner, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)mmview, mmview->body, FALSE, FALSE, 2);
mmview->footer = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (mmview, mmview->footer, FALSE, FALSE, 2);
+ gtk_box_pack_start ((GtkBox *)mmview, mmview->footer, FALSE, FALSE, 2);
/* To translators: Reply to the sender. The format is replaced by the
name of the sender.
@@ -1269,39 +1257,39 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
g_strfreev(strv);
g_signal_connect (reply, "clicked", G_CALLBACK (invoke_reply_name_composer_cb), mmview);
// EXPOSE(reply, bgcolor);
- gtk_box_pack_start (mmview->footer, reply, FALSE, FALSE, 12);
+ gtk_box_pack_start ((GtkBox *)mmview->footer, reply, FALSE, FALSE, 12);
reply_all = gtk_button_new_with_label (_("Reply All"));
g_signal_connect (reply_all, "clicked", G_CALLBACK (invoke_reply_all_composer_cb), mmview);
// EXPOSE(reply_all, bgcolor);
- gtk_box_pack_start (mmview->footer, reply_all, FALSE, FALSE, 12);
+ gtk_box_pack_start ((GtkBox *)mmview->footer, reply_all, FALSE, FALSE, 12);
forward = gtk_button_new_with_label (_("Forward"));
g_signal_connect (forward, "clicked", G_CALLBACK (invoke_forward_composer_cb), mmview);
// EXPOSE(forward, bgcolor);
- gtk_box_pack_start (mmview->footer, forward, FALSE, FALSE, 12);
+ gtk_box_pack_start ((GtkBox *)mmview->footer, forward, FALSE, FALSE, 12);
mmview->discard = gtk_button_new_with_label (_("Discard"));
g_signal_connect (mmview->discard, "clicked", G_CALLBACK (discard_composer_cb), mmview);
gtk_widget_hide (mmview->discard);
- gtk_box_pack_end (mmview->footer, mmview->discard, FALSE, FALSE, 12);
+ gtk_box_pack_end ((GtkBox *)mmview->footer, mmview->discard, FALSE, FALSE, 12);
box = gtk_hbox_new (FALSE, 0);
img = e_icon_factory_get_icon ("tab-new", E_ICON_SIZE_BUTTON);
tmp = gtk_image_new_from_pixbuf (img);
- gtk_box_pack_start(box, tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0);
mmview->pop_out = gtk_button_new ();
g_signal_connect (mmview->pop_out, "clicked", G_CALLBACK (popout_composer_cb), mmview);
- gtk_container_add(mmview->pop_out, box);
+ gtk_container_add((GtkContainer *)mmview->pop_out, box);
gtk_widget_show_all(mmview->pop_out);
gtk_widget_hide (mmview->pop_out);
- gtk_box_pack_end (mmview->footer, mmview->pop_out, FALSE, FALSE, 12);
+ gtk_box_pack_end ((GtkBox *)mmview->footer, mmview->pop_out, FALSE, FALSE, 12);
// EXPOSE(discard, bgcolor);
/* Hide this one be default */
mmview->cbox = gtk_hbox_new (FALSE, 0);
mmview->frame = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type (mmview->frame, GTK_SHADOW_IN);
+ gtk_frame_set_shadow_type ((GtkFrame *)mmview->frame, GTK_SHADOW_IN);
if (!(info->flags & CAMEL_MESSAGE_SEEN))
mmv_show(mmview);
@@ -1310,11 +1298,9 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
void
mail_message_view_construct (MailMessageView *mmview)
{
- MailMessageViewPrivate *priv = mmview->priv;
-
mmview->efwd = em_format_webkit_display_new ();
em_format_set_session ((EMFormat *)mmview->efwd, session);
- gtk_box_set_spacing (mmview, 0);
+ gtk_box_set_spacing ((GtkBox *)mmview, 0);
}
MailMessageView *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]