aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/misc/ChangeLog12
-rw-r--r--widgets/misc/e-calendar-item.c4
-rw-r--r--widgets/misc/e-search-bar.c1
-rw-r--r--widgets/misc/e-search-bar.h1
4 files changed, 14 insertions, 4 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 434dfb2a86..baf814207e 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,15 @@
+2002-07-24 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-calendar-item.c (e_calendar_item_signal_emission_idle_cb): Add
+ missing cast.
+ (e_calendar_item_signal_emission_idle_cb): Likewise.
+
+ * e-search-bar.c (init): Don't initialize dropdown_menu here
+ anymore since we got rid of it.
+
+ * e-search-bar.h (struct _ESearchBar): Removed member
+ dropdown_menu.
+
2002-07-22 Peter Williams <peterw@ximian.com>
* e-filter-bar.c (do_advanced): Break out the code for creating
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index cb74878a0d..f6d7c03820 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -2899,7 +2899,7 @@ e_calendar_item_signal_emission_idle_cb (gpointer data)
/* We ref the calitem & check in case it gets destroyed, since we
were getting a free memory write here. */
- gtk_object_ref (calitem);
+ gtk_object_ref (GTK_OBJECT (calitem));
if (calitem->date_range_changed) {
calitem->date_range_changed = FALSE;
@@ -2915,7 +2915,7 @@ e_calendar_item_signal_emission_idle_cb (gpointer data)
e_calendar_item_signals[SELECTION_CHANGED]);
}
- gtk_object_unref (calitem);
+ gtk_object_unref (GTK_OBJECT (calitem));
GDK_THREADS_LEAVE ();
return FALSE;
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 8da8863d65..61c0f43f4e 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -857,7 +857,6 @@ init (ESearchBar *esb)
esb->option_menu = NULL;
esb->suboption_menu = NULL;
- esb->dropdown_menu = NULL;
esb->activate_button = NULL;
esb->clear_button = NULL;
esb->entry_box = NULL;
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index e7d3830735..06da79aaa1 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -78,7 +78,6 @@ struct _ESearchBar
GtkWidget *dropdown_holder; /* holds the dropdown */
GtkWidget *option_menu;
GtkWidget *suboption_menu;
- GtkWidget *dropdown_menu;
GtkWidget *activate_button;
GtkWidget *clear_button;
GtkWidget *entry_box;