From ed4da78a6b0bb971d353fa2d3f419c956c0ab0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erick=20P=C3=A9rez=20Castellanos?= <erick.red@gmail.com>
Date: Sun, 26 May 2013 16:54:25 -0400
Subject: [PATCH] Updated Notification system to new UI

Still mising here some way to solve the stacked notifications issue.
---
 TODO              |  1 -
 src/gcal-window.c | 29 ++++++++++++++++-------------
 src/gcal-window.h |  3 +--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/TODO b/TODO
index 3a01e9dd..527a99f0 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,6 @@ TODO
  - Remove GcalSearchbar
  - Add disable/enable of views
  - Update NewEvent widget to use GtkOverlay
- - Update Notification widget to use GtkOverlay
  - Clean GcalWindow compilation, no warnings
  - Remove Clutter dependecy
 
diff --git a/src/gcal-window.c b/src/gcal-window.c
index eb1fcd82..bc0d1366 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -49,7 +49,9 @@ struct _GcalWindowPrivate
   GtkWidget           *search_bar;
   GtkWidget           *views_overlay;
   GtkWidget           *views_stack;
+  GtkWidget           *noty; /* short-lived */
 
+  /* header_bar widets */
   GtkWidget           *new_button;
   GtkWidget           *search_entry;
   GtkWidget           *views_switcher;
@@ -911,6 +913,9 @@ gcal_window_remove_event (GdNotification  *notification,
       g_free (priv->event_to_delete);
       priv->event_to_delete = NULL;
     }
+
+  /* since this is called when the notification is dismissed is safe to do here: */
+  priv->noty = NULL;
 }
 
 static void
@@ -1099,7 +1104,6 @@ gcal_window_edit_dialog_responded (GtkDialog *dialog,
   GList *l;
 
   GtkWidget *event_widget;
-  GtkWidget *noty;
   GtkWidget *grid;
   GtkWidget *undo_button;
 
@@ -1203,7 +1207,10 @@ gcal_window_edit_dialog_responded (GtkDialog *dialog,
         break;
       case GCAL_RESPONSE_DELETE_EVENT:
         /* delete the event */
-        noty = gd_notification_new ();
+        if (priv->noty != NULL)
+          g_clear_object (&(priv->noty));
+
+        priv->noty = gd_notification_new ();
         grid = gtk_grid_new ();
         gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
         gtk_container_add (GTK_CONTAINER (grid),
@@ -1212,11 +1219,10 @@ gcal_window_edit_dialog_responded (GtkDialog *dialog,
         undo_button = gtk_button_new_from_stock (GTK_STOCK_UNDO);
         gtk_container_add (GTK_CONTAINER (grid), undo_button);
 
-        gtk_container_add (GTK_CONTAINER (noty), grid);
-        gtk_widget_show_all (noty);
-        gcal_window_show_notification (GCAL_WINDOW (user_data), noty);
+        gtk_container_add (GTK_CONTAINER (priv->noty), grid);
+        gcal_window_show_notification (GCAL_WINDOW (user_data));
 
-        g_signal_connect (noty,
+        g_signal_connect (priv->noty,
                           "dismissed",
                           G_CALLBACK (gcal_window_remove_event),
                           user_data);
@@ -1324,8 +1330,7 @@ gcal_window_new_with_view (GcalApplication   *app,
 }
 
 void
-gcal_window_show_notification (GcalWindow *window,
-                               GtkWidget  *notification)
+gcal_window_show_notification (GcalWindow *window)
 {
   GcalWindowPrivate *priv;
 
@@ -1333,19 +1338,17 @@ gcal_window_show_notification (GcalWindow *window,
   priv = window->priv;
 
   gtk_overlay_add_overlay (GTK_OVERLAY (priv->views_overlay),
-                           notification);
-  gtk_widget_show_all (notification);
+                           priv->noty);
+  gtk_widget_show_all (priv->noty);
 }
 
 void
 gcal_window_hide_notification (GcalWindow *window)
 {
   GcalWindowPrivate *priv;
-  GtkWidget *noty;
 
   g_return_if_fail (GCAL_IS_WINDOW (window));
   priv = window->priv;
 
-  /* FIXME: get notification widget somehow */
-  /* gd_notification_dismiss (GD_NOTIFICATION (noty)); */
+  gd_notification_dismiss (GD_NOTIFICATION (priv->noty));
 }
diff --git a/src/gcal-window.h b/src/gcal-window.h
index 1e27d0d1..79eb4cb5 100644
--- a/src/gcal-window.h
+++ b/src/gcal-window.h
@@ -57,8 +57,7 @@ GType        gcal_window_get_type          (void);
 GtkWidget*   gcal_window_new_with_view     (GcalApplication    *app,
                                             GcalWindowViewType  view_type);
 
-void         gcal_window_show_notification (GcalWindow         *window,
-                                            GtkWidget          *notification);
+void         gcal_window_show_notification (GcalWindow         *window);
 
 void         gcal_window_hide_notification (GcalWindow         *window);