[gnome-calendar/gnome-3-20] year-view: check for desktop environment
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar/gnome-3-20] year-view: check for desktop environment
- Date: Thu, 14 Apr 2016 02:23:32 +0000 (UTC)
commit 649d03adaebfc929243ad73b5f4178818c9b0461
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Apr 13 22:57:54 2016 -0300
year-view: check for desktop environment
This is a work around the crash introduced when we
started depending on a setting that is not our own.
Since we can't do that anymore for 3.20, let's just
check for the desktop environment and avoid the crash.
src/gcal-year-view.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/gcal-year-view.c b/src/gcal-year-view.c
index 69d8c8e..5785080 100644
--- a/src/gcal-year-view.c
+++ b/src/gcal-year-view.c
@@ -1499,10 +1499,14 @@ gcal_year_view_init (GcalYearView *self)
self->end_selected_date = g_new0 (icaltimetype, 1);
self->end_selected_date->zone = e_cal_util_get_system_timezone ();
- /* bind GNOME Shell' show week numbers property to GNOME Calendar's one */
- self->shell_settings = g_settings_new ("org.gnome.shell.calendar");
- g_settings_bind (self->shell_settings, "show-weekdate", self, "show-week-numbers",
G_SETTINGS_BIND_DEFAULT);
- g_signal_connect_swapped (self->shell_settings, "changed::show-weekdate", G_CALLBACK
(gtk_widget_queue_draw), self);
+ /* FIXME: this setting should be moved to gsettings-desktop-schemas */
+ if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "GNOME") == 0)
+ {
+ /* bind GNOME Shell' show week numbers property to GNOME Calendar's one */
+ self->shell_settings = g_settings_new ("org.gnome.shell.calendar");
+ g_settings_bind (self->shell_settings, "show-weekdate", self, "show-week-numbers",
G_SETTINGS_BIND_DEFAULT);
+ g_signal_connect_swapped (self->shell_settings, "changed::show-weekdate", G_CALLBACK
(gtk_widget_queue_allocate), self);
+ }
/* default number_of_columns and number_of_rows */
self->number_of_columns = 4;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]