[Galago-commits] r2467 - in trunk/notification-daemon: . themes/standard

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-22 23:31:54 -0800 (Sun, 22 Jan 2006)
New Revision: 2467

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/themes/standard/theme.c
Log:
Hook the actions back up again. Switching to the BgBox widget broke this.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-01-23 07:03:28 UTC (rev 2466)
+++ trunk/notification-daemon/ChangeLog	2006-01-23 07:31:54 UTC (rev 2467)
@@ -1,3 +1,9 @@
+Sun Jan 22 23:31:36 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* themes/standard/theme.c:
+	  - Hook the actions back up again. Switching to the BgBox widget broke
+	    this.
+
 Sun Jan 22 23:02:37 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* themes/standard/theme.c:

Modified: trunk/notification-daemon/themes/standard/theme.c
===================================================================
--- trunk/notification-daemon/themes/standard/theme.c	2006-01-23 07:03:28 UTC (rev 2466)
+++ trunk/notification-daemon/themes/standard/theme.c	2006-01-23 07:31:54 UTC (rev 2467)
@@ -147,6 +147,7 @@
 	gtk_widget_show(windata->summary_label);
 	gtk_box_pack_start(GTK_BOX(vbox), windata->summary_label, FALSE, FALSE, 0);
 	gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
+	gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
 
 	windata->body_label = sexy_url_label_new();
 	gtk_widget_show(windata->body_label);
@@ -275,6 +276,7 @@
 	 *       right-click menu.
 	 */
 	WindowData *windata = g_object_get_data(G_OBJECT(nw), "windata");
+	GtkWidget *eventbox;
 	GtkWidget *bgbox;
 	GtkWidget *label;
 	GdkCursor *cursor;
@@ -290,21 +292,27 @@
 						    FALSE, FALSE, 0);
 	}
 
-	bgbox = notifyd_bgbox_new(NOTIFYD_BASE);
-	gtk_widget_show(bgbox);
-	gtk_box_pack_start(GTK_BOX(windata->actions_box), bgbox, FALSE, FALSE, 0);
+	eventbox = gtk_event_box_new();
+	gtk_widget_show(eventbox);
+	gtk_box_pack_start(GTK_BOX(windata->actions_box), eventbox,
+					   FALSE, FALSE, 0);
 
-	g_object_set_data(G_OBJECT(bgbox), "_nw", nw);
-	g_object_set_data_full(G_OBJECT(bgbox),
+	g_object_set_data(G_OBJECT(eventbox), "_nw", nw);
+	g_object_set_data_full(G_OBJECT(eventbox),
 						   "_action_key", g_strdup(key), g_free);
-	g_signal_connect(G_OBJECT(bgbox), "button-release-event",
+	g_signal_connect(G_OBJECT(eventbox), "button-release-event",
 					 G_CALLBACK(action_clicked_cb), cb);
 
-	cursor = gdk_cursor_new_for_display(gtk_widget_get_display(bgbox),
+	cursor = gdk_cursor_new_for_display(gtk_widget_get_display(eventbox),
 										GDK_HAND2);
-	gdk_window_set_cursor(bgbox->window, cursor);
+	gtk_widget_realize(eventbox);
+	gdk_window_set_cursor(eventbox->window, cursor);
 	gdk_cursor_unref(cursor);
 
+	bgbox = notifyd_bgbox_new(NOTIFYD_BASE);
+	gtk_widget_show(bgbox);
+	gtk_container_add(GTK_CONTAINER(eventbox), bgbox);
+
 	label = gtk_label_new(NULL);
 	gtk_widget_show(label);
 	gtk_container_add(GTK_CONTAINER(bgbox), label);