Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace changes

Browse Source
This commit is contained in:
Florian Brosch
2017-12-11 22:13:16 -02:00
committed by Georges Basile Stavracas Neto
parent d51d1ea2cd
commit eceb826e77
14 changed files with 1275 additions and 1370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-manager.c
+1 -1
View File
@@ -175,7 +175,7 @@ thread_job_thread (gpointer user_data)
return g_thread_self (); return g_thread_self ();
} }
static GCancellable * static GCancellable*
submit_thread_job (EThreadJobFunc func, submit_thread_job (EThreadJobFunc func,
gpointer user_data, gpointer user_data,
GDestroyNotify free_user_data) GDestroyNotify free_user_data)
src/gcal-timer.c
-23
View File
@@ -69,7 +69,6 @@ static void timer_source_finalize (GcalTimer *self);
/*< private >*/ /*< private >*/
static void static void
timer_func_destroy_notify_wrapper (CbWrapperData *wrapper) timer_func_destroy_notify_wrapper (CbWrapperData *wrapper)
@@ -82,8 +81,6 @@ timer_func_destroy_notify_wrapper (CbWrapperData *wrapper)
g_free (wrapper); g_free (wrapper);
} }
static gboolean static gboolean
timer_func_wrapper (CbWrapperData *wrapper) timer_func_wrapper (CbWrapperData *wrapper)
{ {
@@ -95,8 +92,6 @@ timer_func_wrapper (CbWrapperData *wrapper)
return G_SOURCE_CONTINUE; return G_SOURCE_CONTINUE;
} }
static gboolean static gboolean
timer_source_dispatch (GcalTimer *self, timer_source_dispatch (GcalTimer *self,
GSourceFunc user_callback, GSourceFunc user_callback,
@@ -115,8 +110,6 @@ timer_source_dispatch (GcalTimer *self,
return result; return result;
} }
static void static void
schedule_next (GcalTimer *self) schedule_next (GcalTimer *self)
{ {
@@ -135,8 +128,6 @@ schedule_next (GcalTimer *self)
g_source_set_ready_time ((GSource*) self, 0); g_source_set_ready_time ((GSource*) self, 0);
} }
static void static void
timer_source_finalize (GcalTimer *self) timer_source_finalize (GcalTimer *self)
{ {
@@ -182,8 +173,6 @@ gcal_timer_new (gint64 default_duration)
return g_steal_pointer (&self); return g_steal_pointer (&self);
} }
/** /**
* gcal_timer_set_start: * gcal_timer_set_start:
* @self: The #GcalTimer. * @self: The #GcalTimer.
@@ -200,8 +189,6 @@ gcal_timer_start (GcalTimer *self)
schedule_next (self); schedule_next (self);
} }
/** /**
* gcal_timer_set_reset: * gcal_timer_set_reset:
* @self: The #GcalTimer. * @self: The #GcalTimer.
@@ -218,8 +205,6 @@ gcal_timer_reset (GcalTimer *self)
schedule_next (self); schedule_next (self);
} }
/** /**
* gcal_timer_set_stop: * gcal_timer_set_stop:
* @self: The #GcalTimer. * @self: The #GcalTimer.
@@ -235,8 +220,6 @@ gcal_timer_stop (GcalTimer *self)
g_source_set_ready_time ((GSource*) self, -1); g_source_set_ready_time ((GSource*) self, -1);
} }
/** /**
* gcal_timer_is_running * gcal_timer_is_running
* @self: The #GcalTimer. * @self: The #GcalTimer.
@@ -251,8 +234,6 @@ gcal_timer_is_running (GcalTimer *self)
return g_source_get_ready_time ((GSource*) self) >= 0; return g_source_get_ready_time ((GSource*) self) >= 0;
} }
/** /**
* gcal_timer_set_duration: * gcal_timer_set_duration:
* @self: The #GcalTimer. * @self: The #GcalTimer.
@@ -280,8 +261,6 @@ gcal_timer_set_default_duration (GcalTimer *self,
schedule_next (self); schedule_next (self);
} }
/** /**
* gcal_timer_get_default_duration: * gcal_timer_get_default_duration:
* @self: The #GcalTimer. * @self: The #GcalTimer.
@@ -296,7 +275,6 @@ gcal_timer_get_default_duration (GcalTimer *self)
return self->default_duration; return self->default_duration;
} }
/** /**
* gcal_timer_set_callback: * gcal_timer_set_callback:
* @self: The #GcalTimer. * @self: The #GcalTimer.
@@ -330,7 +308,6 @@ gcal_timer_set_callback (GcalTimer *self,
(GDestroyNotify) timer_func_destroy_notify_wrapper); (GDestroyNotify) timer_func_destroy_notify_wrapper);
} }
/** /**
* gcal_timer_free: * gcal_timer_free:
* @self: The #GcalTimer. * @self: The #GcalTimer.
src/gcal-utils.h
+4 -3
View File
@@ -87,10 +87,10 @@ gchar* gcal_get_weekday (gint
gchar* gcal_get_month_name (gint i); gchar* gcal_get_month_name (gint i);
cairo_surface_t*gcal_get_surface_from_color (GdkRGBA *color, cairo_surface_t* gcal_get_surface_from_color (GdkRGBA *color,
gint size); gint size);
cairo_surface_t*get_circle_surface_from_color (GdkRGBA *color, cairo_surface_t* get_circle_surface_from_color (GdkRGBA *color,
gint size); gint size);
void get_color_name_from_source (ESource *source, void get_color_name_from_source (ESource *source,
@@ -126,14 +126,15 @@ gsize e_strftime_fix_am_pm (gchar
gsize max, gsize max,
const gchar *fmt, const gchar *fmt,
const struct tm *tm); const struct tm *tm);
gsize e_utf8_strftime_fix_am_pm (gchar *str,
gsize e_utf8_strftime_fix_am_pm (gchar *str,
gsize max, gsize max,
const gchar *fmt, const gchar *fmt,
const struct tm *tm); const struct tm *tm);
void fix_popover_menu_icons (GtkPopover *popover); void fix_popover_menu_icons (GtkPopover *popover);
void get_source_parent_name_color (GcalManager *manager, void get_source_parent_name_color (GcalManager *manager,
ESource *source, ESource *source,
gchar **name, gchar **name,
src/gcal-weather-info.c
+10 -27
View File
@@ -21,15 +21,6 @@
#include <string.h> #include <string.h>
#include "gcal-weather-info.h" #include "gcal-weather-info.h"
static void gcal_weather_info_set_date (GcalWeatherInfo *self,
GDate *date);
static void gcal_weather_info_set_temperature (GcalWeatherInfo *self,
const gchar *temperature);
static void gcal_weather_info_set_icon_name (GcalWeatherInfo *self,
const gchar *icon_name);
/* _GcalWeatherInfo: /* _GcalWeatherInfo:
* @date: (not nullable): The day this information belongs to. * @date: (not nullable): The day this information belongs to.
@@ -51,6 +42,15 @@ struct _GcalWeatherInfo {
}; };
static void gcal_weather_info_set_date (GcalWeatherInfo *self,
GDate *date);
static void gcal_weather_info_set_temperature (GcalWeatherInfo *self,
const gchar *temperature);
static void gcal_weather_info_set_icon_name (GcalWeatherInfo *self,
const gchar *icon_name);
G_DEFINE_TYPE (GcalWeatherInfo, gcal_weather_info, G_TYPE_OBJECT) G_DEFINE_TYPE (GcalWeatherInfo, gcal_weather_info, G_TYPE_OBJECT)
enum { enum {
@@ -79,8 +79,6 @@ gcal_weather_info_finalize (GObject *object)
G_OBJECT_CLASS (gcal_weather_info_parent_class)->finalize (object); G_OBJECT_CLASS (gcal_weather_info_parent_class)->finalize (object);
} }
static void static void
gcal_weather_info_get_property (GObject *object, gcal_weather_info_get_property (GObject *object,
guint property_id, guint property_id,
@@ -107,8 +105,6 @@ gcal_weather_info_get_property (GObject *object,
} }
} }
static void static void
gcal_weather_info_set_property (GObject *object, gcal_weather_info_set_property (GObject *object,
guint property_id, guint property_id,
@@ -138,8 +134,6 @@ gcal_weather_info_set_property (GObject *object,
} }
} }
static void static void
gcal_weather_info_class_init (GcalWeatherInfoClass *klass) gcal_weather_info_class_init (GcalWeatherInfoClass *klass)
{ {
@@ -185,8 +179,6 @@ gcal_weather_info_class_init (GcalWeatherInfoClass *klass)
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
} }
static void static void
gcal_weather_info_init (GcalWeatherInfo *self) gcal_weather_info_init (GcalWeatherInfo *self)
{ {
@@ -215,8 +207,6 @@ gcal_weather_info_set_date (GcalWeatherInfo *self,
self->date = *date; self->date = *date;
} }
/* gcal_weather_info_set_temperature: /* gcal_weather_info_set_temperature:
* @self: A #GcalWeatherInfo instance. * @self: A #GcalWeatherInfo instance.
* @temperature: A weather string. * @temperature: A weather string.
@@ -238,8 +228,6 @@ gcal_weather_info_set_temperature (GcalWeatherInfo *self,
} }
} }
/* gcal_weather_info_set_icon_name: /* gcal_weather_info_set_icon_name:
* @self: A #GcalWeatherInfo instance. * @self: A #GcalWeatherInfo instance.
* @icon_name: The name of the icon to display. * @icon_name: The name of the icon to display.
@@ -262,6 +250,7 @@ gcal_weather_info_set_icon_name (GcalWeatherInfo *self,
} }
/* < public > */ /* < public > */
/** /**
@@ -293,8 +282,6 @@ gcal_weather_info_new (GDate *date,
return info; return info;
} }
/** /**
* gcal_weather_info_get_date: * gcal_weather_info_get_date:
* @self: A #GcalWeatherInfo instance. * @self: A #GcalWeatherInfo instance.
@@ -311,8 +298,6 @@ gcal_weather_info_get_date (GcalWeatherInfo *self,
*date = self->date; *date = self->date;
} }
/** /**
* gcal_weather_info_get_icon_name: * gcal_weather_info_get_icon_name:
* @self: A #GcalWeatherInfo instance. * @self: A #GcalWeatherInfo instance.
@@ -327,8 +312,6 @@ gcal_weather_info_get_icon_name (GcalWeatherInfo *self)
return self->icon_name; return self->icon_name;
} }
/** /**
* gcal_weather_info_get_temperature: * gcal_weather_info_get_temperature:
* @self: A #GcalWeatherInfo instance. * @self: A #GcalWeatherInfo instance.
src/gcal-weather-service.c
+897 -954
View File
File diff suppressed because it is too large Load Diff
src/gcal-weather-service.h
+7 -9
View File
@@ -48,20 +48,13 @@ GTimeZone* gcal_weather_service_get_time_zone (GcalWeatherService
void gcal_weather_service_set_time_zone (GcalWeatherService *self, void gcal_weather_service_set_time_zone (GcalWeatherService *self,
GTimeZone *value); GTimeZone *value);
void gcal_weather_service_run (GcalWeatherService *self,
GWeatherLocation *location);
void gcal_weather_service_stop (GcalWeatherService *self);
guint gcal_weather_service_get_max_days (GcalWeatherService *self); guint gcal_weather_service_get_max_days (GcalWeatherService *self);
gint64 gcal_weather_service_get_valid_timespan (GcalWeatherService *self); gint64 gcal_weather_service_get_valid_timespan (GcalWeatherService *self);
guint gcal_weather_service_get_check_interval_new guint gcal_weather_service_get_check_interval_new (GcalWeatherService *self);
(GcalWeatherService *self);
guint gcal_weather_service_get_check_interval_renew guint gcal_weather_service_get_check_interval_renew (GcalWeatherService *self);
(GcalWeatherService *self);
GSList* gcal_weather_service_get_weather_infos (GcalWeatherService *self); GSList* gcal_weather_service_get_weather_infos (GcalWeatherService *self);
@@ -69,6 +62,11 @@ const gchar* gcal_weather_service_get_attribution (GcalWeatherService
void gcal_weather_service_update (GcalWeatherService *self); void gcal_weather_service_update (GcalWeatherService *self);
void gcal_weather_service_run (GcalWeatherService *self,
GWeatherLocation *location);
void gcal_weather_service_stop (GcalWeatherService *self);
G_END_DECLS G_END_DECLS
#endif /* GCAL_WEATHER_SERVICE_H */ #endif /* GCAL_WEATHER_SERVICE_H */
src/gcal-window.c
+5 -5
View File
@@ -226,13 +226,13 @@ static void on_view_action_activated (GSimpleAction *a
GVariant *param, GVariant *param,
gpointer user_data); gpointer user_data);
static void on_menu_button_clicked (GtkMenuButton *menu,
GtkStack *stack);
static void on_toggle_search_bar_activated (GSimpleAction *action, static void on_toggle_search_bar_activated (GSimpleAction *action,
GVariant *param, GVariant *param,
gpointer user_data); gpointer user_data);
static void on_menu_button_clicked (GtkMenuButton *menu,
GtkStack *stack);
static void on_view_menu_open_sub (GtkModelButton *button, static void on_view_menu_open_sub (GtkModelButton *button,
GtkStack *stack); GtkStack *stack);
@@ -250,8 +250,7 @@ static void on_auto_location_change (GtkSwitch *l
GParamSpec *pspec, GParamSpec *pspec,
GcalWindow *self); GcalWindow *self);
static gboolean on_weather_location_searchbox_match_selected static gboolean on_weather_location_searchbox_match_selected (GtkEntryCompletion *sender,
(GtkEntryCompletion *sender,
GtkTreeModel *model, GtkTreeModel *model,
GtkTreeIter *iter, GtkTreeIter *iter,
GcalWindow *self); GcalWindow *self);
@@ -260,6 +259,7 @@ static void set_model_button_animation (GtkBuilder *b
GtkStack *stack, GtkStack *stack,
const char *id, const char *id,
gboolean go_back); gboolean go_back);
static void update_menu_weather_sensitivity (GcalWindow *self); static void update_menu_weather_sensitivity (GcalWindow *self);
src/views/gcal-year-view.c
+1
View File
@@ -143,6 +143,7 @@ static void gcal_view_interface_init (GcalViewInterface *iface);
static void gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface); static void gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface);
static void update_weather (GcalYearView *self); static void update_weather (GcalYearView *self);
G_DEFINE_TYPE_WITH_CODE (GcalYearView, gcal_year_view, GTK_TYPE_BOX, G_DEFINE_TYPE_WITH_CODE (GcalYearView, gcal_year_view, GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, gcal_view_interface_init) G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, gcal_view_interface_init)
G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER, G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER,
src/views/gcal-year-view.h
+2
View File
@@ -33,8 +33,10 @@ G_DECLARE_FINAL_TYPE (GcalYearView, gcal_year_view, GCAL, YEAR_VIEW, GtkBox)
void gcal_year_view_set_first_weekday (GcalYearView *year_view, void gcal_year_view_set_first_weekday (GcalYearView *year_view,
gint nr_day); gint nr_day);
void gcal_year_view_set_use_24h_format (GcalYearView *year_view, void gcal_year_view_set_use_24h_format (GcalYearView *year_view,
gboolean use_24h_format); gboolean use_24h_format);
void gcal_year_view_set_current_date (GcalYearView *year_view, void gcal_year_view_set_current_date (GcalYearView *year_view,
icaltimetype *current_date); icaltimetype *current_date);