diff options
author | Gilles Dartiguelongue <gdartigu@src.gnome.org> | 2007-09-07 22:17:42 +0800 |
---|---|---|
committer | Gilles Dartiguelongue <gdartigu@src.gnome.org> | 2007-09-07 22:17:42 +0800 |
commit | 62eb40bb78d2cd152db47e8e704fe311c9e7b238 (patch) | |
tree | cf3ec9dbc68fe4d320b26fa17b2ae02fd20c8b06 | |
parent | 5069f9f4774d9586aca672822702e18852471630 (diff) | |
download | gsoc2013-evolution-62eb40bb78d2cd152db47e8e704fe311c9e7b238.tar gsoc2013-evolution-62eb40bb78d2cd152db47e8e704fe311c9e7b238.tar.gz gsoc2013-evolution-62eb40bb78d2cd152db47e8e704fe311c9e7b238.tar.bz2 gsoc2013-evolution-62eb40bb78d2cd152db47e8e704fe311c9e7b238.tar.lz gsoc2013-evolution-62eb40bb78d2cd152db47e8e704fe311c9e7b238.tar.xz gsoc2013-evolution-62eb40bb78d2cd152db47e8e704fe311c9e7b238.tar.zst gsoc2013-evolution-62eb40bb78d2cd152db47e8e704fe311c9e7b238.zip |
fix weak references problem pointed by Milan Crha (bug #439122)
* fix weak references problem pointed by Milan Crha (bug #439122)
svn path=/trunk/; revision=34196
-rw-r--r-- | calendar/ChangeLog | 6 | ||||
-rw-r--r-- | calendar/gui/e-itip-control.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 01b0093801..2b46cba108 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2007-09-07 Gilles Dartiguelongue <gdartigu@svn.gnome.org> + + * gui/e-itip-control.c: (insert_boxes), (insert_ok): + fix weak references, pointed by Milan Crha <mcrha@redhat.com> + which fixes one issue of the patch from bug #439122 + 2007-09-07 Milan Crha <mcrha@redhat.com> ** Fix for bug #473903 diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index aac6beebcf..55814fd45d 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -2194,20 +2194,16 @@ 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), &wbox); - + g_object_add_weak_pointer (G_OBJECT (priv->vbox), (gpointer *) &(priv->vbox)); gtk_container_add (GTK_CONTAINER (eb), priv->vbox); gtk_widget_show (priv->vbox); priv->hbox = gtk_hbox_new (FALSE, 6); - wbox = priv->hbox; - g_object_add_weak_pointer (G_OBJECT (priv->hbox), &wbox); + g_object_add_weak_pointer (G_OBJECT (priv->hbox), (gpointer *) &(priv->hbox)); gtk_box_pack_start (GTK_BOX (priv->vbox), priv->hbox, FALSE, TRUE, 0); gtk_widget_show (priv->hbox); @@ -2262,12 +2258,10 @@ 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); - wbutton = priv->ok; - g_object_add_weak_pointer (G_OBJECT (priv->ok), &wbutton); + g_object_add_weak_pointer (G_OBJECT (priv->ok), (gpointer *) &(priv->ok) ); g_signal_connect (priv->ok, "clicked", G_CALLBACK (ok_clicked_cb), itip); |