From 67159043da2de9df576f6a4eaa245e0c3926f004 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 12:56:51 -0400 Subject: Use G_BEGIN_DECLS / G_END_DECLS macros. --- filter/filter-file.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'filter') diff --git a/filter/filter-file.h b/filter/filter-file.h index 3aa30adbf1..2b4af5f76f 100644 --- a/filter/filter-file.h +++ b/filter/filter-file.h @@ -24,10 +24,7 @@ #ifndef __FILTER_FILE_H__ #define __FILTER_FILE_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #include "filter-element.h" @@ -66,8 +63,6 @@ FilterFile *filter_file_new_type_name (const gchar *type); /* methods */ void filter_file_set_path (FilterFile *file, const gchar *path); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! __FILTER_FILE_H__ */ -- cgit v1.2.3 From 0169e6a289a1836ca54541797e2d6c9cad2ada3d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 30 Jun 2009 18:26:57 +0200 Subject: Hide proper widgets from filter.glade for searches --- filter/rule-editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'filter') diff --git a/filter/rule-editor.c b/filter/rule-editor.c index 4a1e831451..2927938200 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -175,8 +175,8 @@ rule_editor_new (RuleContext *rc, const gchar *source, const gchar *label) gui = glade_xml_new (filter_glade, "rule_editor", NULL); g_free (filter_glade); rule_editor_construct (re, rc, gui, source, label); - gtk_widget_hide(glade_xml_get_widget (gui, "label17")); - gtk_widget_hide(glade_xml_get_widget (gui, "filter_source")); + gtk_widget_hide (glade_xml_get_widget (gui, "label17")); + gtk_widget_hide (glade_xml_get_widget (gui, "filter_source_combobox")); g_object_unref (gui); return re; -- cgit v1.2.3 From 42e75c9162402078ac629740821c3533925ee342 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 17:18:36 -0400 Subject: Use AM_CPPFLAGS instead of INCLUDE in all Makefile.am. --- filter/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'filter') diff --git a/filter/Makefile.am b/filter/Makefile.am index b58b4b2db6..ea996c839f 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -1,7 +1,7 @@ glade_DATA = filter.glade -INCLUDES = \ +AM_CPPFLAGS = \ -I $(top_srcdir) \ -I $(top_srcdir)/e-util \ -I $(top_srcdir)/widgets/misc \ -- cgit v1.2.3