Updating branch refs/heads/master to 3fb5079dcc88ead31f5b9291a09170bab856b026 (commit) from 68012ea3a2764d40b69de38665f6da657cba273a (commit)
commit 3fb5079dcc88ead31f5b9291a09170bab856b026 Author: Danny Milosavljevic <dan...@xfce.org> Date: Fri Jan 14 18:50:17 2011 +0100 add 'spawn' of libxfce4ui. Fix required version of libxfce4menu to work with the version from GIT. configure.ac | 2 +- ui/Makefile.am | 9 ++++++--- ui/spawn.override | 4 +--- ui/ui.py | 3 +++ ui/uimodule.c | 4 ++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index f8e3a10..0044183 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) BM_DEPEND([XFCE4_UTIL], [libxfce4util-1.0], [4.1.0]) BM_DEPEND([XFCE4_XFCONF], [libxfconf-0], [4.6.2]) BM_DEPEND([XFCE4_UI], [libxfce4ui-1], [4.7.5]) -BM_DEPEND([XFCE4_MENU], [libxfce4menu-0.1], [4.6.2]) +BM_DEPEND([XFCE4_MENU], [libxfce4menu-0.1], [4.6.1]) dnl new panel diff --git a/ui/Makefile.am b/ui/Makefile.am index 6e64b3d..b0aba81 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -25,7 +25,8 @@ _ui_la_SOURCES = \ gtk_extensions.c \ sm_client.c \ titled_dialog.c \ - uimodule.c + uimodule.c \ + spawn.c defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs defs_DATA = \ @@ -33,14 +34,16 @@ defs_DATA = \ gdk_extensions.defs \ gtk_extensions.defs \ sm_client.defs \ - titled_dialog.defs + titled_dialog.defs \ + spawn.defs ui_overrides = \ dialogs.override \ gdk_extensions.override \ gtk_extensions.override \ sm_client.override \ - titled_dialog.override + titled_dialog.override \ + spawn.override EXTRA_DIST = $(defs_DATA) $(ui_overrides) gen diff --git a/ui/spawn.override b/ui/spawn.override index 0b33e80..a7ffb6b 100644 --- a/ui/spawn.override +++ b/ui/spawn.override @@ -10,11 +10,9 @@ headers %% include %% -modulename gtkextensions +modulename spawn %% import gobject.GObject as PyGObject_Type -import gtk.Window as PyGtkWindow_Type -import gtk.Widget as PyGtkWidget_Type import gtk.gdk.Screen as PyGdkScreen_Type %% ignore diff --git a/ui/ui.py b/ui/ui.py index c2facbe..dc52da3 100644 --- a/ui/ui.py +++ b/ui/ui.py @@ -2,3 +2,6 @@ from _ui import * +def spawn_command_line(*args, **kwargs): + import gtk + return(spawn_command_line_on_screen(gtk.gdk.screen_get_default(), *args, **kwargs)) diff --git a/ui/uimodule.c b/ui/uimodule.c index dd031a4..b51d5b1 100644 --- a/ui/uimodule.c +++ b/ui/uimodule.c @@ -18,12 +18,14 @@ extern PyMethodDef pygdk_extensions_functions[]; extern PyMethodDef pygtk_extensions_functions[]; extern PyMethodDef pysm_client_functions[]; extern PyMethodDef pytitled_dialog_functions[]; +extern PyMethodDef pyspawn_functions[]; void pydialogs_register_classes(PyObject *d); void pygdk_extensions_register_classes(PyObject *d); void pygtk_extensions_register_classes(PyObject *d); void pysm_client_register_classes(PyObject *d); void pytitled_dialog_register_classes(PyObject *d); +void pyspawn_register_classes(PyObject *d); void pysm_client_add_constants(PyObject *module, const gchar *strip_prefix); @@ -36,6 +38,7 @@ static PyMethodDef* each_functions[] = { pygtk_extensions_functions, pysm_client_functions, pytitled_dialog_functions, + pyspawn_functions, }; static void @@ -71,6 +74,7 @@ my_register1() pygtk_extensions_register_classes (d); pysm_client_register_classes (d); pytitled_dialog_register_classes (d); + pyspawn_register_classes (d); } DL_EXPORT(void) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits