No more "expose-event" on GtkWidget

2 files changed, 2 insertions, 38 deletions

diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index be078c210d..eec00ccabd 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -1091,22 +1091,6 @@ mail_account_view_new (EAccount *account,
 	return view;
 }
 
-static gboolean
-mav_btn_expose (GtkWidget *w, GdkEventExpose *event, MailAccountView *mfv)
-{
-	GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf");
-	cairo_t *cr;
-
-	cr = gdk_cairo_create (gtk_widget_get_window (w));
-	cairo_save (cr);
-	gdk_cairo_set_source_pixbuf (cr, img, event->area.x-5, event->area.y-4);
-	cairo_paint (cr);
-	cairo_restore (cr);
-	cairo_destroy (cr);
-
-	return TRUE;
-}
-
 static void
 mav_close (GtkButton *w, MailAccountView *mfv)
 {
@@ -1123,8 +1107,6 @@ mail_account_view_get_tab_widget (MailAccountView *mcv)
 	GtkWidget *tab_label;
 
 	img = (GtkWidget *)gtk_image_new_from_pixbuf (pbuf);
-	g_object_set_data ((GObject *)img, "pbuf", pbuf);
-	g_signal_connect (img, "expose-event", G_CALLBACK(mav_btn_expose), mcv);
 
 	tool = gtk_button_new ();
 	gtk_button_set_relief ((GtkButton *)tool, GTK_RELIEF_NONE);
@@ -1141,7 +1123,7 @@ mail_account_view_get_tab_widget (MailAccountView *mcv)
 
 	box = gtk_label_new (_("Account Wizard"));
 	tab_label = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 2);
 	gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0);
 	gtk_widget_show_all (tab_label);
 
diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c
index 793ee545f5..596e7222a1 100644
--- a/capplet/settings/mail-settings-view.c
+++ b/capplet/settings/mail-settings-view.c
@@ -225,22 +225,6 @@ mail_settings_view_new ()
 	return view;
 }
 
-static gboolean
-msv_btn_expose (GtkWidget *w, GdkEventExpose *event, MailSettingsView *mfv)
-{
-	GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf");
-	cairo_t *cr;
-
-	cr = gdk_cairo_create (gtk_widget_get_window (w));
-	cairo_save (cr);
-	gdk_cairo_set_source_pixbuf (cr, img, event->area.x-5, event->area.y-4);
-	cairo_paint (cr);
-	cairo_restore (cr);
-	cairo_destroy (cr);
-
-	return TRUE;
-}
-
 static void
 msv_close (GtkButton *w, MailSettingsView *mfv)
 {
@@ -257,8 +241,6 @@ mail_settings_view_get_tab_widget (MailSettingsView *mcv)
 	GtkWidget *tab_label;
 
 	img = gtk_image_new_from_pixbuf (pbuf);
-	g_object_set_data ((GObject *)img, "pbuf", pbuf);
-	g_signal_connect (img, "expose-event", G_CALLBACK(msv_btn_expose), mcv);
 
 	tool = gtk_button_new ();
 	gtk_button_set_relief ((GtkButton *)tool, GTK_RELIEF_NONE);
@@ -275,7 +257,7 @@ mail_settings_view_get_tab_widget (MailSettingsView *mcv)
 
 	box = gtk_label_new (_("Settings"));
 	tab_label = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 2);
 #ifndef ANJAL_SETTINGS
 	gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0);
 #endif