aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/itip-formatter
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2007-04-20 02:53:33 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-04-20 02:53:33 +0800
commit64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6 (patch)
tree4ebe95239bef43cb97c0e46aa8194d44e6c88be6 /plugins/itip-formatter
parentbb05f6e6d0541bf29c8dde4e264cc7c23ba52fbb (diff)
downloadgsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.tar
gsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.tar.gz
gsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.tar.bz2
gsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.tar.lz
gsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.tar.xz
gsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.tar.zst
gsoc2013-evolution-64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6.zip
Massive code cleanup (bug #429422)
svn path=/trunk/; revision=33432
Diffstat (limited to 'plugins/itip-formatter')
-rw-r--r--plugins/itip-formatter/ChangeLog10
-rw-r--r--plugins/itip-formatter/itip-view.c17
2 files changed, 22 insertions, 5 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index d74387a828..c91e6b9927 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-19 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #429422
+
+ * itip-view.c (set_one_button):
+ e_gtk_button_new_with_icon() is dead; just do it manually.
+
+ * itip-view.c (itip_view_class_init):
+ Use g_cclosure_marshal_VOID__INT instead of gtk_marshal_NONE__INT.
+
2007-03-29 Matthew Barnes <mbarnes@redhat.com>
* itip-formatter.c:
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 0a20ea43d3..63fa11211e 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -43,7 +43,6 @@
#include <mail/em-format-html.h>
#include <libedataserver/e-account-list.h>
#include <e-util/e-icon-factory.h>
-#include <e-util/e-gtk-utils.h>
#include <e-util/e-util.h>
#include <calendar/gui/itip-utils.h>
#include "itip-view.h"
@@ -729,15 +728,23 @@ set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse re
{
ItipViewPrivate *priv;
GtkWidget *button;
+ GtkWidget *image;
+ gpointer data;
priv = view->priv;
- button = e_gtk_button_new_with_icon (label, stock_id);
- g_object_set_data (G_OBJECT (button), DATA_RESPONSE_KEY, GINT_TO_POINTER (response));
+ button = gtk_button_new_with_mnemonic (label);
+ image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (button, image);
+
+ data = GINT_TO_POINTER (response);
+ g_object_set_data (button, DATA_RESPONSE_KEY, data);
+
gtk_widget_show (button);
gtk_container_add (GTK_CONTAINER (priv->button_box), button);
- g_signal_connect (button, "clicked", G_CALLBACK (button_clicked_cb), view);
+ g_signal_connect (
+ button, "clicked", G_CALLBACK (button_clicked_cb), view);
}
static void
@@ -852,7 +859,7 @@ itip_view_class_init (ItipViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ItipViewClass, response),
NULL, NULL,
- gtk_marshal_NONE__INT,
+ g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
}