diff options
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/ChangeLog | 8 | ||||
| -rw-r--r-- | filter/rule-editor.c | 6 | ||||
| -rw-r--r-- | filter/rule-editor.h | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index cff5724f0a..f6998fe6ac 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,11 @@ +2008-05-22 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #534360 + + * rule-editor.c: + * rule-editor.h: + Migrate from deprecated GtkObject symbols to GObject equivalents. + 2008-01-10 Milan Crha <mcrha@redhat.com> ** Fix for bug #211353 diff --git a/filter/rule-editor.c b/filter/rule-editor.c index fac0f6ba4c..cc60d4fa8a 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -72,10 +72,10 @@ struct _RuleEditorPrivate { static GtkDialogClass *parent_class = NULL; -GtkType +GType rule_editor_get_type (void) { - static GtkType type = 0; + static GType type = 0; if (!type) { static const GTypeInfo info = { @@ -626,7 +626,7 @@ rule_bottom (GtkWidget *widget, RuleEditor *re) static struct { char *name; - GtkSignalFunc func; + GCallback func; } edit_buttons[] = { { "rule_add", G_CALLBACK (rule_add) }, { "rule_edit", G_CALLBACK (rule_edit) }, diff --git a/filter/rule-editor.h b/filter/rule-editor.h index 90a979205a..41e4c62e56 100644 --- a/filter/rule-editor.h +++ b/filter/rule-editor.h @@ -35,7 +35,7 @@ #define RULE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RULE_TYPE_EDITOR, RuleEditorClass)) #define IS_RULE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RULE_TYPE_EDITOR)) #define IS_RULE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RULE_TYPE_EDITOR)) -#define RULE_EDITOR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), RULE_TYPE_EDITOR, RuleEditorClass)) +#define RULE_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RULE_TYPE_EDITOR, RuleEditorClass)) typedef struct _RuleEditor RuleEditor; typedef struct _RuleEditorClass RuleEditorClass; @@ -89,7 +89,7 @@ struct _RuleEditorUndo { int newrank; }; -GtkType rule_editor_get_type(void); +GType rule_editor_get_type(void); RuleEditor *rule_editor_new(RuleContext *rc, const char *source, const char *label); void rule_editor_construct(RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source, const char *label); |