aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-day-view.c2
-rw-r--r--calendar/gui/e-week-view.c8
-rw-r--r--calendar/gui/tasks-control.c1
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer-select-file.c2
-rw-r--r--mail/ChangeLog14
-rw-r--r--mail/em-account-editor.c4
-rw-r--r--mail/em-folder-view.c6
-rw-r--r--mail/em-format-html-display.c26
-rw-r--r--mail/em-format-html.c2
-rw-r--r--mail/em-format.h4
-rw-r--r--mail/em-mailer-prefs.c2
-rw-r--r--mail/em-vfolder-rule.c16
-rw-r--r--mail/mail-ops.c4
-rw-r--r--mail/mail-send-recv.c2
-rw-r--r--mail/message-list.c22
-rw-r--r--plugins/bbdb/ChangeLog5
-rw-r--r--plugins/bbdb/gaimbuddies.c2
-rw-r--r--plugins/itip-formatter/ChangeLog5
-rw-r--r--plugins/itip-formatter/itip-formatter.c2
-rw-r--r--plugins/save-calendar/ChangeLog5
-rw-r--r--plugins/save-calendar/save-calendar.c2
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-window.c2
-rw-r--r--widgets/misc/ChangeLog5
-rw-r--r--widgets/misc/e-icon-entry.c6
-rw-r--r--widgets/table/ChangeLog8
-rw-r--r--widgets/table/e-table-header-item.c14
-rw-r--r--widgets/table/e-table-header-utils.c2
-rw-r--r--widgets/table/e-table-item.c2
-rw-r--r--widgets/table/e-tree-table-adapter.c5
32 files changed, 128 insertions, 69 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c689008374..eb3ed1a71a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * gui/e-day-view.c:
+ * gui/e-week-view.c:
+ * gui/tasks-control.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-03-27 Matthew Barnes <mbarnes@redhat.com>
* gui/alarm-notify/alarm-queue.c:
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 4a31780d61..07f11c40b2 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -7158,7 +7158,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
data->cal_view = (ECalendarView *)day_view;
data->day = day;
data->event_num = event_num;
- data->get_view_event = tooltip_get_view_event;
+ data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
return TRUE;
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index b9da861609..02250ed228 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2128,7 +2128,7 @@ e_week_view_on_scroll (GtkWidget *widget,
GtkWidget *tool_window = g_object_get_data (G_OBJECT (week_view), "tooltip-window");
guint timeout;
- timeout = GPOINTER_TO_UINT (g_object_get_data (week_view, "tooltip-timeout"));
+ timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (week_view), "tooltip-timeout"));
if (timeout) {
g_source_remove (timeout);
g_object_set_data (G_OBJECT (week_view), "tooltip-timeout", NULL);
@@ -2549,7 +2549,7 @@ tooltip_destroy (EWeekView *week_view, GnomeCanvasItem *item)
EWeekViewEvent *pevent;
guint timeout;
- timeout = GPOINTER_TO_UINT (g_object_get_data (week_view, "tooltip-timeout"));
+ timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (week_view), "tooltip-timeout"));
if (timeout) {
g_source_remove (timeout);
g_object_set_data (G_OBJECT (week_view), "tooltip-timeout", NULL);
@@ -2590,7 +2590,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
data->cal_view = (ECalendarView *)view;
data->day = -1;
data->event_num = event_num;
- data->get_view_event = tooltip_get_view_event;
+ data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
g_object_set_data ((GObject *)view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
@@ -3163,7 +3163,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
data->cal_view = (ECalendarView *)week_view;
data->day = -1;
data->event_num = nevent;
- data->get_view_event = tooltip_get_view_event;
+ data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
g_object_set_data ((GObject *)week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index e81fd85d93..2393c8fd8b 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -252,7 +252,6 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB ("TasksPrintPreview", tasks_control_print_preview_cmd),
BONOBO_UI_VERB ("TasksAssign", tasks_control_assign_cmd),
BONOBO_UI_VERB ("TasksForward", tasks_control_forward_cmd),
- BONOBO_UI_VERB ("ViewPreview", tasks_control_view_preview),
BONOBO_UI_VERB_END
};
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 594e5aa67b..c26c392b03 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * e-msg-composer-select-file.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-03-27 Matthew Barnes <mbarnes@redhat.com>
* e-msg-composer.c: Don't mix declarations and code (#405495).
diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c
index e35369bd72..6f86df10bf 100644
--- a/composer/e-msg-composer-select-file.c
+++ b/composer/e-msg-composer-select-file.c
@@ -83,7 +83,7 @@ get_selector(struct _EMsgComposer *composer, const char *title, guint32 flags)
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (selection), GTK_RESPONSE_OK);
- gtk_file_chooser_set_local_only (selection, FALSE);
+ gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (selection), FALSE);
if ((flags & SELECTOR_MODE_SAVE) == 0)
gtk_file_chooser_set_select_multiple ((GtkFileChooser *) selection, (flags & SELECTOR_MODE_MULTI));
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 923c4e1610..7f06adaf0b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,17 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * em-account-editor.c:
+ * em-folder-view.c:
+ * em-format-html-display.c:
+ * em-format-html.c:
+ * em-format.h:
+ * em-mailer-prefs.c:
+ * em-vfolder-rule.c:
+ * mail-ops.c:
+ * mail-send-recv.c:
+ * message-list.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-03-27 Matthew Barnes <mbarnes@redhat.com>
* em-mailer-prefs.c:
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index ced74400dd..29626e97b6 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1777,7 +1777,7 @@ emae_identity_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st
gui->default_account = GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "management_default"));
if (!mail_config_get_default_account ()
|| (account == mail_config_get_default_account ())
- || (GPOINTER_TO_INT(g_object_get_data (emae->account, "default_flagged"))) )
+ || (GPOINTER_TO_INT(g_object_get_data (G_OBJECT (emae->account), "default_flagged"))) )
gtk_toggle_button_set_active (gui->default_account, TRUE);
if (emae->do_signature) {
@@ -2625,7 +2625,7 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
editing multiple accounts at a time
*/
if (gtk_toggle_button_get_active(emae->priv->default_account))
- g_object_set_data (emae->account, "default_flagged", GINT_TO_POINTER(1));
+ g_object_set_data (G_OBJECT (emae->account), "default_flagged", GINT_TO_POINTER(1));
if (pageid == NULL || !strcmp(pageid, "00.identity")) {
/* TODO: check the account name is set, and unique in the account list */
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 62c0d29da6..a0bf78287f 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -559,7 +559,7 @@ emfv_setup_view_instance(EMFolderView *emfv)
id = mail_config_folder_to_safe_url (emfv->folder);
p->view_instance = gal_view_instance_new (collection, id);
- show_wide = em_folder_browser_get_wide (emfv);
+ show_wide = em_folder_browser_get_wide ((EMFolderBrowser *) emfv);
if (show_wide) {
char *safe_id, *filename;
@@ -1538,7 +1538,7 @@ emfv_message_search(BonoboUIComponent *uic, void *data, const char *path)
else {
/* We are in top level. Just grab focus to Search Bar */
gtk_widget_grab_focus (((ESearchBar *)((EMFolderBrowser *) emfv)->search)->entry);
- gtk_option_menu_set_history (((ESearchBar *)((EMFolderBrowser *) emfv)->search)->scopeoption, 3);
+ gtk_option_menu_set_history (GTK_OPTION_MENU (((ESearchBar *)((EMFolderBrowser *) emfv)->search)->scopeoption), 3);
}
}
@@ -1943,7 +1943,7 @@ emfv_enable_menus(EMFolderView *emfv)
EMMenuTargetSelect *t;
t = em_menu_target_new_select(emfv->menu, emfv->folder, emfv->folder_uri, message_list_get_selected(emfv->list));
- t->target.widget = emfv;
+ t->target.widget = GTK_WIDGET (emfv);
e_menu_update_target((EMenu *)emfv->menu, t);
}
}
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index fa5c05bda0..ceecc71b41 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -475,7 +475,7 @@ void em_format_html_display_set_caret_mode(EMFormatHTMLDisplay *efhd, gboolean s
EAttachmentBar *
em_format_html_display_get_bar (EMFormatHTMLDisplay *efhd)
{
- return efhd->priv->attachment_bar;
+ return E_ATTACHMENT_BAR (efhd->priv->attachment_bar);
}
void
@@ -628,16 +628,16 @@ clear_button_clicked_cb (GtkWidget *widget, gpointer dummy, EMFormatHTMLDisplay
{
struct _EMFormatHTMLDisplayPrivate *p = efhd->priv;
- gtk_entry_set_text (p->search_entry, "");
+ gtk_entry_set_text (GTK_ENTRY (p->search_entry), "");
- gtk_signal_emit_by_name (p->search_entry, "activate", efhd);
+ gtk_signal_emit_by_name (GTK_OBJECT (p->search_entry), "activate", efhd);
}
/* Controlls the visibility of icon_entry's visibility */
static void
icon_entry_changed_cb (GtkWidget *widget, GtkWidget *clear_button)
{
- const char *text = gtk_entry_get_text (widget);
+ const char *text = gtk_entry_get_text (GTK_ENTRY (widget));
if (text && *text)
gtk_widget_show (clear_button);
@@ -661,15 +661,15 @@ em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd)
/* Icon entry */
icon_entry = e_icon_entry_new ();
p->search_entry = e_icon_entry_get_entry (E_ICON_ENTRY (icon_entry));
- gtk_label_set_mnemonic_widget (label1, p->search_entry);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label1), p->search_entry);
gtk_widget_show (p->search_entry);
clear_button = e_icon_entry_create_button ("gtk-clear");
e_icon_entry_pack_widget (E_ICON_ENTRY (icon_entry), clear_button, FALSE);
gtk_widget_show_all (icon_entry);
gtk_widget_hide (clear_button);
- g_signal_connect (G_OBJECT (clear_button), "button-press-event", clear_button_clicked_cb, efhd);
- g_signal_connect (G_OBJECT (p->search_entry), "changed", icon_entry_changed_cb, clear_button);
+ g_signal_connect (G_OBJECT (clear_button), "button-press-event", (GCallback) clear_button_clicked_cb, efhd);
+ g_signal_connect (G_OBJECT (p->search_entry), "changed", (GCallback) icon_entry_changed_cb, clear_button);
gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, FALSE, FALSE, 0);
// gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, TRUE, TRUE, 0);
@@ -684,7 +684,7 @@ em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd)
gtk_box_pack_start ((GtkBox *)(hbox2), button3, FALSE, FALSE, 5);
button2 = gtk_button_new_with_mnemonic (_("_Next"));
- gtk_button_set_image (button2, gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON));
+ gtk_button_set_image (GTK_BUTTON (button2), gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON));
gtk_widget_show (button2);
gtk_box_pack_start ((GtkBox *)(hbox2), button2, FALSE, FALSE, 5);
@@ -695,7 +695,7 @@ em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd)
p->search_matches_label = gtk_label_new ("");
gtk_widget_show (p->search_matches_label);
gtk_box_pack_start ((GtkBox *)(hbox2), p->search_matches_label, TRUE, TRUE, 0);
- p->search_dialog = (GtkWidget *)hbox2;
+ p->search_dialog = GTK_H_BOX (hbox2);
p->search_wrap = FALSE;
@@ -715,7 +715,7 @@ static void
set_focus_cb (GtkWidget *window, GtkWidget *widget, EMFormatHTMLDisplay *efhd)
{
struct _EMFormatHTMLDisplayPrivate *p = efhd->priv;
- GtkWidget *sbar = p->search_dialog;
+ GtkWidget *sbar = GTK_WIDGET (p->search_dialog);
while (widget != NULL && widget != sbar) {
widget = widget->parent;
@@ -764,11 +764,11 @@ em_format_html_display_search_with (EMFormatHTMLDisplay *efhd, char *word)
gtk_widget_show ( (GtkWidget *)(p->search_dialog));
/* Set the query */
- gtk_entry_set_text ( (GtkWidget *) p->search_entry, word);
+ gtk_entry_set_text (GTK_ENTRY (p->search_entry), word);
gtk_widget_hide ( (GtkWidget *) p->search_entry_box);
/* Trigger the search */
- gtk_signal_emit_by_name (p->search_entry, "activate", efhd);
+ gtk_signal_emit_by_name (GTK_OBJECT (p->search_entry), "activate", efhd);
}
}
@@ -778,7 +778,7 @@ em_format_html_display_search_close (EMFormatHTMLDisplay *efhd)
struct _EMFormatHTMLDisplayPrivate *p = efhd->priv;
if (p->search_dialog)
- efhd_search_destroy(p->search_dialog, efhd);
+ efhd_search_destroy(GTK_WIDGET (p->search_dialog), efhd);
}
void
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index b9bb3b8673..0811e4a575 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1642,7 +1642,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
label = _(name);
html = g_string_new("");
- img = efh_format_address(emf, html, addrs, label);
+ img = efh_format_address(efh, html, addrs, label);
if (img) {
// str_field = g_strdup_printf ("<table><tr><td valign=top>%s</td><td valign=top><b>%s:</b></td></tr></table>", img, label);
diff --git a/mail/em-format.h b/mail/em-format.h
index 68b067559e..3d2a82ef67 100644
--- a/mail/em-format.h
+++ b/mail/em-format.h
@@ -307,11 +307,11 @@ void em_format_pull_level(EMFormat *emf);
#define em_format_format_clone(emf, folder, uid, msg, src) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), (folder), (uid), (msg), (src))
/* formats a new message */
#define em_format_format(emf, folder, uid, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), (folder), (uid), (msg), NULL)
-#define em_format_redraw(emf) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), \
+#define em_format_redraw(emf) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((EMFormat *)(emf), \
((EMFormat *)(emf))->folder, \
((EMFormat *)(emf))->uid, \
((EMFormat *)(emf))->message, \
- (emf))
+ (EMFormat *)(emf))
void em_format_format_error(EMFormat *emf, struct _CamelStream *stream, const char *fmt, ...);
#define em_format_format_attachment(emf, stream, msg, type, info) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_attachment((emf), (stream), (msg), (type), (info))
#define em_format_format_source(emf, stream, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_source((emf), (stream), (msg))
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 7302ff842a..c552ad7e92 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -854,7 +854,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs)
gtk_widget_set_sensitive ((GtkWidget *) prefs->notify_play_sound, FALSE);
buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/notify/sound", NULL);
- gtk_file_chooser_set_filename (GTK_FILE_CHOOSER_BUTTON (prefs->notify_sound_file), buf ? buf : "");
+ gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (prefs->notify_sound_file), buf ? buf : "");
g_signal_connect (GTK_FILE_CHOOSER_BUTTON (prefs->notify_sound_file), "selection-changed",
G_CALLBACK (notify_sound_changed), prefs);
if (val != MAIL_CONFIG_NOTIFY_PLAY_SOUND)
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index a796f2635d..d7fa9c9806 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -414,16 +414,16 @@ static void
select_source_with_changed(GtkWidget *widget, struct _source_data *data)
{
em_vfolder_rule_with_t with;
- GList *group = NULL;
+ GSList *group = NULL;
gint i = 0;
- if ( !gtk_toggle_button_get_active (widget) )
+ if ( !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) )
return;
- group = gtk_radio_button_get_group (widget);
+ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget));
- for (i=0; i< g_list_length(group); i++) {
- if ( g_list_nth_data (group, with = i) == widget )
+ for (i=0; i< g_slist_length(group); i++) {
+ if ( g_slist_nth_data (group, with = i) == widget )
break;
}
@@ -669,9 +669,9 @@ get_widget(FilterRule *fr, RuleContext *rc)
data->source_selector = (GtkWidget *)glade_xml_get_widget (gui, "source_selector");
- rb = g_list_nth_data(gtk_radio_button_get_group (rb), vr->with);
- gtk_toggle_button_set_active (rb, TRUE);
- gtk_signal_emit_by_name (rb, "toggled");
+ rb = g_slist_nth_data(gtk_radio_button_get_group (rb), vr->with);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), TRUE);
+ gtk_signal_emit_by_name (GTK_OBJECT (rb), "toggled");
set_sensitive(data);
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 8cff6f8661..2c09c26833 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1792,7 +1792,7 @@ mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder
camel_object_ref(folder);
m->uid = g_strdup(uid);
m->data = data;
- m->done = done;
+ m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done;
m->cancel = camel_operation_new(NULL, NULL);
e_thread_put(thread, (EMsg *)m);
@@ -1830,7 +1830,7 @@ mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolde
camel_object_ref(folder);
m->uid = g_strdup(uid);
m->data = data;
- m->done = done;
+ m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done;
m->cancel = camel_operation_new(NULL, NULL);
e_thread_put(thread, (EMsg *)m);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 4ba64d6052..972262d267 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -388,7 +388,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), table);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), GTK_WIDGET (table));
gtk_box_pack_start (GTK_BOX (gd->vbox), scrolled_window,TRUE, TRUE, 0);
gtk_widget_set_usize (gd->vbox, 600,200);
gtk_widget_show (GTK_WIDGET (scrolled_window));
diff --git a/mail/message-list.c b/mail/message-list.c
index 2634abadeb..3fda8b9f08 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1551,9 +1551,9 @@ static ECell * create_composite_cell (int col)
"color_column", COL_COLOUR,
NULL);
- e_cell_hbox_append (cell_hbox, cell_from, show_email ? col : alt_col, 68);
- e_cell_hbox_append (cell_hbox, cell_attach, COL_ATTACHMENT, 5);
- e_cell_hbox_append (cell_hbox, cell_date, COL_SENT, 27);
+ e_cell_hbox_append (E_CELL_HBOX (cell_hbox), cell_from, show_email ? col : alt_col, 68);
+ e_cell_hbox_append (E_CELL_HBOX (cell_hbox), cell_attach, COL_ATTACHMENT, 5);
+ e_cell_hbox_append (E_CELL_HBOX (cell_hbox), cell_date, COL_SENT, 27);
cell_sub = e_cell_text_new(fixed_name? fixed_name:NULL, GTK_JUSTIFY_LEFT);
g_object_set (G_OBJECT (cell_sub),
@@ -1561,12 +1561,12 @@ static ECell * create_composite_cell (int col)
"color_column", COL_COLOUR,
NULL);
cell_tree = e_cell_tree_new (NULL, NULL, TRUE, cell_sub);
- e_cell_vbox_append (cell_vbox, cell_hbox, COL_FROM);
- e_cell_vbox_append (cell_vbox, cell_tree, COL_SUBJECT);
+ e_cell_vbox_append (E_CELL_VBOX (cell_vbox), cell_hbox, COL_FROM);
+ e_cell_vbox_append (E_CELL_VBOX (cell_vbox), cell_tree, COL_SUBJECT);
- g_object_set_data (cell_vbox, "cell_date", cell_date);
- g_object_set_data (cell_vbox, "cell_sub", cell_sub);
- g_object_set_data (cell_vbox, "cell_from", cell_from);
+ g_object_set_data (G_OBJECT (cell_vbox), "cell_date", cell_date);
+ g_object_set_data (G_OBJECT (cell_vbox), "cell_sub", cell_sub);
+ g_object_set_data (G_OBJECT (cell_vbox), "cell_from", cell_from);
g_free (fixed_name);
@@ -1576,8 +1576,8 @@ static ECell * create_composite_cell (int col)
static void
composite_cell_set_strike_col (ECell *cell, int col)
{
- g_object_set (g_object_get_data(cell, "cell_date"), "strikeout_column", col, NULL);
- g_object_set (g_object_get_data(cell, "cell_from"), "strikeout_column", col, NULL);
+ g_object_set (G_OBJECT (g_object_get_data(G_OBJECT (cell), "cell_date")), "strikeout_column", col, NULL);
+ g_object_set (G_OBJECT (g_object_get_data(G_OBJECT (cell), "cell_from")), "strikeout_column", col, NULL);
}
static ETableExtras *
@@ -1720,7 +1720,7 @@ message_list_setup_etree (MessageList *message_list, gboolean outgoing)
d(printf ("folder name is '%s'\n", name));
path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");
- g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", 1);
+ g_object_set_data (G_OBJECT (((GnomeCanvasItem *) item)->canvas), "freeze-cursor", 1);
if (path && g_stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
/* build based on saved file */
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 2877876382..4f89b00ee4 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * gaimbuddies.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #419524
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 7661c6e6cf..2b6d6ca2f5 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -250,7 +250,7 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c)
photo = g_new0 (EContactPhoto, 1);
photo->type = E_CONTACT_PHOTO_TYPE_INLINED;
- if (! g_file_get_contents (b->icon, &photo->data.inlined.data, &photo->data.inlined.length, &error)) {
+ if (! g_file_get_contents (b->icon, (gchar **) &photo->data.inlined.data, &photo->data.inlined.length, &error)) {
g_warning ("bbdb: Could not read buddy icon: %s\n", error->message);
g_error_free (error);
for (l = ims; l != NULL; l = l->next)
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 99928d30b5..d74387a828 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * itip-formatter.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #419524
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index b91e19bcb8..7df6a6296a 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -848,7 +848,7 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response)
}
}
- g_slist_foreach (attachments, g_free, NULL);
+ g_slist_foreach (attachments, (GFunc) g_free, NULL);
g_slist_free (attachments);
e_cal_component_set_attachment_list (clone_comp, new_attachments);
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index 4e19e4e72d..4b7391009a 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * save-calendar.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-02-20 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #238093 (bnc)
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 7a7e4289b7..ad86106d99 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -175,7 +175,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), extra_widget);
- gtk_file_chooser_set_local_only (dialog, FALSE);
+ gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE);
#else
dialog = gtk_file_selection_new (_("Select destination file"));
gtk_box_pack_start (GTK_BOX (GTK_FILE_SELECTION (dialog)->main_vbox), extra_widget, FALSE, TRUE, 0);
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b0682dc140..cd3b213915 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * e-shell-window.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #419524
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 0ed77f19fe..541ddbcc26 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -862,7 +862,7 @@ impl_dispose (GObject *object)
self->priv->store_window_size_timer = 0;
/* There was a timer. Let us store the settings.*/
- store_window_size (self);
+ store_window_size (GTK_WIDGET (self));
}
#ifdef NM_SUPPORT_GLIB
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 555c6c6133..bba804c20c 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * e-icon-entry.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-03-27 Matthew Barnes <mbarnes@redhat.com>
* e-filter-bar.c (menubar_activated): Fix build breakage due to
diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c
index b048bac0be..fbd7fb7cdb 100644
--- a/widgets/misc/e-icon-entry.c
+++ b/widgets/misc/e-icon-entry.c
@@ -370,13 +370,13 @@ e_icon_entry_create_button (const char *stock)
eventbox = gtk_event_box_new ();
gtk_container_set_border_width (GTK_CONTAINER (eventbox), 2);
- gtk_event_box_set_visible_window ((eventbox), FALSE);
+ gtk_event_box_set_visible_window (GTK_EVENT_BOX (eventbox), FALSE);
image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (eventbox), image);
- g_signal_connect_after (eventbox, "enter-notify-event", set_cursor, NULL);
- g_signal_connect_after (eventbox, "leave-notify-event", set_cursor, NULL);
+ g_signal_connect_after (eventbox, "enter-notify-event", (GCallback) set_cursor, NULL);
+ g_signal_connect_after (eventbox, "leave-notify-event", (GCallback) set_cursor, NULL);
return eventbox;
}
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 9601d05e64..ee46792ce3 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-29 Matthew Barnes <mbarnes@redhat.com>
+
+ * e-table-header-utils.c:
+ * e-table-item.c:
+ * e-tree-header-item.c:
+ * e-tree-table-adapter.c:
+ Fix "incompatible pointer type" warnings (#360619).
+
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
* e-cell-checkbox.c:
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 707d2baaa4..596fbbcb73 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1491,10 +1491,10 @@ static EPopupMenu ethi_context_menu [] = {
static void
sort_by_id (GtkWidget *menu_item, ETableHeaderItem *ethi)
{
- int col = GPOINTER_TO_INT (g_object_get_data(menu_item, "col-number"));
+ int col = GPOINTER_TO_INT (g_object_get_data(G_OBJECT (menu_item), "col-number"));
ETableCol *ecol;
- if (!gtk_check_menu_item_get_active(menu_item))
+ if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menu_item)))
return;
ecol = e_table_header_get_column (ethi->full_header, col);
@@ -1504,7 +1504,7 @@ sort_by_id (GtkWidget *menu_item, ETableHeaderItem *ethi)
static void
popup_custom (GtkWidget *menu_item, EthiHeaderInfo *info)
{
- if (!gtk_check_menu_item_get_active(menu_item))
+ if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menu_item)))
return;
ethi_popup_customize_view(menu_item, info);
@@ -1514,9 +1514,9 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
{
EthiHeaderInfo *info = g_new(EthiHeaderInfo, 1);
ETableCol *col;
- GtkMenu *popup, *sub_menu;
+ GtkMenu *popup;
int ncol, sort_count, sort_col;
- GtkWidget *menu_item;
+ GtkWidget *menu_item, *sub_menu;
GSList *group = NULL;
ETableSortColumn column;
gboolean ascending;
@@ -1537,7 +1537,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
gtk_widget_show (menu_item);
sub_menu = gtk_menu_new ();
gtk_widget_show (sub_menu);
- gtk_menu_item_set_submenu (menu_item, sub_menu);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), sub_menu);
gtk_menu_shell_prepend (GTK_MENU_SHELL (popup), menu_item);
sort_count = e_table_sort_info_sorting_get_count(ethi->sort_info);
@@ -1583,7 +1583,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
if (ncol == sort_col)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE);
- g_object_set_data (menu_item, "col-number", GINT_TO_POINTER (ncol));
+ g_object_set_data (G_OBJECT (menu_item), "col-number", GINT_TO_POINTER (ncol));
g_signal_connect (menu_item, "activate", G_CALLBACK (sort_by_id), ethi);
}
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 2aa05cffc4..b31f81eef1 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -350,7 +350,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
gtk_widget_ensure_style (window);
gtk_widget_ensure_style (button);
g_label = GTK_BIN(button)->child;
- g_object_add_weak_pointer (G_OBJECT (g_label), &g_label);
+ g_object_add_weak_pointer (G_OBJECT (g_label), (gpointer *) &g_label);
gtk_widget_ensure_style (g_label);
}
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 221abb2044..72a3decfca 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1672,7 +1672,7 @@ eti_tree_unfreeze (GtkWidget *widget, GdkEvent *event, ETableItem *eti)
{
if (widget)
- g_object_set_data (widget, "freeze-cursor", 0);
+ g_object_set_data (G_OBJECT (widget), "freeze-cursor", 0);
return FALSE;
}
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 3a24fa38bc..212fbedf89 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -746,7 +746,8 @@ etta_proxy_no_change (ETreeModel *etm, ETreeTableAdapter *etta)
e_table_model_no_change(E_TABLE_MODEL(etta));
}
-guint resort_model (ETreeTableAdapter *etta)
+static gboolean
+resort_model (ETreeTableAdapter *etta)
{
etta_sort_info_changed (NULL, etta);
return FALSE;
@@ -761,7 +762,7 @@ etta_proxy_node_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter *ett
/* FIXME: Really it shouldnt be required. But a lot of thread
* which were supposed to be present in the list is way below
*/
- g_idle_add (resort_model, etta);
+ g_idle_add ((GSourceFunc) resort_model, etta);
}
static void