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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-02-04 19:49:06 -0800 (Sat, 04 Feb 2006)
New Revision: 2554

Removed:
   trunk/notification-daemon/themes/standard/bgbox.c
   trunk/notification-daemon/themes/standard/bgbox.h
Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/themes/standard/Makefile.am
   trunk/notification-daemon/themes/standard/theme.c
Log:
Get rid of bgbox.[ch]. We don't use it anymore.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-02-05 01:18:54 UTC (rev 2553)
+++ trunk/notification-daemon/ChangeLog	2006-02-05 03:49:06 UTC (rev 2554)
@@ -1,3 +1,11 @@
+Sat Feb 04 19:48:49 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	D themes/standard/bgbox.c:
+	D themes/standard/bgbox.h:
+	* themes/standard/Makefile.am:
+	* themes/standard/theme.c:
+	  - Get rid of bgbox.[ch]. We don't use it anymore.
+
 Sat Feb 04 16:39:00 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon.c:

Modified: trunk/notification-daemon/themes/standard/Makefile.am
===================================================================
--- trunk/notification-daemon/themes/standard/Makefile.am	2006-02-05 01:18:54 UTC (rev 2553)
+++ trunk/notification-daemon/themes/standard/Makefile.am	2006-02-05 03:49:06 UTC (rev 2554)
@@ -2,13 +2,8 @@
 
 engine_LTLIBRARIES = libstandard.la
 
-libstandard_la_SOURCES = \
-	bgbox.c \
-	bgbox.h \
-	theme.c
-
+libstandard_la_SOURCES = theme.c
 libstandard_la_LDFLAGS = -module -avoid-version
+libstandard_la_LIBADD  = $(NOTIFICATION_DAEMON_LIBS)
 
-libstandard_la_LIBADD = $(NOTIFICATION_DAEMON_LIBS)
-
 INCLUDES = $(NOTIFICATION_DAEMON_CFLAGS)

Deleted: trunk/notification-daemon/themes/standard/bgbox.c
===================================================================
--- trunk/notification-daemon/themes/standard/bgbox.c	2006-02-05 01:18:54 UTC (rev 2553)
+++ trunk/notification-daemon/themes/standard/bgbox.c	2006-02-05 03:49:06 UTC (rev 2554)
@@ -1,68 +0,0 @@
-#include "bgbox.h"
-
-G_DEFINE_TYPE(NotifydBgBox, notifyd_bgbox, GTK_TYPE_VBOX);
-
-static gboolean
-notifyd_bgbox_expose_event(GtkWidget *bgbox, GdkEventExpose *event)
-{
-	if (GTK_WIDGET_DRAWABLE(bgbox))
-	{
-		GtkStyle *style = gtk_widget_get_style(bgbox);
-		GtkStateType state = GTK_WIDGET_STATE(bgbox);
-		GdkGC *gc;
-		guint border_width =
-			gtk_container_get_border_width(GTK_CONTAINER(bgbox));
-
-		switch (NOTIFYD_BGBOX(bgbox)->palette)
-		{
-			case NOTIFYD_BASE:
-				gc = style->base_gc[state];
-				break;
-
-			case NOTIFYD_BG:
-				gc = style->bg_gc[state];
-				break;
-
-			case NOTIFYD_FG:
-				gc = style->fg_gc[state];
-				break;
-
-			default:
-				g_assert_not_reached();
-		}
-
-#if 0
-		gdk_draw_rectangle(GDK_DRAWABLE(bgbox->window), gc, TRUE,
-						   bgbox->allocation.x + border_width,
-						   bgbox->allocation.y + border_width,
-						   bgbox->allocation.width  - 2 * border_width,
-						   bgbox->allocation.height - 2 * border_width);
-#endif
-	}
-
-	return GTK_WIDGET_CLASS(notifyd_bgbox_parent_class)->expose_event(bgbox,
-																	  event);
-}
-
-static void
-notifyd_bgbox_class_init(NotifydBgBoxClass *klass)
-{
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
-
-	widget_class->expose_event = notifyd_bgbox_expose_event;
-}
-
-static void
-notifyd_bgbox_init(NotifydBgBox *bgbox)
-{
-	bgbox->palette = NOTIFYD_BASE;
-}
-
-GtkWidget *
-notifyd_bgbox_new(NotifydPalette palette)
-{
-	NotifydBgBox *bgbox = g_object_new(NOTIFYD_TYPE_BGBOX, NULL);
-	bgbox->palette = palette;
-
-	return GTK_WIDGET(bgbox);
-}

Deleted: trunk/notification-daemon/themes/standard/bgbox.h
===================================================================
--- trunk/notification-daemon/themes/standard/bgbox.h	2006-02-05 01:18:54 UTC (rev 2553)
+++ trunk/notification-daemon/themes/standard/bgbox.h	2006-02-05 03:49:06 UTC (rev 2554)
@@ -1,45 +0,0 @@
-#ifndef _BGBOX_H_
-#define _BGBOX_H_
-
-typedef struct _NotifydBgBox      NotifydBgBox;
-typedef struct _NotifydBgBoxClass NotifydBgBoxClass;
-
-#include <gtk/gtk.h>
-
-#define NOTIFYD_TYPE_BGBOX (notifyd_bgbox_get_type())
-#define NOTIFYD_BGBOX(obj) \
-		(G_TYPE_CHECK_INSTANCE_CAST((obj), NOTIFYD_TYPE_BGBOX, NotifydBgBox))
-#define NOTIFYD_BGBOX_CLASS(klass) \
-		(G_TYPE_CHECK_CLASS_CAST((klass), NOTIFYD_TYPE_BGBOX, NotifydBgBoxClass))
-#define NOTIFYD_IS_BGBOX(obj) \
-		(G_TYPE_CHECK_INSTANCE_TYPE((obj), NOTIFYD_TYPE_BGBOX))
-#define NOTIFYD_IS_BGBOX_CLASS(klass) \
-		(G_TYPE_CHECK_CLASS_TYPE((klass), NOTIFYD_TYPE_BGBOX))
-#define NOTIFYD_BGBOX_GET_CLASS(obj) \
-		(G_TYPE_INSTANCE_GET_CLASS ((obj), NOTIFYD_TYPE_BGBOX, NotifydBgBoxClass))
-
-typedef enum
-{
-	NOTIFYD_BASE,
-	NOTIFYD_BG,
-	NOTIFYD_FG
-
-} NotifydPalette;
-
-struct _NotifydBgBox
-{
-	GtkVBox parent_object;
-
-	NotifydPalette palette;
-};
-
-struct _NotifydBgBoxClass
-{
-	GtkVBoxClass parent_class;
-};
-
-GType notifyd_bgbox_get_type(void);
-
-GtkWidget *notifyd_bgbox_new(NotifydPalette palette);
-
-#endif /* _BGBOX_H_ */

Modified: trunk/notification-daemon/themes/standard/theme.c
===================================================================
--- trunk/notification-daemon/themes/standard/theme.c	2006-02-05 01:18:54 UTC (rev 2553)
+++ trunk/notification-daemon/themes/standard/theme.c	2006-02-05 03:49:06 UTC (rev 2554)
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
 #include <libsexy/sexy-url-label.h>
-#include "bgbox.h"
 
 typedef void (*ActionInvokedCb)(GtkWindow *nw, const char *key);
 typedef void (*UrlClickedCb)(GtkWindow *nw, const char *url);