[Galago-commits] r2611 - in trunk/galago-gtk-python: . src tests
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Sat Mar 18 13:47:40 PST 2006
Author: chipx86
Date: 2006-03-18 13:47:37 -0800 (Sat, 18 Mar 2006)
New Revision: 2611
Modified:
trunk/galago-gtk-python/ChangeLog
trunk/galago-gtk-python/Makefile.am
trunk/galago-gtk-python/configure.ac
trunk/galago-gtk-python/src/Makefile.am
trunk/galago-gtk-python/src/galago-gdkmodule.c
trunk/galago-gtk-python/src/galago-gtk.defs
trunk/galago-gtk-python/src/galago-gtk.override
trunk/galago-gtk-python/src/galago-gtkmodule.c
trunk/galago-gtk-python/tests/Makefile.am
Log:
Properly install the Python modules so that they'll show up as galago.gtk and galago.gdk.
Modified: trunk/galago-gtk-python/ChangeLog
===================================================================
--- trunk/galago-gtk-python/ChangeLog 2006-03-18 21:46:12 UTC (rev 2610)
+++ trunk/galago-gtk-python/ChangeLog 2006-03-18 21:47:37 UTC (rev 2611)
@@ -1,3 +1,16 @@
+Sat Mar 18 13:46:49 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ * src/galago-gdkmodule.c:
+ * src/galago-gtk.defs:
+ * src/galago-gtkmodule.c:
+ * src/galago-gtk.override:
+ * src/Makefile.am:
+ * tests/Makefile.am:
+ * configure.ac:
+ * Makefile.am:
+ - Properly install the Python modules so that they'll show up as
+ galago.gtk and galago.gdk.
+
Fri Mar 17 00:56:49 PST 2006 Christian Hammond <chipx86 at chipx86.com>
A src/galago-gdk.defs:
Modified: trunk/galago-gtk-python/Makefile.am
===================================================================
--- trunk/galago-gtk-python/Makefile.am 2006-03-18 21:46:12 UTC (rev 2610)
+++ trunk/galago-gtk-python/Makefile.am 2006-03-18 21:47:37 UTC (rev 2611)
@@ -1,11 +1,11 @@
SUBDIRS = src tests
pcdatadir = $(libdir)/pkgconfig
-pcdata_DATA = galago-python.pc
+pcdata_DATA = galago-gtk-python.pc
EXTRA_DIST = \
AUTHORS NEWS INSTALL COPYING README \
ChangeLog \
autogen.sh \
configure.ac \
- galago-python.pc.in
+ galago-gtk-python.pc.in
Modified: trunk/galago-gtk-python/configure.ac
===================================================================
--- trunk/galago-gtk-python/configure.ac 2006-03-18 21:46:12 UTC (rev 2610)
+++ trunk/galago-gtk-python/configure.ac 2006-03-18 21:47:37 UTC (rev 2611)
@@ -17,6 +17,7 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+AM_PATH_PYTHON(2.3.5)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
PKG_CHECK_MODULES(GALAGO_GTK_PYTHON, \
Modified: trunk/galago-gtk-python/src/Makefile.am
===================================================================
--- trunk/galago-gtk-python/src/Makefile.am 2006-03-18 21:46:12 UTC (rev 2610)
+++ trunk/galago-gtk-python/src/Makefile.am 2006-03-18 21:47:37 UTC (rev 2611)
@@ -11,16 +11,18 @@
pkgpythondir = $(pyexecdir)/gtk-2.0
pkgpyexecdir = $(pyexecdir)/gtk-2.0
-pkgpyexec_LTLIBRARIES = galago-gtk.la galago-gdk.la
+pygalagodir = $(pkgpyexecdir)/galago
+pygalago_LTLIBRARIES = gtk.la gdk.la
+gtk_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgtk
+gtk_la_LIBADD = $(GALAGO_GTK_PYTHON_LIBS)
+gtk_la_SOURCES = galago-gtkmodule.c
+nodist_gtk_la_SOURCES = galago-gtk.c
-galago_gtk_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgalago_gtk
-galago_gtk_la_LIBADD = $(GALAGO_GTK_PYTHON_LIBS)
-galago_gtk_la_SOURCES = galago-gtkmodule.c galago-gtk.c
+gdk_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgdk
+gdk_la_LIBADD = $(GALAGO_GTK_PYTHON_LIBS)
+gdk_la_SOURCES = galago-gdkmodule.c
+nodist_gdk_la_SOURCES = galago-gdk.c
-galago_gdk_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgalago_gdk
-galago_gdk_la_LIBADD = $(GALAGO_GTK_PYTHON_LIBS)
-galago_gdk_la_SOURCES = galago-gdkmodule.c galago-gdk.c
-
CLEANFILES = galago-gtk.c galago-gdk.c
EXTRA_DIST = galago-gtk.override galago-gdk.override $(defs_DATA)
galago-gtk.c: $(defs_DATA) galago-gtk.override
Modified: trunk/galago-gtk-python/src/galago-gdkmodule.c
===================================================================
--- trunk/galago-gtk-python/src/galago-gdkmodule.c 2006-03-18 21:46:12 UTC (rev 2610)
+++ trunk/galago-gtk-python/src/galago-gdkmodule.c 2006-03-18 21:47:37 UTC (rev 2611)
@@ -1,20 +1,22 @@
#include <pygobject.h>
+#include <pygtk/pygtk.h>
void pygalago_gdk_register_classes(PyObject *d);
extern PyMethodDef pygalago_gdk_functions[];
DL_EXPORT(void)
-initgalago_gdk(void)
+initgdk(void)
{
PyObject *m, *d;
init_pygobject();
+ init_pygtk();
m = Py_InitModule("galago.gdk", pygalago_gdk_functions);
d = PyModule_GetDict(m);
pygalago_gdk_register_classes(d);
- pygalago_gdk_add_constants(m, "GALAGO_GDK_");
+ //pygalago_gdk_add_constants(m, "GALAGO_GDK_");
if (PyErr_Occurred()) {
Py_FatalError("can't initialize module galago-gdk");
Modified: trunk/galago-gtk-python/src/galago-gtk.defs
===================================================================
--- trunk/galago-gtk-python/src/galago-gtk.defs 2006-03-18 21:46:12 UTC (rev 2610)
+++ trunk/galago-gtk-python/src/galago-gtk.defs 2006-03-18 21:47:37 UTC (rev 2611)
@@ -253,35 +253,14 @@
)
)
-(define-method set_person
- (of-object "GalagoGtkAccountLabel")
- (c-name "galago_gtk_account_label_set_person")
- (return-type "none")
- (parameters
- '("GalagoPerson*" "person")
- )
-)
-
-(define-method update
- (of-object "GalagoGtkAccountLabel")
- (c-name "galago_gtk_account_label_update")
- (return-type "none")
-)
-
(define-method get_account
(of-object "GalagoGtkAccountLabel")
(c-name "galago_gtk_account_label_get_account")
(return-type "GalagoAccount*")
)
-(define-method get_person
- (of-object "GalagoGtkAccountLabel")
- (c-name "galago_gtk_account_label_get_person")
- (return-type "GalagoPerson*")
-)
-
;; From /usr/include/libgalago-gtk/galago-gtk-account-menu-item.h
(define-function galago_gtk_account_menu_item_get_type
Modified: trunk/galago-gtk-python/src/galago-gtk.override
===================================================================
--- trunk/galago-gtk-python/src/galago-gtk.override 2006-03-18 21:46:12 UTC (rev 2610)
+++ trunk/galago-gtk-python/src/galago-gtk.override 2006-03-18 21:47:37 UTC (rev 2611)
@@ -156,7 +156,7 @@
if (py_buttons == Py_None)
len = 0;
- else if (PyTiple_Check(py_buttons))
+ else if (PyTuple_Check(py_buttons))
len = PyTuple_Size(py_buttons);
else
{
Modified: trunk/galago-gtk-python/src/galago-gtkmodule.c
===================================================================
--- trunk/galago-gtk-python/src/galago-gtkmodule.c 2006-03-18 21:46:12 UTC (rev 2610)
+++ trunk/galago-gtk-python/src/galago-gtkmodule.c 2006-03-18 21:47:37 UTC (rev 2611)
@@ -1,14 +1,16 @@
#include <pygobject.h>
+#include <pygtk/pygtk.h>
void pygalago_gtk_register_classes(PyObject *d);
extern PyMethodDef pygalago_gtk_functions[];
DL_EXPORT(void)
-initgalago_gtk(void)
+initgtk(void)
{
PyObject *m, *d;
init_pygobject();
+ init_pygtk();
m = Py_InitModule("galago.gtk", pygalago_gtk_functions);
d = PyModule_GetDict(m);
@@ -17,6 +19,6 @@
pygalago_gtk_add_constants(m, "GALAGO_GTK_");
if (PyErr_Occurred()) {
- Py_FatalError("can't initialize module galago-gtk");
+ Py_FatalError("can't initialize module galago.gtk");
}
}
Modified: trunk/galago-gtk-python/tests/Makefile.am
===================================================================
--- trunk/galago-gtk-python/tests/Makefile.am 2006-03-18 21:46:12 UTC (rev 2610)
+++ trunk/galago-gtk-python/tests/Makefile.am 2006-03-18 21:47:37 UTC (rev 2611)
@@ -1,4 +1,2 @@
EXTRA_DIST = \
- avatar.png \
- get-presence.py \
- presence-feed.py
+ test-chooser.py
More information about the galago-commits
mailing list