r47603 - in /packages/experimental/gnome-calendar/debian: changelog control control.in patches/0001-Hide-GOA-sources-on-Unity.patch patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch

ah at users.alioth.debian.org ah at users.alioth.debian.org
Thu Mar 17 11:05:30 UTC 2016


Author: ah
Date: Thu Mar 17 11:05:30 2016
New Revision: 47603

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47603
Log:
* New upstream release.
* Update unity patches to apply again:
  - 0001-Hide-GOA-sources-on-Unity.patch
  - 0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch
* Bump gtk+ build-dependency to 3.19.12~
  - uses new API, e.g. gtk_widget_class_set_css_name
* Bump Standards-Version to 3.9.7

Modified:
    packages/experimental/gnome-calendar/debian/changelog
    packages/experimental/gnome-calendar/debian/control
    packages/experimental/gnome-calendar/debian/control.in
    packages/experimental/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch
    packages/experimental/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch

Modified: packages/experimental/gnome-calendar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-calendar/debian/changelog?rev=47603&op=diff
==============================================================================
--- packages/experimental/gnome-calendar/debian/changelog	[utf-8] (original)
+++ packages/experimental/gnome-calendar/debian/changelog	[utf-8] Thu Mar 17 11:05:30 2016
@@ -1,3 +1,15 @@
+gnome-calendar (3.19.92-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update unity patches to apply again:
+    - 0001-Hide-GOA-sources-on-Unity.patch
+    - 0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch
+  * Bump gtk+ build-dependency to 3.19.12~
+    - uses new API, e.g. gtk_widget_class_set_css_name
+  * Bump Standards-Version to 3.9.7
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 17 Mar 2016 11:32:42 +0100
+
 gnome-calendar (3.18.3-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/experimental/gnome-calendar/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-calendar/debian/control?rev=47603&op=diff
==============================================================================
--- packages/experimental/gnome-calendar/debian/control	[utf-8] (original)
+++ packages/experimental/gnome-calendar/debian/control	[utf-8] Thu Mar 17 11:05:30 2016
@@ -15,10 +15,10 @@
                libedataserverui1.2-dev (>= 3.17.1),
                libglib2.0-dev (>= 2.43.4),
                libgoa-1.0-dev (>= 3.2.0),
-               libgtk-3-dev (>= 3.15.4),
+               libgtk-3-dev (>= 3.19.12~),
                libical-dev (>= 1.0.1),
                pkg-config (>= 0.22)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-calendar
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-calendar
 Homepage: https://wiki.gnome.org/Apps/Calendar

Modified: packages/experimental/gnome-calendar/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-calendar/debian/control.in?rev=47603&op=diff
==============================================================================
--- packages/experimental/gnome-calendar/debian/control.in	[utf-8] (original)
+++ packages/experimental/gnome-calendar/debian/control.in	[utf-8] Thu Mar 17 11:05:30 2016
@@ -11,10 +11,10 @@
                libedataserverui1.2-dev (>= 3.17.1),
                libglib2.0-dev (>= 2.43.4),
                libgoa-1.0-dev (>= 3.2.0),
-               libgtk-3-dev (>= 3.15.4),
+               libgtk-3-dev (>= 3.19.12~),
                libical-dev (>= 1.0.1),
                pkg-config (>= 0.22)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-calendar
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-calendar
 Homepage: https://wiki.gnome.org/Apps/Calendar

Modified: packages/experimental/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch?rev=47603&op=diff
==============================================================================
--- packages/experimental/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch	[utf-8] (original)
+++ packages/experimental/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch	[utf-8] Thu Mar 17 11:05:30 2016
@@ -12,8 +12,6 @@
  src/gcal-source-dialog.c |  9 +++++++++
  2 files changed, 19 insertions(+), 4 deletions(-)
 
-diff --git a/src/gcal-manager.c b/src/gcal-manager.c
-index 2a4498d..a44bee6 100644
 --- a/src/gcal-manager.c
 +++ b/src/gcal-manager.c
 @@ -21,6 +21,7 @@
@@ -24,7 +22,7 @@
  
  typedef struct
  {
-@@ -776,6 +777,7 @@ gcal_manager_constructed (GObject *object)
+@@ -790,6 +791,7 @@
    GList *sources, *l;
    GError *error = NULL;
    ESourceCredentialsProvider *credentials_provider;
@@ -32,8 +30,8 @@
  
    G_OBJECT_CLASS (gcal_manager_parent_class)->constructed (object);
  
-@@ -787,10 +789,14 @@ gcal_manager_constructed (GObject *object)
-   priv->clients = g_hash_table_new_full ((GHashFunc) e_source_hash, (GEqualFunc) e_source_equal,
+@@ -801,10 +803,14 @@
+   manager->clients = g_hash_table_new_full ((GHashFunc) e_source_hash, (GEqualFunc) e_source_equal,
                                           g_object_unref, (GDestroyNotify) free_unit_data);
  
 -  /* load GOA client */
@@ -50,12 +48,10 @@
 +    }
  
    /* reading sources and schedule its connecting */
-   priv->source_registry = e_source_registry_new_sync (NULL, &error);
-diff --git a/src/gcal-source-dialog.c b/src/gcal-source-dialog.c
-index 842dc54..c5b3543 100644
+   manager->source_registry = e_source_registry_new_sync (NULL, &error);
 --- a/src/gcal-source-dialog.c
 +++ b/src/gcal-source-dialog.c
-@@ -36,6 +36,7 @@ typedef struct
+@@ -38,6 +38,7 @@
    GtkWidget          *main_scrolledwindow;
    GtkWidget          *name_entry;
    GtkWidget          *notebook;
@@ -63,33 +59,30 @@
    GtkWidget          *remove_button;
    GtkWidget          *stack;
    GtkWidget          *web_source_grid;
-@@ -1809,11 +1810,18 @@ gcal_source_dialog_constructed (GObject *object)
-   GcalSourceDialogPrivate *priv;
+@@ -1786,11 +1787,18 @@
+   GcalSourceDialog *self;
    GtkBuilder *builder;
    GMenuModel *menu;
 +  const gchar *desktop;
  
-   priv = gcal_source_dialog_get_instance_private (GCAL_SOURCE_DIALOG (object));
+   self = GCAL_SOURCE_DIALOG (object);
  
    G_OBJECT_CLASS (gcal_source_dialog_parent_class)->constructed (object);
  
 +  desktop = g_getenv ("XDG_CURRENT_DESKTOP");
 +  if (desktop && strstr (desktop, "Unity"))
 +    {
-+      gtk_widget_hide (priv->online_account_main_grid);
++      gtk_widget_hide (self->online_account_main_grid);
 +    }
 +
    /* widget responses */
    gtk_dialog_set_default_response (GTK_DIALOG (object), GTK_RESPONSE_CANCEL);
  
-@@ -1894,6 +1902,7 @@ gcal_source_dialog_class_init (GcalSourceDialogClass *klass)
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, notification);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, notification_label);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, online_accounts_listbox);
-+  gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, online_account_main_grid);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, owncloud_stub_row);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, remove_button);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, settings_button);
--- 
-2.7.0
-
+@@ -1871,6 +1879,7 @@
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, notification);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, notification_label);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, online_accounts_listbox);
++  gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, online_account_main_grid);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, owncloud_stub_row);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, remove_button);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, settings_button);

Modified: packages/experimental/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch?rev=47603&op=diff
==============================================================================
--- packages/experimental/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch	[utf-8] (original)
+++ packages/experimental/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch	[utf-8] Thu Mar 17 11:05:30 2016
@@ -15,11 +15,9 @@
  src/gcal-source-dialog.c | 51 ++++++++++++++++++++++++++++++++++++------------
  1 file changed, 39 insertions(+), 12 deletions(-)
 
-diff --git a/src/gcal-source-dialog.c b/src/gcal-source-dialog.c
-index c5b3543..1ee8600 100644
 --- a/src/gcal-source-dialog.c
 +++ b/src/gcal-source-dialog.c
-@@ -37,6 +37,9 @@ typedef struct
+@@ -39,6 +39,9 @@
    GtkWidget          *name_entry;
    GtkWidget          *notebook;
    GtkWidget          *online_account_main_grid;
@@ -29,8 +27,8 @@
    GtkWidget          *remove_button;
    GtkWidget          *stack;
    GtkWidget          *web_source_grid;
-@@ -510,6 +513,29 @@ default_check_toggled (GObject    *object,
-     gcal_manager_set_default_source (priv->manager, priv->old_default_source);
+@@ -498,6 +501,29 @@
+     gcal_manager_set_default_source (self->manager, self->old_default_source);
  }
  
 +static void
@@ -59,7 +57,7 @@
  
  /**
   * description_label_link_activated:
-@@ -524,8 +550,7 @@ description_label_link_activated (GtkWidget *widget,
+@@ -512,8 +538,7 @@
                                    gchar     *uri,
                                    gpointer   user_data)
  {
@@ -69,8 +67,8 @@
  
    return TRUE;
  }
-@@ -669,14 +694,6 @@ name_entry_text_changed (GObject    *object,
-     e_source_set_display_name (priv->source, gtk_entry_get_text (GTK_ENTRY (priv->name_entry)));
+@@ -653,14 +678,6 @@
+     e_source_set_display_name (self->source, gtk_entry_get_text (GTK_ENTRY (self->name_entry)));
  }
  
 -static void
@@ -84,7 +82,7 @@
  /**
   * online_accounts_listbox_row_activated:
   *
-@@ -1113,8 +1130,7 @@ static void
+@@ -1095,8 +1112,7 @@
  online_accounts_settings_button_clicked (GtkWidget *button,
                                           gpointer   user_data)
  {
@@ -94,31 +92,28 @@
  }
  
  static void
-@@ -1819,6 +1835,14 @@ gcal_source_dialog_constructed (GObject *object)
+@@ -1796,6 +1812,14 @@
    desktop = g_getenv ("XDG_CURRENT_DESKTOP");
    if (desktop && strstr (desktop, "Unity"))
      {
-+      gtk_container_remove (GTK_CONTAINER (priv->online_account_main_grid),
-+                            priv->online_accounts_settings_button);
-+      gtk_container_add (GTK_CONTAINER (priv->other_calendars_main_grid),
-+                         priv->online_accounts_settings_button);
-+      gtk_container_child_set (GTK_CONTAINER (priv->other_calendars_main_grid),
-+                               priv->other_calendars_main_frame,
++      gtk_container_remove (GTK_CONTAINER (self->online_account_main_grid),
++                            self->online_accounts_settings_button);
++      gtk_container_add (GTK_CONTAINER (self->other_calendars_main_grid),
++                         self->online_accounts_settings_button);
++      gtk_container_child_set (GTK_CONTAINER (self->other_calendars_main_grid),
++                               self->other_calendars_main_frame,
 +                               "width", 3,
 +                               NULL);
-       gtk_widget_hide (priv->online_account_main_grid);
+       gtk_widget_hide (self->online_account_main_grid);
      }
  
-@@ -1903,6 +1927,9 @@ gcal_source_dialog_class_init (GcalSourceDialogClass *klass)
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, notification_label);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, online_accounts_listbox);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, online_account_main_grid);
-+  gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, online_accounts_settings_button);
-+  gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, other_calendars_main_grid);
-+  gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, other_calendars_main_frame);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, owncloud_stub_row);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, remove_button);
-   gtk_widget_class_bind_template_child_private (widget_class, GcalSourceDialog, settings_button);
--- 
-2.7.0
-
+@@ -1880,6 +1904,9 @@
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, notification_label);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, online_accounts_listbox);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, online_account_main_grid);
++  gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, online_accounts_settings_button);
++  gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, other_calendars_main_grid);
++  gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, other_calendars_main_frame);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, owncloud_stub_row);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, remove_button);
+   gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, settings_button);




More information about the pkg-gnome-commits mailing list