]> git.0d.be Git - empathy.git/commitdiff
calendar-button: move from Empathy to tp-accounts-widgets
authorMarco Barisione <marco.barisione@collabora.co.uk>
Mon, 29 Jul 2013 13:20:00 +0000 (14:20 +0100)
committerMarco Barisione <marco.barisione@collabora.co.uk>
Tue, 20 Aug 2013 10:03:06 +0000 (11:03 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=699492

libempathy-gtk/Makefile.am
libempathy-gtk/empathy-calendar-button.c [deleted file]
libempathy-gtk/empathy-calendar-button.h [deleted file]
libempathy-gtk/empathy-user-info.c
tests/interactive/test-empathy-calendar-button.c
tp-account-widgets/Makefile.am
tp-account-widgets/tpaw-calendar-button.c [new file with mode: 0644]
tp-account-widgets/tpaw-calendar-button.h [new file with mode: 0644]

index 0117b15da942d32b9cf284b2eaa0fcf5345d0a4e..8665917ffbd1de5431c145a829bd305c6c2ee151 100644 (file)
@@ -33,7 +33,6 @@ libempathy_gtk_handwritten_source =                   \
        empathy-avatar-image.c                  \
        empathy-bad-password-dialog.c           \
        empathy-base-password-dialog.c          \
-       empathy-calendar-button.c \
        empathy-call-utils.c                    \
        empathy-cell-renderer-activatable.c     \
        empathy-cell-renderer-expander.c        \
@@ -96,7 +95,6 @@ libempathy_gtk_headers =                      \
        empathy-avatar-image.h                  \
        empathy-bad-password-dialog.h           \
        empathy-base-password-dialog.h          \
-       empathy-calendar-button.h \
        empathy-call-utils.h                    \
        empathy-cell-renderer-activatable.h     \
        empathy-cell-renderer-expander.h        \
diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c
deleted file mode 100644 (file)
index ca96a42..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * empathy-calendar-button.c - Source for EmpathyCalendarButton
- * Copyright (C) 2012 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "config.h"
-#include "empathy-calendar-button.h"
-
-#include <glib/gi18n-lib.h>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
-#include "empathy-debug.h"
-
-G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX)
-
-/* signal enum */
-enum {
-  DATE_CHANGED,
-  LAST_SIGNAL,
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
-struct _EmpathyCalendarButtonPriv {
-  GDate *date;
-
-  GtkWidget *button_date;
-  GtkWidget *button_clear;
-  GtkWidget *dialog;
-  GtkWidget *calendar;
-};
-
-static void
-empathy_calendar_button_finalize (GObject *object)
-{
-  EmpathyCalendarButton *self = (EmpathyCalendarButton *) object;
-
-  tp_clear_pointer (&self->priv->date, g_date_free);
-
-  G_OBJECT_CLASS (empathy_calendar_button_parent_class)->finalize (object);
-}
-
-static void
-update_label (EmpathyCalendarButton *self)
-{
-  if (self->priv->date == NULL)
-    {
-      gtk_button_set_label (GTK_BUTTON (self->priv->button_date),
-          _("Select..."));
-    }
-  else
-    {
-      gchar buffer[128];
-
-      g_date_strftime (buffer, 128, "%e %b %Y", self->priv->date);
-      gtk_button_set_label (GTK_BUTTON (self->priv->button_date), buffer);
-    }
-}
-
-static void
-empathy_calendar_button_constructed (GObject *object)
-{
-  EmpathyCalendarButton *self = (EmpathyCalendarButton *) object;
-
-  G_OBJECT_CLASS (empathy_calendar_button_parent_class)->constructed (
-      object);
-
-  update_label (self);
-}
-
-static void
-dialog_response (GtkDialog *dialog,
-    gint response,
-    EmpathyCalendarButton *self)
-{
-  GDate *date;
-  guint year, month, day;
-
-  if (response != GTK_RESPONSE_OK)
-    goto out;
-
-  gtk_calendar_get_date (GTK_CALENDAR (self->priv->calendar),
-      &year, &month, &day);
-  date = g_date_new_dmy (day, month + 1, year);
-
-  empathy_calendar_button_set_date (self, date);
-
-  g_date_free (date);
-
-out:
-  gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
-static gboolean
-dialog_destroy (GtkWidget *widget,
-    EmpathyCalendarButton *self)
-{
-  self->priv->dialog = NULL;
-  self->priv->calendar = NULL;
-
-  return FALSE;
-}
-
-static void
-update_calendar (EmpathyCalendarButton *self)
-{
-  if (self->priv->calendar == NULL)
-    return;
-
-  gtk_calendar_clear_marks (GTK_CALENDAR (self->priv->calendar));
-
-  if (self->priv->date == NULL)
-    return;
-
-  gtk_calendar_select_day (GTK_CALENDAR (self->priv->calendar),
-      g_date_get_day (self->priv->date));
-  gtk_calendar_select_month (GTK_CALENDAR (self->priv->calendar),
-      g_date_get_month (self->priv->date) - 1,
-      g_date_get_year (self->priv->date));
-  gtk_calendar_mark_day (GTK_CALENDAR (self->priv->calendar),
-      g_date_get_day (self->priv->date));
-}
-
-static void
-empathy_calendar_button_date_clicked (GtkButton *button,
-    EmpathyCalendarButton *self)
-{
-  if (self->priv->dialog == NULL)
-    {
-      GtkWidget *parent, *content;
-
-      parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
-
-      self->priv->dialog = gtk_dialog_new_with_buttons (NULL,
-          GTK_WINDOW (parent), GTK_DIALOG_MODAL,
-          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-          _("_Select"), GTK_RESPONSE_OK,
-          NULL);
-
-      gtk_window_set_transient_for (GTK_WINDOW (self->priv->dialog),
-          GTK_WINDOW (parent));
-
-      self->priv->calendar = gtk_calendar_new ();
-
-      update_calendar (self);
-
-      content = gtk_dialog_get_content_area (GTK_DIALOG (self->priv->dialog));
-
-      gtk_box_pack_start (GTK_BOX (content), self->priv->calendar, TRUE, TRUE,
-          6);
-      gtk_widget_show (self->priv->calendar);
-
-      g_signal_connect (self->priv->dialog, "response",
-          G_CALLBACK (dialog_response), self);
-      g_signal_connect (self->priv->dialog, "destroy",
-          G_CALLBACK (dialog_destroy), self);
-    }
-
-  gtk_window_present (GTK_WINDOW (self->priv->dialog));
-}
-
-static void
-empathy_calendar_button_clear_clicked (GtkButton *button,
-    EmpathyCalendarButton *self)
-{
-  empathy_calendar_button_set_date (self, NULL);
-}
-
-static void
-empathy_calendar_button_init (EmpathyCalendarButton *self)
-{
-  GtkWidget *image;
-  GtkStyleContext *context;
-
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_CALENDAR_BUTTON, EmpathyCalendarButtonPriv);
-
-  context = gtk_widget_get_style_context (GTK_WIDGET (self));
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
-
-  /* Date */
-  self->priv->button_date = gtk_button_new ();
-
-  g_signal_connect (self->priv->button_date, "clicked",
-      G_CALLBACK (empathy_calendar_button_date_clicked), self);
-
-  gtk_button_set_alignment (GTK_BUTTON (self->priv->button_date), 0, 0.5);
-
-  gtk_box_pack_start (GTK_BOX (self), self->priv->button_date, TRUE, TRUE, 0);
-  gtk_widget_show (self->priv->button_date);
-
-  /* Clear */
-  self->priv->button_clear = gtk_button_new ();
-
-  image = gtk_image_new_from_stock (GTK_STOCK_CLEAR,
-      GTK_ICON_SIZE_MENU);
-  gtk_button_set_image (GTK_BUTTON (self->priv->button_clear), image);
-  gtk_widget_show (image);
-
-  g_signal_connect (self->priv->button_clear, "clicked",
-      G_CALLBACK (empathy_calendar_button_clear_clicked), self);
-
-  gtk_box_pack_start (GTK_BOX (self), self->priv->button_clear,
-      FALSE, FALSE, 0);
-  gtk_widget_show (self->priv->button_clear);
-}
-
-static void
-empathy_calendar_button_class_init (EmpathyCalendarButtonClass *klass)
-{
-  GObjectClass *oclass = G_OBJECT_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (EmpathyCalendarButtonPriv));
-
-  oclass->finalize = empathy_calendar_button_finalize;
-  oclass->constructed = empathy_calendar_button_constructed;
-
-  signals[DATE_CHANGED] = g_signal_new ("date-changed",
-      G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0,
-      NULL, NULL,
-      g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, G_TYPE_DATE);
-}
-
-GtkWidget *
-empathy_calendar_button_new (void)
-{
-  return g_object_new (EMPATHY_TYPE_CALENDAR_BUTTON,
-      "orientation", GTK_ORIENTATION_HORIZONTAL,
-      NULL);
-}
-
-GDate *
-empathy_calendar_button_get_date (EmpathyCalendarButton *self)
-{
-  return self->priv->date;
-}
-
-void
-empathy_calendar_button_set_date (EmpathyCalendarButton *self,
-    GDate *date)
-{
-  if (date == self->priv->date)
-    return;
-
-  tp_clear_pointer (&self->priv->date, g_date_free);
-
-  if (date != NULL)
-    {
-      /* There is no g_date_copy()... */
-      self->priv->date = g_date_new_dmy (date->day, date->month, date->year);
-    }
-
-  update_label (self);
-  update_calendar (self);
-
-  g_signal_emit (self, signals[DATE_CHANGED], 0, self->priv->date);
-}
diff --git a/libempathy-gtk/empathy-calendar-button.h b/libempathy-gtk/empathy-calendar-button.h
deleted file mode 100644 (file)
index ecc8c78..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * empathy-calendar-button.h - Header for EmpathyCalendarButton
- * Copyright (C) 2012 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __EMPATHY_CALENDAR_BUTTON_H__
-#define __EMPATHY_CALENDAR_BUTTON_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyCalendarButton EmpathyCalendarButton;
-typedef struct _EmpathyCalendarButtonClass EmpathyCalendarButtonClass;
-typedef struct _EmpathyCalendarButtonPriv EmpathyCalendarButtonPriv;
-
-struct _EmpathyCalendarButtonClass {
-    GtkBoxClass parent_class;
-};
-
-struct _EmpathyCalendarButton {
-    GtkBox parent;
-    EmpathyCalendarButtonPriv *priv;
-};
-
-GType empathy_calendar_button_get_type (void);
-
-#define EMPATHY_TYPE_CALENDAR_BUTTON \
-  (empathy_calendar_button_get_type ())
-#define EMPATHY_CALENDAR_BUTTON(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_CALENDAR_BUTTON, \
-    EmpathyCalendarButton))
-#define EMPATHY_CALENDAR_BUTTON_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_CALENDAR_BUTTON, \
-  EmpathyCalendarButtonClass))
-#define EMPATHY_IS_CALENDAR_BUTTON(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_CALENDAR_BUTTON))
-#define EMPATHY_IS_CALENDAR_BUTTON_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_CALENDAR_BUTTON))
-#define EMPATHY_CALENDAR_BUTTON_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CALENDAR_BUTTON, \
-  EmpathyCalendarButtonClass))
-
-GtkWidget * empathy_calendar_button_new (void);
-
-GDate * empathy_calendar_button_get_date (EmpathyCalendarButton *self);
-
-void empathy_calendar_button_set_date (EmpathyCalendarButton *self,
-    GDate *date);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_CALENDAR_BUTTON_H__*/
index 0cda19d19fc41f34cc2798607de770770bd464e2..82559e1bd5a8fa647f201cc37158b78f098fc15b 100644 (file)
 #include "empathy-user-info.h"
 
 #include <glib/gi18n-lib.h>
-#include <tp-account-widgets/tpaw-time.h>
+#include <tp-account-widgets/tpaw-calendar-button.h>
 #include <tp-account-widgets/tpaw-contactinfo-utils.h>
+#include <tp-account-widgets/tpaw-time.h>
 
 #include "empathy-avatar-chooser.h"
-#include "empathy-calendar-button.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -77,7 +77,7 @@ contact_info_changed_cb (GtkEntry *entry,
 }
 
 static void
-bday_changed_cb (EmpathyCalendarButton *button,
+bday_changed_cb (TpawCalendarButton *button,
     GDate *date,
     EmpathyUserInfo *self)
 {
@@ -283,7 +283,7 @@ fill_contact_info_grid (EmpathyUserInfo *self)
       /* Add Value */
       if (!tp_strdiff (field->field_name, "bday"))
         {
-          w = empathy_calendar_button_new ();
+          w = tpaw_calendar_button_new ();
 
           if (field->field_value[0])
             {
@@ -292,7 +292,7 @@ fill_contact_info_grid (EmpathyUserInfo *self)
               g_date_set_parse (&date, field->field_value[0]);
               if (g_date_valid (&date))
                 {
-                  empathy_calendar_button_set_date (EMPATHY_CALENDAR_BUTTON (w),
+                  tpaw_calendar_button_set_date (TPAW_CALENDAR_BUTTON (w),
                       &date);
                 }
             }
index 81241090fc57c604a0bab4ba1123cbabde5ab0c6..a3207eed2d7b459bdac34dc52cca863e917022d2 100644 (file)
 
 #include "config.h"
 
-#include "empathy-calendar-button.h"
+#include <tp-account-widgets/tpaw-calendar-button.h>
 
 static void
-date_changed_cb (EmpathyCalendarButton *button,
+date_changed_cb (TpawCalendarButton *button,
     GDate *date,
     gpointer user_data)
 {
@@ -55,10 +55,10 @@ main (int argc,
   g_signal_connect_swapped (win, "destroy",
       G_CALLBACK (gtk_main_quit), NULL);
 
-  button = empathy_calendar_button_new ();
+  button = tpaw_calendar_button_new ();
 
   date = g_date_new_dmy (30, 11, 1984);
-  empathy_calendar_button_set_date (EMPATHY_CALENDAR_BUTTON (button), date);
+  tpaw_calendar_button_set_date (TPAW_CALENDAR_BUTTON (button), date);
   g_date_free (date);
 
   g_signal_connect (button, "date-changed",
index 5397854c267f1b8f5dd2b286ece3968c6c19a309..3aafe3df9b81930f6675ddda54e7c32d55f69295 100644 (file)
@@ -22,6 +22,7 @@ libtp_account_widgets_sources =               \
        tpaw-account-widget-private.h           \
        tpaw-account-widget-sip.c               \
        tpaw-builder.c                          \
+       tpaw-calendar-button.c                  \
        tpaw-connection-managers.c              \
        tpaw-contactinfo-utils.c                \
        tpaw-keyring.c                          \
@@ -44,6 +45,7 @@ libtp_account_widgets_headers =                       \
        tpaw-account-widget-irc.h               \
        tpaw-account-widget-sip.h               \
        tpaw-builder.h                          \
+       tpaw-calendar-button.h                  \
        tpaw-connection-managers.h              \
        tpaw-contactinfo-utils.h                \
        tpaw-keyring.h                          \
diff --git a/tp-account-widgets/tpaw-calendar-button.c b/tp-account-widgets/tpaw-calendar-button.c
new file mode 100644 (file)
index 0000000..5d52578
--- /dev/null
@@ -0,0 +1,273 @@
+/*
+ * tpaw-calendar-button.c - Source for TpawCalendarButton
+ * Copyright (C) 2012 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "config.h"
+#include "tpaw-calendar-button.h"
+
+#include <glib/gi18n-lib.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
+#include "empathy-debug.h"
+
+G_DEFINE_TYPE (TpawCalendarButton, tpaw_calendar_button, GTK_TYPE_BOX)
+
+/* signal enum */
+enum {
+  DATE_CHANGED,
+  LAST_SIGNAL,
+};
+
+static guint signals[LAST_SIGNAL] = {0};
+
+struct _TpawCalendarButtonPriv {
+  GDate *date;
+
+  GtkWidget *button_date;
+  GtkWidget *button_clear;
+  GtkWidget *dialog;
+  GtkWidget *calendar;
+};
+
+static void
+tpaw_calendar_button_finalize (GObject *object)
+{
+  TpawCalendarButton *self = (TpawCalendarButton *) object;
+
+  tp_clear_pointer (&self->priv->date, g_date_free);
+
+  G_OBJECT_CLASS (tpaw_calendar_button_parent_class)->finalize (object);
+}
+
+static void
+update_label (TpawCalendarButton *self)
+{
+  if (self->priv->date == NULL)
+    {
+      gtk_button_set_label (GTK_BUTTON (self->priv->button_date),
+          _("Select..."));
+    }
+  else
+    {
+      gchar buffer[128];
+
+      g_date_strftime (buffer, 128, "%e %b %Y", self->priv->date);
+      gtk_button_set_label (GTK_BUTTON (self->priv->button_date), buffer);
+    }
+}
+
+static void
+tpaw_calendar_button_constructed (GObject *object)
+{
+  TpawCalendarButton *self = (TpawCalendarButton *) object;
+
+  G_OBJECT_CLASS (tpaw_calendar_button_parent_class)->constructed (
+      object);
+
+  update_label (self);
+}
+
+static void
+dialog_response (GtkDialog *dialog,
+    gint response,
+    TpawCalendarButton *self)
+{
+  GDate *date;
+  guint year, month, day;
+
+  if (response != GTK_RESPONSE_OK)
+    goto out;
+
+  gtk_calendar_get_date (GTK_CALENDAR (self->priv->calendar),
+      &year, &month, &day);
+  date = g_date_new_dmy (day, month + 1, year);
+
+  tpaw_calendar_button_set_date (self, date);
+
+  g_date_free (date);
+
+out:
+  gtk_widget_hide (GTK_WIDGET (dialog));
+}
+
+static gboolean
+dialog_destroy (GtkWidget *widget,
+    TpawCalendarButton *self)
+{
+  self->priv->dialog = NULL;
+  self->priv->calendar = NULL;
+
+  return FALSE;
+}
+
+static void
+update_calendar (TpawCalendarButton *self)
+{
+  if (self->priv->calendar == NULL)
+    return;
+
+  gtk_calendar_clear_marks (GTK_CALENDAR (self->priv->calendar));
+
+  if (self->priv->date == NULL)
+    return;
+
+  gtk_calendar_select_day (GTK_CALENDAR (self->priv->calendar),
+      g_date_get_day (self->priv->date));
+  gtk_calendar_select_month (GTK_CALENDAR (self->priv->calendar),
+      g_date_get_month (self->priv->date) - 1,
+      g_date_get_year (self->priv->date));
+  gtk_calendar_mark_day (GTK_CALENDAR (self->priv->calendar),
+      g_date_get_day (self->priv->date));
+}
+
+static void
+tpaw_calendar_button_date_clicked (GtkButton *button,
+    TpawCalendarButton *self)
+{
+  if (self->priv->dialog == NULL)
+    {
+      GtkWidget *parent, *content;
+
+      parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
+
+      self->priv->dialog = gtk_dialog_new_with_buttons (NULL,
+          GTK_WINDOW (parent), GTK_DIALOG_MODAL,
+          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+          _("_Select"), GTK_RESPONSE_OK,
+          NULL);
+
+      gtk_window_set_transient_for (GTK_WINDOW (self->priv->dialog),
+          GTK_WINDOW (parent));
+
+      self->priv->calendar = gtk_calendar_new ();
+
+      update_calendar (self);
+
+      content = gtk_dialog_get_content_area (GTK_DIALOG (self->priv->dialog));
+
+      gtk_box_pack_start (GTK_BOX (content), self->priv->calendar, TRUE, TRUE,
+          6);
+      gtk_widget_show (self->priv->calendar);
+
+      g_signal_connect (self->priv->dialog, "response",
+          G_CALLBACK (dialog_response), self);
+      g_signal_connect (self->priv->dialog, "destroy",
+          G_CALLBACK (dialog_destroy), self);
+    }
+
+  gtk_window_present (GTK_WINDOW (self->priv->dialog));
+}
+
+static void
+tpaw_calendar_button_clear_clicked (GtkButton *button,
+    TpawCalendarButton *self)
+{
+  tpaw_calendar_button_set_date (self, NULL);
+}
+
+static void
+tpaw_calendar_button_init (TpawCalendarButton *self)
+{
+  GtkWidget *image;
+  GtkStyleContext *context;
+
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+      TPAW_TYPE_CALENDAR_BUTTON, TpawCalendarButtonPriv);
+
+  context = gtk_widget_get_style_context (GTK_WIDGET (self));
+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
+
+  /* Date */
+  self->priv->button_date = gtk_button_new ();
+
+  g_signal_connect (self->priv->button_date, "clicked",
+      G_CALLBACK (tpaw_calendar_button_date_clicked), self);
+
+  gtk_button_set_alignment (GTK_BUTTON (self->priv->button_date), 0, 0.5);
+
+  gtk_box_pack_start (GTK_BOX (self), self->priv->button_date, TRUE, TRUE, 0);
+  gtk_widget_show (self->priv->button_date);
+
+  /* Clear */
+  self->priv->button_clear = gtk_button_new ();
+
+  image = gtk_image_new_from_stock (GTK_STOCK_CLEAR,
+      GTK_ICON_SIZE_MENU);
+  gtk_button_set_image (GTK_BUTTON (self->priv->button_clear), image);
+  gtk_widget_show (image);
+
+  g_signal_connect (self->priv->button_clear, "clicked",
+      G_CALLBACK (tpaw_calendar_button_clear_clicked), self);
+
+  gtk_box_pack_start (GTK_BOX (self), self->priv->button_clear,
+      FALSE, FALSE, 0);
+  gtk_widget_show (self->priv->button_clear);
+}
+
+static void
+tpaw_calendar_button_class_init (TpawCalendarButtonClass *klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  g_type_class_add_private (klass, sizeof (TpawCalendarButtonPriv));
+
+  oclass->finalize = tpaw_calendar_button_finalize;
+  oclass->constructed = tpaw_calendar_button_constructed;
+
+  signals[DATE_CHANGED] = g_signal_new ("date-changed",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0,
+      NULL, NULL,
+      g_cclosure_marshal_generic,
+      G_TYPE_NONE, 1, G_TYPE_DATE);
+}
+
+GtkWidget *
+tpaw_calendar_button_new (void)
+{
+  return g_object_new (TPAW_TYPE_CALENDAR_BUTTON,
+      "orientation", GTK_ORIENTATION_HORIZONTAL,
+      NULL);
+}
+
+GDate *
+tpaw_calendar_button_get_date (TpawCalendarButton *self)
+{
+  return self->priv->date;
+}
+
+void
+tpaw_calendar_button_set_date (TpawCalendarButton *self,
+    GDate *date)
+{
+  if (date == self->priv->date)
+    return;
+
+  tp_clear_pointer (&self->priv->date, g_date_free);
+
+  if (date != NULL)
+    {
+      /* There is no g_date_copy()... */
+      self->priv->date = g_date_new_dmy (date->day, date->month, date->year);
+    }
+
+  update_label (self);
+  update_calendar (self);
+
+  g_signal_emit (self, signals[DATE_CHANGED], 0, self->priv->date);
+}
diff --git a/tp-account-widgets/tpaw-calendar-button.h b/tp-account-widgets/tpaw-calendar-button.h
new file mode 100644 (file)
index 0000000..38f2322
--- /dev/null
@@ -0,0 +1,67 @@
+/*
+ * tpaw-calendar-button.h - Header for TpawCalendarButton
+ * Copyright (C) 2012 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __TPAW_CALENDAR_BUTTON_H__
+#define __TPAW_CALENDAR_BUTTON_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+typedef struct _TpawCalendarButton TpawCalendarButton;
+typedef struct _TpawCalendarButtonClass TpawCalendarButtonClass;
+typedef struct _TpawCalendarButtonPriv TpawCalendarButtonPriv;
+
+struct _TpawCalendarButtonClass {
+    GtkBoxClass parent_class;
+};
+
+struct _TpawCalendarButton {
+    GtkBox parent;
+    TpawCalendarButtonPriv *priv;
+};
+
+GType tpaw_calendar_button_get_type (void);
+
+#define TPAW_TYPE_CALENDAR_BUTTON \
+  (tpaw_calendar_button_get_type ())
+#define TPAW_CALENDAR_BUTTON(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), TPAW_TYPE_CALENDAR_BUTTON, \
+    TpawCalendarButton))
+#define TPAW_CALENDAR_BUTTON_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), TPAW_TYPE_CALENDAR_BUTTON, \
+  TpawCalendarButtonClass))
+#define TPAW_IS_CALENDAR_BUTTON(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPAW_TYPE_CALENDAR_BUTTON))
+#define TPAW_IS_CALENDAR_BUTTON_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), TPAW_TYPE_CALENDAR_BUTTON))
+#define TPAW_CALENDAR_BUTTON_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPAW_TYPE_CALENDAR_BUTTON, \
+  TpawCalendarButtonClass))
+
+GtkWidget * tpaw_calendar_button_new (void);
+
+GDate * tpaw_calendar_button_get_date (TpawCalendarButton *self);
+
+void tpaw_calendar_button_set_date (TpawCalendarButton *self,
+    GDate *date);
+
+G_END_DECLS
+
+#endif /* #ifndef __TPAW_CALENDAR_BUTTON_H__*/