diff options
| author | Ted Gould <ted@gould.cx> | 2013-09-08 13:17:08 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2013-09-08 13:17:08 -0500 |
| commit | fde292a8ff3c830ea27f3a11f45e959596fede09 (patch) | |
| tree | d67a32c43254312c921c46d01b67c942efcb65a6 /src | |
| parent | dfc6f669720cd38250c57bf2efff97caedfaca81 (diff) | |
| download | ayatana-indicator-datetime-fde292a8ff3c830ea27f3a11f45e959596fede09.tar.gz ayatana-indicator-datetime-fde292a8ff3c830ea27f3a11f45e959596fede09.tar.bz2 ayatana-indicator-datetime-fde292a8ff3c830ea27f3a11f45e959596fede09.zip | |
Bad merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/planner.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/planner.c b/src/planner.c index 17cc55b..e826c2c 100644 --- a/src/planner.c +++ b/src/planner.c @@ -188,6 +188,8 @@ indicator_datetime_planner_get_appointments (IndicatorDatetimePlanner * self, IndicatorDatetimePlannerClass * klass; g_return_if_fail (INDICATOR_IS_DATETIME_PLANNER (self)); + g_return_val_if_fail (begin != NULL, NULL); + g_return_val_if_fail (end != NULL, NULL); klass = INDICATOR_DATETIME_PLANNER_GET_CLASS (self); g_return_if_fail (klass->get_appointments != NULL); @@ -203,8 +205,6 @@ indicator_datetime_planner_get_appointments_finish (IndicatorDatetimePlanner * GSList * appointments; g_return_val_if_fail (INDICATOR_IS_DATETIME_PLANNER (self), NULL); - g_return_val_if_fail (begin != NULL, NULL); - g_return_val_if_fail (end != NULL, NULL); klass = INDICATOR_DATETIME_PLANNER_GET_CLASS (self); g_return_val_if_fail (klass->get_appointments_finish != NULL, NULL); |