Changeset 2512

Timestamp:

01/29/06 13:07:46

Author:

chipx86

Message:

- Patch by Michael Vogt and modified a bit by me to add a close button to notifications. This is similar to the one used in Ubuntu Dapper, with a small placement change and functionality change: the notification no longer emits the ActionInvoked? for the default action when closed. This closes ticket #8.
- Moved data freeing for the standard theme and for theme engine unreffing out of the close functions and into a callback specified through g_object_set_data_full().
- The daemon now listens for when notification windows are destroyed, and reacts appropriately, instead of crashing.

Files:

• trunk/notification-daemon/ChangeLog (modified) (1 diff)
• trunk/notification-daemon/src/daemon.c (modified) (6 diffs)
• trunk/notification-daemon/src/engines.c (modified) (4 diffs)
• trunk/notification-daemon/themes/standard/theme.c (modified) (5 diffs)

trunk/notification-daemon/ChangeLog

@@ +1 @@
+Sun Jan 29 13:03:09 PST 2006  Christian Hammond <chipx86@chipx86.com>
+
+    * src/daemon.c:
+    * src/engines.c:
+    * themes/standard/theme.c:
+      - Patch by Michael Vogt and modified a bit by me to add a close
+        button to notifications. This is similar to the one used in Ubuntu
+        Dapper, with a small placement change and functionality change: the
+        notification no longer emits the ActionInvoked for the default action
+        when closed. This closes ticket #8.
+      - Moved data freeing for the standard theme and for theme engine
+        unreffing out of the close functions and into a callback specified
+        through g_object_set_data_full().
+      - The daemon now listens for when notification windows are destroyed,
+        and reacts appropriately, instead of crashing.
+
-Sun Jan 29 12:12:43 PST 2006  Christian Hammond <chipx86@chipx86.com>
-

trunk/notification-daemon/src/daemon.c

@@ -231 +231 @@
-
-static void
-
+, gboolean hide_notification
-{
-    NotifyDaemonPrivate *priv = daemon->priv;
@@ -242 +242 @@
-        _emit_closed_signal(G_OBJECT(nt->nw));
-
-
+
+
+
-        g_hash_table_remove(priv->notification_hash, &id);
-    }
+}
+
+static void
+_notification_destroyed_cb(GtkWindow *nw, NotifyDaemon *daemon)
+{
+    _close_notification(
+        daemon,
+        GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(nw), "_notify_id")),
+        FALSE);
-}
-
@@ -526 +537 @@
-    _action_invoked_cb(nw, "default");
-
-
-
+
+
+
+
-}
-
@@ -819 +832 @@
-        g_object_set_data(G_OBJECT(nw), "_notify_daemon", daemon);
-        new_notification = TRUE;
+
+        g_signal_connect(G_OBJECT(nw), "button-release-event",
+                         G_CALLBACK(window_clicked_cb), daemon);
+        g_signal_connect(G_OBJECT(nw), "destroy",
+                         G_CALLBACK(_notification_destroyed_cb), daemon);
-    }
-
@@ -930 +948 @@
-    }
-
-    g_signal_connect(G_OBJECT(nw), "button-release-event",
-                     G_CALLBACK(window_clicked_cb), daemon);
-
-
-    if (!screensaver_active(GTK_WIDGET(nw)) &&
-        !fullscreen_window_exists(GTK_WIDGET(nw)))
@@ -966 +980 @@
-                                         guint id, GError ** error)
-{
-
+, TRUE
-
-    return TRUE;

trunk/notification-daemon/src/engines.c

@@ -40 +40 @@
-    g_free(filename);
-
-    printf("Loading path '%s'\n", path);
-    engine = g_new0(ThemeEngine, 1);
-    engine->ref_count = 1;
@@ -146 +145 @@
-}
-
+static void
+theme_engine_unref(ThemeEngine *engine)
+{
+    engine->ref_count--;
+
+    if (engine->ref_count == 0)
+        destroy_engine(engine);
+}
+
-GtkWindow *
-theme_create_notification(UrlClickedCb url_clicked_cb)
@@ -151 +159 @@
-    ThemeEngine *engine = get_theme_engine();
-    GtkWindow *nw = engine->create_notification(url_clicked_cb);
-
+
+
-    engine->ref_count++;
-    return nw;
@@ -161 +170 @@
-    ThemeEngine *engine = g_object_get_data(G_OBJECT(nw), "_theme_engine");
-    engine->destroy_notification(nw);
-
-    engine->ref_count--;
-
-    if (engine->ref_count == 0)
-        destroy_engine(engine);
-}
-

trunk/notification-daemon/themes/standard/theme.c

@@ -83 +83 @@
-}
-
+static void
+destroy_windata(WindowData *windata)
+{
+    if (windata->gc != NULL)
+        g_object_unref(G_OBJECT(windata->gc));
+
+    if (windata->border_points != NULL)
+        g_free(windata->border_points);
+
+    if (windata->window_region != NULL)
+        gdk_region_destroy(windata->window_region);
+}
+
-GtkWindow *
-create_notification(UrlClickedCb url_clicked)
@@ -89 +102 @@
-    GtkWidget *main_vbox;
-    GtkWidget *hbox;
+    GtkWidget *hbox2;
-    GtkWidget *vbox;
+    GtkWidget *close_button;
+    GtkWidget *image;
-    GtkRequisition req;
-    WindowData *windata;
@@ -98 +114 @@
-    win = gtk_window_new(GTK_WINDOW_POPUP);
-    gtk_widget_add_events(win, GDK_BUTTON_RELEASE_MASK);
-
+
+
-    gtk_widget_set_app_paintable(win, TRUE);
-
@@ -144 +161 @@
-    gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
-
+    hbox2 = gtk_hbox_new(FALSE, 6);
+    gtk_widget_show(hbox2);
+    gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0);
+
-    windata->summary_label = gtk_label_new(NULL);
-    gtk_widget_show(windata->summary_label);
-vbox), windata->summary_label, FALSE, FALS
+hbox2), windata->summary_label, TRUE, TRU
-    gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
-    gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
+
+    /* Add the close button */
+    close_button = gtk_button_new();
+    gtk_widget_show(close_button);
+    gtk_box_pack_start(GTK_BOX(hbox2), close_button, FALSE, FALSE, 0);
+    gtk_button_set_relief(GTK_BUTTON(close_button), GTK_RELIEF_NONE);
+    gtk_container_set_border_width(GTK_CONTAINER(close_button), 0);
+    gtk_widget_set_size_request(close_button, 20, 20);
+    g_signal_connect_swapped(G_OBJECT(close_button), "clicked",
+                             G_CALLBACK(gtk_widget_destroy), win);
+
+    image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+    gtk_widget_show(image);
+    gtk_container_add(GTK_CONTAINER(close_button), image);
-
-    windata->body_label = sexy_url_label_new();
@@ -171 +206 @@
-destroy_notification(GtkWindow *nw)
-{
-    WindowData *windata = g_object_get_data(G_OBJECT(nw), "windata");
-    g_assert(windata != NULL);
-
-    if (windata->gc != NULL)
-        g_object_unref(G_OBJECT(windata->gc));
-
-    if (windata->border_points != NULL)
-        g_free(windata->border_points);
-
-    if (windata->window_region != NULL)
-        gdk_region_destroy(windata->window_region);
-
-    gtk_widget_destroy(GTK_WIDGET(nw));
-}