aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2007-10-26 16:07:25 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2007-10-26 16:07:25 +0800
commitac2923d34b8eae31908ee1c4611fab81ff5419ba (patch)
treed34165e6bd4f28c538ed5a2755c7276bee660ddc
parent27f2852a2724aee617ef669587c8663dcbe40c27 (diff)
downloadgsoc2013-evolution-ac2923d34b8eae31908ee1c4611fab81ff5419ba.tar.gz
gsoc2013-evolution-ac2923d34b8eae31908ee1c4611fab81ff5419ba.tar.zst
gsoc2013-evolution-ac2923d34b8eae31908ee1c4611fab81ff5419ba.zip
Warning fixes: - NULL vs 0 - ANSIfication of declarations - mixing code
2007-10-26 Kjartan Maraas <kmaraas@gnome.org> * filter-datespec.c: (set_values): * filter-rule.c: (filter_rule_get_type), (filter_rule_new), (rule_copy): * rule-editor.c: (editor_response), (rule_delete), (rule_move): Warning fixes: - NULL vs 0 - ANSIfication of declarations - mixing code and declarations svn path=/trunk/; revision=34429
-rw-r--r--filter/ChangeLog12
-rw-r--r--filter/filter-datespec.c4
-rw-r--r--filter/filter-rule.c4
-rw-r--r--filter/rule-editor.c2
4 files changed, 18 insertions, 4 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index d8be3f50bc..9675f6e2bd 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,15 @@
+2007-10-26 Kjartan Maraas <kmaraas@gnome.org>
+
+ * filter-datespec.c: (set_values):
+ * filter-rule.c: (filter_rule_get_type), (filter_rule_new),
+ (rule_copy):
+ * rule-editor.c: (editor_response), (rule_delete), (rule_move):
+
+ Warning fixes:
+ - NULL vs 0
+ - ANSIfication of declarations
+ - mixing code and declarations
+
2007-10-11 Milan Crha <mcrha@redhat.com>
** Fix for bug #323977
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index 5ec80cdf9d..328b7597dd 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -359,11 +359,13 @@ get_values (FilterDatespec *fds)
static void
set_values (FilterDatespec *fds)
{
+ int note_type;
+
struct _FilterDatespecPrivate *p = PRIV(fds);
p->type = fds->type==FDST_UNKNOWN ? FDST_NOW : fds->type;
- int note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; // FUTURE and AGO use the same notebook pages/etc.
+ note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; // FUTURE and AGO use the same notebook pages/etc.
switch (p->type) {
case FDST_NOW:
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 57f64e003a..b656ee9a1b 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -64,7 +64,7 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
GType
-filter_rule_get_type ()
+filter_rule_get_type (void)
{
static GType type = 0;
@@ -146,7 +146,7 @@ filter_rule_finalise (GObject *obj)
* Return value: A new #FilterRule object.
**/
FilterRule *
-filter_rule_new ()
+filter_rule_new (void)
{
return (FilterRule *) g_object_new (FILTER_TYPE_RULE, NULL, NULL);
}
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 0517403f5a..8320399618 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -306,7 +306,7 @@ editor_response (GtkWidget *dialog, int button, RuleEditor *re)
RuleEditorUndo *undo, *next;
undo = re->undo_log;
- re->undo_log = 0;
+ re->undo_log = NULL;
while (undo) {
next = undo->next;
g_object_unref (undo->rule);