aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-itip-control.c
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui/e-itip-control.c')
-rw-r--r--calendar/gui/e-itip-control.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 66d2a445f1..7fac683035 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -2153,7 +2153,7 @@ url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpoint
}
while ((len = read (fd, buffer, 4096)) > 0) {
- gtk_html_write (html, handle, buffer, len);
+ gtk_html_write (html, handle, (char *)buffer, len);
}
if (len < 0) {
@@ -2195,17 +2195,20 @@ static void
insert_boxes (GtkHTMLEmbedded *eb, EItipControl *itip)
{
EItipControlPrivate *priv;
+ gpointer wbox;
priv = itip->priv;
+ wbox = priv->vbox;
priv->vbox = gtk_vbox_new (FALSE, 12);
- g_object_add_weak_pointer (G_OBJECT (priv->vbox), ((gpointer *)&priv->vbox));
+ g_object_add_weak_pointer (G_OBJECT (priv->vbox), &wbox);
gtk_container_add (GTK_CONTAINER (eb), priv->vbox);
gtk_widget_show (priv->vbox);
priv->hbox = gtk_hbox_new (FALSE, 6);
- g_object_add_weak_pointer (G_OBJECT (priv->hbox), ((gpointer *)&priv->hbox));
+ wbox = priv->hbox;
+ g_object_add_weak_pointer (G_OBJECT (priv->hbox), &wbox);
gtk_box_pack_start (GTK_BOX (priv->vbox), priv->hbox, FALSE, TRUE, 0);
gtk_widget_show (priv->hbox);
@@ -2260,11 +2263,12 @@ static void
insert_ok (GtkWidget *hbox, EItipControl *itip)
{
EItipControlPrivate *priv;
-
+ gpointer wbutton;
priv = itip->priv;
priv->ok = gtk_button_new_from_stock (GTK_STOCK_OK);
- g_object_add_weak_pointer (G_OBJECT (priv->ok), ((gpointer *)&priv->ok));
+ wbutton = priv->ok;
+ g_object_add_weak_pointer (G_OBJECT (priv->ok), &wbutton);
g_signal_connect (priv->ok, "clicked", G_CALLBACK (ok_clicked_cb), itip);