[Galago-commits] r2769 - in trunk/notify-python: . src tests

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-25 01:28:01 -0700 (Tue, 25 Apr 2006)
New Revision: 2769

Modified:
   trunk/notify-python/ChangeLog
   trunk/notify-python/src/Makefile.am
   trunk/notify-python/src/pynotify.defs
   trunk/notify-python/src/pynotify.override
   trunk/notify-python/src/pynotifymodule.c
   trunk/notify-python/tests/test-basic.py
Log:
- It works!
- Accept None for pynotify.Notification's icon and widget parameters, and default to None.


Modified: trunk/notify-python/ChangeLog
===================================================================
--- trunk/notify-python/ChangeLog	2006-04-25 07:59:51 UTC (rev 2768)
+++ trunk/notify-python/ChangeLog	2006-04-25 08:28:01 UTC (rev 2769)
@@ -1,3 +1,14 @@
+Tue Apr 25 01:26:43 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/Makefile.am:
+	* src/pynotify.defs:
+	* src/pynotifymodule.c:
+	* src/pynotify.override:
+	* tests/test-basic.py:
+	  - It works!
+	  - Accept None for pynotify.Notification's icon and widget parameters,
+	    and default to None.
+
 Tue Apr 25 00:59:18 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/Makefile.am:

Modified: trunk/notify-python/src/Makefile.am
===================================================================
--- trunk/notify-python/src/Makefile.am	2006-04-25 07:59:51 UTC (rev 2768)
+++ trunk/notify-python/src/Makefile.am	2006-04-25 08:28:01 UTC (rev 2769)
@@ -41,6 +41,7 @@
 update-defs:
 	@python $(datadir)/pygtk/2.0/codegen/h2def.py $(DEFHEADERS) > pynotify.defs.tmp
 	@sed -e 's/define-function notify_\(init\|uninit\|is_\|get\)/define-function \1/g' \
+	     -e '/define-function notify_notification_new/,/^$$/ { s/\("icon"\)/\1 (null-ok) (default "NULL")/g; s/\("attach"\)/\1 (null-ok) (default "NULL")/g; }' \
 	     pynotify.defs.tmp > pynotify.defs
 	@rm -f pynotify.defs.tmp
 	@echo Definitions updated

Modified: trunk/notify-python/src/pynotify.defs
===================================================================
--- trunk/notify-python/src/pynotify.defs	2006-04-25 07:59:51 UTC (rev 2768)
+++ trunk/notify-python/src/pynotify.defs	2006-04-25 08:28:01 UTC (rev 2769)
@@ -37,8 +37,8 @@
   (parameters
     '("const-gchar*" "summary")
     '("const-gchar*" "message")
-    '("const-gchar*" "icon")
-    '("GtkWidget*" "attach")
+    '("const-gchar*" "icon" (null-ok) (default "NULL"))
+    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
   )
 )
 

Modified: trunk/notify-python/src/pynotify.override
===================================================================
--- trunk/notify-python/src/pynotify.override	2006-04-25 07:59:51 UTC (rev 2768)
+++ trunk/notify-python/src/pynotify.override	2006-04-25 08:28:01 UTC (rev 2769)
@@ -94,7 +94,7 @@
 modulename pynotify
 %%
 import gobject.GObject as PyGObject_Type
-import gdk.Pixbuf as PyGdkPixbuf_Type
+import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
 import gtk.Widget as PyGtkWidget_Type
 %%
 ignore-glob

Modified: trunk/notify-python/src/pynotifymodule.c
===================================================================
--- trunk/notify-python/src/pynotifymodule.c	2006-04-25 07:59:51 UTC (rev 2768)
+++ trunk/notify-python/src/pynotifymodule.c	2006-04-25 08:28:01 UTC (rev 2769)
@@ -1,4 +1,5 @@
 #include <pygobject.h>
+#include <pygtk/pygtk.h>
 
 void pynotify_register_classes(PyObject *d);
 extern PyMethodDef pypynotify_functions[];
@@ -9,6 +10,7 @@
 	PyObject *m, *d;
 
 	init_pygobject();
+	init_pygtk();
 
 	m = Py_InitModule("pynotify._pynotify", pypynotify_functions);
 	d = PyModule_GetDict(m);

Modified: trunk/notify-python/tests/test-basic.py
===================================================================
--- trunk/notify-python/tests/test-basic.py	2006-04-25 07:59:51 UTC (rev 2768)
+++ trunk/notify-python/tests/test-basic.py	2006-04-25 08:28:01 UTC (rev 2769)
@@ -9,9 +9,8 @@
     if not pynotify.init("Basics"):
         sys.exit(1)
 
-    n = pynotify.Notification("Summary", "This is some sample content",
-                              None, None)
+    n = pynotify.Notification("Summary", "This is some sample content")
 
-    if not n.show(None):
+    if not n.show():
         print "Failed to send notification"
         sys.exit(1)