[Galago-commits] r2552 - in trunk/notification-daemon: . src themes/bubble

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-02-04 16:40:12 -0800 (Sat, 04 Feb 2006)
New Revision: 2552

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/daemon.c
   trunk/notification-daemon/themes/bubble/eggnotificationbubblewidget.c
Log:
Attempt to fix button ordering in the Bubble widget. The structure of the widget is a bit jumbled, so there may be side-effects with the alignment.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-02-05 00:24:33 UTC (rev 2551)
+++ trunk/notification-daemon/ChangeLog	2006-02-05 00:40:12 UTC (rev 2552)
@@ -1,3 +1,11 @@
+Sat Feb 04 16:39:00 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon.c:
+	* themes/bubble/eggnotificationbubblewidget.c:
+	  - Attempt to fix button ordering in the Bubble widget. The structure
+	    of the widget is a bit jumbled, so there may be side-effects with
+	    the alignment.
+
 Sat Feb 04 16:23:30 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* themes/bubble/theme.c:

Modified: trunk/notification-daemon/src/daemon.c
===================================================================
--- trunk/notification-daemon/src/daemon.c	2006-02-05 00:24:33 UTC (rev 2551)
+++ trunk/notification-daemon/src/daemon.c	2006-02-05 00:40:12 UTC (rev 2552)
@@ -86,6 +86,8 @@
 #endif /* D-BUS < 0.60 */
 
 static void notify_daemon_finalize(GObject *object);
+static void _close_notification(NotifyDaemon *daemon, guint id,
+								gboolean hide_notification);
 static void _emit_closed_signal(GObject *notify_widget);
 static void _action_invoked_cb(GtkWindow *nw, const char *key);
 
@@ -147,6 +149,7 @@
 static void
 _action_invoked_cb(GtkWindow *nw, const char *key)
 {
+	NotifyDaemon *daemon = g_object_get_data(G_OBJECT(nw), "_notify_daemon");
 	DBusConnection *con;
 	DBusError error;
 
@@ -185,6 +188,11 @@
 		dbus_message_unref(message);
 		dbus_connection_unref(con);
 	}
+
+	_close_notification(
+		daemon,
+		GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(nw), "_notify_id")),
+		TRUE);
 }
 
 static void

Modified: trunk/notification-daemon/themes/bubble/eggnotificationbubblewidget.c
===================================================================
--- trunk/notification-daemon/themes/bubble/eggnotificationbubblewidget.c	2006-02-05 00:24:33 UTC (rev 2551)
+++ trunk/notification-daemon/themes/bubble/eggnotificationbubblewidget.c	2006-02-05 00:40:12 UTC (rev 2552)
@@ -256,12 +256,15 @@
 
     if (bubble_widget->button_hbox != NULL)
       {
+        GtkWidget *alignment = gtk_alignment_new(1.0, 0.5, 0, 0);
+        gtk_widget_show(alignment);
         gtk_table_attach (GTK_TABLE (bubble_widget->table),
-                          bubble_widget->button_hbox,
+                          alignment,
                           0, 2, 2, 3,
                           GTK_FILL, GTK_FILL,
                           0, 0);
 
+        gtk_container_add(GTK_CONTAINER(alignment), bubble_widget->button_hbox);
       }
 
     gtk_widget_show_all (bubble_widget->table);
@@ -1177,10 +1180,7 @@
   if (bubble_widget->button_hbox == NULL)
     bubble_widget->button_hbox = gtk_hbox_new (FALSE, 0);
 
-  gtk_box_pack_end (GTK_BOX (bubble_widget->button_hbox),
-                    b,
-                    FALSE, FALSE,
-                    0);
+  gtk_box_pack_start(GTK_BOX (bubble_widget->button_hbox), b, FALSE, FALSE, 0);
 
   return (b);
 }