aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-08-14 06:15:45 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-08-14 06:15:45 +0800
commit681cee1a1d0000f865f96624299afc917975bc45 (patch)
tree43b0293a4917aebdcead83e770aa3e747c0b04ca
parent8fdc72b002b927cce36e0e20be7ff04c409abd50 (diff)
downloadgsoc2013-evolution-681cee1a1d0000f865f96624299afc917975bc45.tar
gsoc2013-evolution-681cee1a1d0000f865f96624299afc917975bc45.tar.gz
gsoc2013-evolution-681cee1a1d0000f865f96624299afc917975bc45.tar.bz2
gsoc2013-evolution-681cee1a1d0000f865f96624299afc917975bc45.tar.lz
gsoc2013-evolution-681cee1a1d0000f865f96624299afc917975bc45.tar.xz
gsoc2013-evolution-681cee1a1d0000f865f96624299afc917975bc45.tar.zst
gsoc2013-evolution-681cee1a1d0000f865f96624299afc917975bc45.zip
Removed. (class_init): Don't override that method anymore.
* e-gray-bar.c (impl_style_set): Removed. (class_init): Don't override that method anymore. (e_gray_bar_new): Call `endarken_style()' here instead. svn path=/trunk/; revision=11967
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-gray-bar.c26
2 files changed, 13 insertions, 19 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b92f8d93c0..7fba31983d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2001-08-13 Ettore Perazzoli <ettore@ximian.com>
+ * e-gray-bar.c (impl_style_set): Removed.
+ (class_init): Don't override that method anymore.
+ (e_gray_bar_new): Call `endarken_style()' here instead.
+
+2001-08-13 Ettore Perazzoli <ettore@ximian.com>
+
[Fix #7109, Evolution crashes when the splash screen dialog is
killed by clicking the "X" button.]
diff --git a/shell/e-gray-bar.c b/shell/e-gray-bar.c
index 1058bf5740..be8daa50c5 100644
--- a/shell/e-gray-bar.c
+++ b/shell/e-gray-bar.c
@@ -44,6 +44,7 @@ endarken_style (GtkWidget *widget)
GtkStyle *style;
GtkRcStyle *new_rc_style;
int i;
+ static int first_time = TRUE;
style = widget->style;
@@ -66,30 +67,16 @@ endarken_style (GtkWidget *widget)
new_rc_style->color_flags[i] = GTK_RC_BG | GTK_RC_FG | GTK_RC_BASE | GTK_RC_TEXT;
}
- gtk_widget_modify_style (widget, new_rc_style);
+ if (first_time) {
+ gtk_widget_modify_style (widget, new_rc_style);
+ first_time = FALSE;
+ }
gtk_rc_style_unref (new_rc_style);
}
static void
-impl_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
-{
- static int in_style_set = 0;
-
- if (in_style_set > 0)
- return;
-
- in_style_set ++;
-
- endarken_style (widget);
-
- in_style_set --;
-}
-
-
-static void
class_init (GtkObjectClass *object_class)
{
GtkWidgetClass *widget_class;
@@ -97,7 +84,6 @@ class_init (GtkObjectClass *object_class)
parent_class = gtk_type_class (PARENT_TYPE);
widget_class = GTK_WIDGET_CLASS (object_class);
- widget_class->style_set = impl_style_set;
}
static void
@@ -113,6 +99,8 @@ e_gray_bar_new (void)
new = gtk_type_new (e_gray_bar_get_type ());
+ endarken_style (new);
+
return new;
}