aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2002-11-06 12:23:55 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-11-06 12:23:55 +0800
commit30d40d19329b325a6ddd29db2576cf63306f05d9 (patch)
tree4500d6cf7bab63e4ae27d0a5117026b9290d56ab
parentf77ebc1bb9764a98f879a02be36c420c3a4176fb (diff)
downloadgsoc2013-evolution-30d40d19329b325a6ddd29db2576cf63306f05d9.tar
gsoc2013-evolution-30d40d19329b325a6ddd29db2576cf63306f05d9.tar.gz
gsoc2013-evolution-30d40d19329b325a6ddd29db2576cf63306f05d9.tar.bz2
gsoc2013-evolution-30d40d19329b325a6ddd29db2576cf63306f05d9.tar.lz
gsoc2013-evolution-30d40d19329b325a6ddd29db2576cf63306f05d9.tar.xz
gsoc2013-evolution-30d40d19329b325a6ddd29db2576cf63306f05d9.tar.zst
gsoc2013-evolution-30d40d19329b325a6ddd29db2576cf63306f05d9.zip
more build fixes
svn path=/trunk/; revision=18581
-rw-r--r--filter/filter-folder.c2
-rw-r--r--filter/filter-input.c11
-rw-r--r--filter/filter-int.c4
-rw-r--r--filter/filter-label.c3
4 files changed, 8 insertions, 12 deletions
diff --git a/filter/filter-folder.c b/filter/filter-folder.c
index 9113e0208b..7a77a0ee98 100644
--- a/filter/filter-folder.c
+++ b/filter/filter-folder.c
@@ -238,7 +238,7 @@ get_widget (FilterElement *fe)
allowed_types);
gtk_widget_show (button);
- g_signal_connect (button, "selected", folder_selected, ff);
+ g_signal_connect (button, "selected", GTK_SIGNAL_FUNC (folder_selected), ff);
return button;
}
diff --git a/filter/filter-input.c b/filter/filter-input.c
index 59e34d3664..fee658d2a7 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -29,8 +29,7 @@
#include <sys/types.h>
#include <regex.h>
-#include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
+#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
@@ -54,7 +53,7 @@ static void filter_input_init (FilterInput *fi);
static void filter_input_finalise (GObject *obj);
-static FilterElementClass *parent_class;
+static FilterElementClass *parent_class = NULL;
GType
@@ -109,7 +108,7 @@ filter_input_init (FilterInput *fi)
}
static void
-filter_input_finalise (GtkObject *obj)
+filter_input_finalise (GObject *obj)
{
FilterInput *fi = (FilterInput *) obj;
@@ -117,8 +116,6 @@ filter_input_finalise (GtkObject *obj)
g_list_foreach (fi->values, (GFunc)g_free, NULL);
g_list_free (fi->values);
- g_free (fi->priv);
-
G_OBJECT_CLASS (parent_class)->finalize (obj);
}
@@ -330,7 +327,7 @@ get_widget (FilterElement *fe)
if (fi->values && fi->values->data)
gtk_entry_set_text (GTK_ENTRY (entry), (const char *) fi->values->data);
- g_signal_connect (entry, "changed", entry_changed, fe);
+ g_signal_connect (entry, "changed", GTK_SIGNAL_FUNC (entry_changed), fe);
return entry;
}
diff --git a/filter/filter-int.c b/filter/filter-int.c
index 4378204b92..a6e3fb4a74 100644
--- a/filter/filter-int.c
+++ b/filter/filter-int.c
@@ -134,7 +134,7 @@ filter_int_new_type (const char *type, int min, int max)
fi->min = min;
fi->max = max;
- return o;
+ return fi;
}
void
@@ -234,7 +234,7 @@ get_widget (FilterElement *fe)
if (fs->val)
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), (gfloat) fs->val);
- g_signal_connect (spin, "changed", spin_changed, fe);
+ g_signal_connect (spin, "changed", GTK_SIGNAL_FUNC (spin_changed), fe);
return spin;
}
diff --git a/filter/filter-label.c b/filter/filter-label.c
index 105dd353cf..489a8df5cf 100644
--- a/filter/filter-label.c
+++ b/filter/filter-label.c
@@ -27,9 +27,8 @@
#endif
#include <string.h>
-#include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
+#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>