From: Matthias Clasen Date: Mon, 17 May 2004 03:24:41 +0000 (+0000) Subject: Merged from 2.4: X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=96ea214603fa4c9fa7de0878a5d419238f7eaf1a;p=dana%2Fcg-glib.git Merged from 2.4: Sun May 16 23:23:29 2004 Matthias Clasen Merged from 2.4: * glib/gcompletion.c (g_completion_add_items): (g_completion_remove_items): Remove unnecessary checks. (#142559, Morten Welinder) --- diff --git a/ChangeLog b/ChangeLog index 6cab3af6..569c6ce3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun May 16 23:23:29 2004 Matthias Clasen + + Merged from 2.4: + + * glib/gcompletion.c (g_completion_add_items): + (g_completion_remove_items): Remove unnecessary + checks. (#142559, Morten Welinder) + 2004-05-15 Tor Lillqvist * glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6cab3af6..569c6ce3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Sun May 16 23:23:29 2004 Matthias Clasen + + Merged from 2.4: + + * glib/gcompletion.c (g_completion_add_items): + (g_completion_remove_items): Remove unnecessary + checks. (#142559, Morten Welinder) + 2004-05-15 Tor Lillqvist * glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 6cab3af6..569c6ce3 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +Sun May 16 23:23:29 2004 Matthias Clasen + + Merged from 2.4: + + * glib/gcompletion.c (g_completion_add_items): + (g_completion_remove_items): Remove unnecessary + checks. (#142559, Morten Welinder) + 2004-05-15 Tor Lillqvist * glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6cab3af6..569c6ce3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Sun May 16 23:23:29 2004 Matthias Clasen + + Merged from 2.4: + + * glib/gcompletion.c (g_completion_add_items): + (g_completion_remove_items): Remove unnecessary + checks. (#142559, Morten Welinder) + 2004-05-15 Tor Lillqvist * glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6cab3af6..569c6ce3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Sun May 16 23:23:29 2004 Matthias Clasen + + Merged from 2.4: + + * glib/gcompletion.c (g_completion_add_items): + (g_completion_remove_items): Remove unnecessary + checks. (#142559, Morten Welinder) + 2004-05-15 Tor Lillqvist * glib/gutils.c (g_get_any_init): [Win32] Only believe HOME if it diff --git a/glib/gcompletion.c b/glib/gcompletion.c index 57ab509f..e8fc0ca7 100644 --- a/glib/gcompletion.c +++ b/glib/gcompletion.c @@ -60,7 +60,6 @@ g_completion_add_items (GCompletion* cmp, GList* it; g_return_if_fail (cmp != NULL); - g_return_if_fail (items != NULL); /* optimize adding to cache? */ if (cmp->cache) @@ -90,7 +89,6 @@ g_completion_remove_items (GCompletion* cmp, GList* it; g_return_if_fail (cmp != NULL); - g_return_if_fail (items != NULL); it = items; while (cmp->items && it)