[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/xfce/libxfce4ui
Updating branch refs/heads/master
to 69fcad9d68973ed8e7c3d76ee12f43300a1e8291 (commit)
from 788ac47081c892a46cc753b2e97fb3966318a9bd (commit)
commit 69fcad9d68973ed8e7c3d76ee12f43300a1e8291
Merge: 788ac47 4fc47be
Author: Danny Milosavljevic
Date: Fri Jan 14 20:55:00 2011 +0100
Merge branch 'master' of ssh://git.xfce.org/git/xfce/libxfce4ui
commit 4fc47be3e47055b391a464f409df469f44bb436d
Author: Mișu Moldovan
Date: Tue Jan 11 12:59:02 2011 +0100
l10n: Updated Romanian (ro) translation to 100%
New status: 31 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 57a986002e4af628733b6e48718eae98fc2b9b62
Author: Mișu Moldovan
Date: Thu Jan 6 13:45:35 2011 +0100
l10n: Updated Romanian (ro) translation to 100%
New status: 31 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 30f7bafb370cf1b281c87fbc662e853820194c2a
Author: Nick Schermer
Date: Tue Jan 4 23:01:46 2011 +0100
Small fix in previous commit.
I always fail to see why this function does not accept NULL...
commit 4bded49a31e58b85305d176490d8e08f7a5408da
Author: Nick Schermer
Date: Tue Jan 4 21:25:38 2011 +0100
Fix memory corruption in register function (bug #5892).
Also cleanup the function a bit.
libxfce4kbd-private/xfce-shortcuts-provider.c | 35 +
po/ro.po | 102 ++---
2 files changed, 76 insertions(+), 61 deletions(-)
diff --git a/libxfce4kbd-private/xfce-shortcuts-provider.c
b/libxfce4kbd-private/xfce-shortcuts-provider.c
index b2522ef..528503d 100644
--- a/libxfce4kbd-private/xfce-shortcuts-provider.c
+++ b/libxfce4kbd-private/xfce-shortcuts-provider.c
@@ -235,33 +235,36 @@ static void
xfce_shortcuts_provider_register (XfceShortcutsProvider *provider)
{
gchar **provider_names;
- const gchar **names;
+ gchar **names;
gboolean already_registered = FALSE;
- gint length;
gint i;
+ const gchar *name;
g_return_if_fail (XFCE_IS_SHORTCUTS_PROVIDER (provider));
- provider_names = xfconf_channel_get_string_list (provider->priv->channel,
"/providers");
-
- for (i = 0; provider_names != NULL && provider_names[i] != NULL; ++i)
-if (G_UNLIKELY (g_str_equal (provider_names[i],
xfce_shortcuts_provider_get_name (provider
- {
-already_registered = TRUE;
-break;
- }
+ name = xfce_shortcuts_provider_get_name (provider);
+ if (G_UNLIKELY (name == NULL))
+return;
- length = i;
+ provider_names = xfconf_channel_get_string_list (provider->priv->channel,
"/providers");
+ if (provider_names != NULL)
+for (i = 0; !already_registered && provider_names[i] != NULL; i++)
+ already_registered = g_str_equal (provider_names[i], name);
if (G_UNLIKELY (!already_registered))
{
- names = g_new0 (const gchar *, length + 1);
- for (i = 0; provider_names != NULL && provider_names[i] != NULL; ++i)
-names[i] = provider_names[i];
- names[i++] = xfce_shortcuts_provider_get_name (provider);
+ names = g_new0 (gchar *, (provider_names != NULL ? g_strv_length
(provider_names) : 0) + 2);
+ i = 0;
+
+ if (provider_names != NULL)
+for (; provider_names[i] != NULL; i++)
+ names[i] = provider_names[i];
+
+ names[i++] = (gchar *) name;
names[i] = NULL;
- xfconf_channel_set_string_list (provider->priv->channel, "/providers",
names);
+ xfconf_channel_set_string_list (provider->priv->channel, "/providers",
+ (const gchar * const *) names);
g_free (names);
}
diff --git a/po/ro.po b/po/ro.po
index f09c3ad..55d223f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,78 +1,86 @@
# Romanian translations for libxfce4ui
# Traducerea în limba română pentru pachetul libxfce4util.
-# Copyright (C) 2007-2009 THE xfce4ui's COPYRIGHT HOLDER
-# This file is distributed under the same license as the libxfce4util package.
-# Mișu Moldovan , 2009.
+# Copyright (C) 2007-2011 THE libxfce4ui's COPYRIGHT HOLDER
+# This file is distributed under the same license as the libxfce4ui package.
+# Mișu Moldovan , 2009-2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: libxfce4ui 4.6\n"
+"Project-Id-Version: libxfce4ui 4.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-18 15:10+0100\n"
-"PO-Revision-Date: 2009-02-02 21:52+0200\n"
+"POT-Creation-Date: 2011-01-06 11:08+\n"
+"PO-Revision-Date: 2011-01-11 13:58+0200\n"
"Last-Translator: Mișu Moldovan \n"
-"Language-Team: Romanian\n"
+"Language-Team: Romanian \n"
+"Language: ro\n"
"MI
[Xfce4-commits] xfce_spawn_startup_watch: do not mess with the marshaller the user set up.
Updating branch refs/heads/master to 788ac47081c892a46cc753b2e97fb3966318a9bd (commit) from 406dcf32d4fdecdb76d31539aef655c11239038b (commit) commit 788ac47081c892a46cc753b2e97fb3966318a9bd Author: Danny Milosavljevic Date: Fri Jan 14 20:53:13 2011 +0100 xfce_spawn_startup_watch: do not mess with the marshaller the user set up. libxfce4ui/xfce-spawn.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libxfce4ui/xfce-spawn.c b/libxfce4ui/xfce-spawn.c index 731ffb2..3b4e108 100644 --- a/libxfce4ui/xfce-spawn.c +++ b/libxfce4ui/xfce-spawn.c @@ -154,7 +154,7 @@ xfce_spawn_startup_watch (GPid pid, g_value_init (&instance_and_params[1], G_TYPE_INT); g_value_set_int (&instance_and_params[1], status); - g_closure_set_marshal (spawn_data->closure, g_cclosure_marshal_VOID__INT); + /*the caller, not us, needs to do: g_closure_set_marshal (spawn_data->closure, g_cclosure_marshal_VOID__INT);*/ g_closure_invoke (spawn_data->closure, NULL, 2, instance_and_params, NULL); @@ -245,7 +245,7 @@ xfce_spawn_get_active_workspace_number (GdkScreen *screen) /** - * xfce_spawn_on_screen_with_closure: + * xfce_spawn_on_screen_with_child_watch: * @screen : a #GdkScreen or %NULL to use the active screen, *see xfce_gdk_screen_get_active(). * @working_directory : child's current working directory or %NULL to ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] add wrapper for xfce_spawn_on_screen_with_child_watch .
Updating branch refs/heads/master
to ce3fa5e8c556e14a8127d67192484fe2f59b5595 (commit)
from df6a5c2da0203f6704379da333bfadafc837949f (commit)
commit ce3fa5e8c556e14a8127d67192484fe2f59b5595
Author: Danny Milosavljevic
Date: Fri Jan 14 20:54:35 2011 +0100
add wrapper for xfce_spawn_on_screen_with_child_watch .
examples/spawn/testspawn.py |7 +-
ui/spawn.override | 46 +++
ui/ui.py| 36 +++--
3 files changed, 73 insertions(+), 16 deletions(-)
diff --git a/examples/spawn/testspawn.py b/examples/spawn/testspawn.py
index 17bfd31..78abfc6 100644
--- a/examples/spawn/testspawn.py
+++ b/examples/spawn/testspawn.py
@@ -9,4 +9,9 @@ import xfce4.ui
import xfce4.util
import shlex
-xfce4.ui.spawn_on_screen(gtk.gdk.screen_get_default(), "/", ["xterm"],
os.environ, set(["search_path"]), False, gtk.get_current_event_time(), "xterm")
+def watch(inst, status):
+ print(status)
+
+#xfce4.ui.spawn_on_screen(gtk.gdk.screen_get_default(), "/", ["xterm"],
os.environ, set(["search_path"]), False, gtk.get_current_event_time(), "xterm")
+xfce4.ui.spawn_on_screen_with_child_watch(gtk.gdk.screen_get_default(), "/",
["xterm"], os.environ, set(["search_path"]), False,
gtk.get_current_event_time(), "xterm", watch)
+gtk.main()
diff --git a/ui/spawn.override b/ui/spawn.override
index 2d6826a..01b0684 100644
--- a/ui/spawn.override
+++ b/ui/spawn.override
@@ -70,3 +70,49 @@ _wrap_xfce_spawn_on_screen(PyObject *self, PyObject *args,
PyObject *kwargs)
return NULL;
return PyBool_FromLong(ret);
}
+%%
+override xfce_spawn_on_screen_with_child_watch kwargs
+static PyObject *
+_wrap_xfce_spawn_on_screen_with_child_watch(PyObject *self, PyObject *args,
PyObject *kwargs)
+{
+static char *kwlist[] = { "screen", "working_directory", "argv", "envp",
"flags", "startup_notify", "startup_timestamp", "startup_icon_name",
"callback", NULL };
+PyGObject *screen;
+char *working_directory, *startup_icon_name;
+char** c_argv;
+char** c_envp;
+PyObject* argv;
+PyObject* envp;
+int flags, startup_notify, ret;
+unsigned long startup_timestamp;
+GError *error = NULL;
+PyObject* py_callback;
+GClosure *closure;
+
+if (!PyArg_ParseTupleAndKeywords(args,
kwargs,"O!sOOiiksO:spawn_on_screen", kwlist, &PyGdkScreen_Type, &screen,
&working_directory, &argv, &envp, &flags, &startup_notify, &startup_timestamp,
&startup_icon_name, &py_callback))
+return NULL;
+
+if (!PyCallable_Check(py_callback)) {
+PyErr_SetString(PyExc_TypeError, "callback argument not callable");
+return NULL;
+}
+if(!PySequence_Check(argv)) {
+PyErr_SetObject(PyExc_TypeError, argv);
+return NULL;
+}
+if(!PySequence_Check(envp)) {
+PyErr_SetObject(PyExc_TypeError, envp);
+return NULL;
+}
+c_envp = PyStringList_AsStrv(envp);
+c_argv = PyStringList_AsStrv(argv);
+closure = pyg_closure_new(py_callback, NULL, NULL);
+ret = xfce_spawn_on_screen_with_child_watch(GDK_SCREEN(screen->obj),
working_directory, c_argv, c_envp, flags, startup_notify, startup_timestamp,
startup_icon_name, closure, &error);
+/* FIXME does this leak? pygobject_watch_closure((PyObject *)self,
closure); */
+/*g_closure_set_marshal (spawn_data->closure,
g_cclosure_marshal_VOID__INT);*/
+g_strfreev(c_envp);
+g_strfreev(c_argv);
+
+if (pyg_error_check(&error))
+return NULL;
+return PyBool_FromLong(ret);
+}
diff --git a/ui/ui.py b/ui/ui.py
index 1f89115..177d267 100644
--- a/ui/ui.py
+++ b/ui/ui.py
@@ -14,21 +14,27 @@ SPAWN_STDERR_TO_DEV_NULL = 1 << 4
SPAWN_CHILD_INHERITS_STDIN = 1 << 5
SPAWN_FILE_AND_ARGV_ZERO = 1 << 6
+def to_c_envp(source):
+ if hasattr(source, "items"):
+ return ["%s=%s" % (key, value) for key, value in source.items()]
+ else:
+ return source
+
+def to_c_flags(source):
+ if isinstance(source, int):
+ return(source)
+ else:
+ result = 0
+ bits = ["leave_descriptors_open", "do_not_reap_child",
"search_path", "stdout_to_dev_null", "stderr_to_dev_null",
"child_inherits_stdin", "file_and_argv_zero"]
+ for i, name in enumerate(bits):
+ if name in source:
+ result |= 1 << i
+ return result
+
def spawn_on_screen(screen, working_directory, argv, envp, flags,
startup_notify, st
[Xfce4-commits] add 'testspawn' example.
Updating branch refs/heads/master
to df6a5c2da0203f6704379da333bfadafc837949f (commit)
from 13a5eb594a7b02efe624495b3c3e84fb9bb0157e (commit)
commit df6a5c2da0203f6704379da333bfadafc837949f
Author: Danny Milosavljevic
Date: Fri Jan 14 20:14:58 2011 +0100
add 'testspawn' example.
examples/Makefile.am|2 +-
examples/configure.ac |1 +
examples/spawn/testspawn.py | 12
3 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 37fe47a..1dc2a8c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -4,4 +4,4 @@ ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = 1.7
-SUBDIRS = panel systemtray
+SUBDIRS = panel systemtray spawn
diff --git a/examples/configure.ac b/examples/configure.ac
index 66a0542..d29a21e 100644
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -65,5 +65,6 @@ AC_CONFIG_FILES(
panel/Makefile
panel/testplugin1/Makefile
systemtray/Makefile
+ spawn/Makefile
)
AC_OUTPUT
diff --git a/examples/spawn/testspawn.py b/examples/spawn/testspawn.py
new file mode 100644
index 000..17bfd31
--- /dev/null
+++ b/examples/spawn/testspawn.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python2
+
+import sys
+import os
+import pygtk
+pygtk.require("2.0")
+import gtk
+import xfce4.ui
+import xfce4.util
+import shlex
+
+xfce4.ui.spawn_on_screen(gtk.gdk.screen_get_default(), "/", ["xterm"],
os.environ, set(["search_path"]), False, gtk.get_current_event_time(), "xterm")
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] add wrapper for spawn_on_screen .
Updating branch refs/heads/master
to 13a5eb594a7b02efe624495b3c3e84fb9bb0157e (commit)
from 3fb5079dcc88ead31f5b9291a09170bab856b026 (commit)
commit 13a5eb594a7b02efe624495b3c3e84fb9bb0157e
Author: Danny Milosavljevic
Date: Fri Jan 14 20:12:09 2011 +0100
add wrapper for spawn_on_screen .
ui/spawn.override | 48
ui/ui.py | 27 +++
2 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/ui/spawn.override b/ui/spawn.override
index a7ffb6b..2d6826a 100644
--- a/ui/spawn.override
+++ b/ui/spawn.override
@@ -4,9 +4,21 @@
%%
headers
#include "pygobject.h"
+#include
#include
#include
+static char** PyStringList_AsStrv(PyObject* argv) { /* does NOT copy */
+ int c_argc;
+ char** c_argv;
+ int i;
+ c_argc = PySequence_Length(argv);
+ c_argv = (char**) g_malloc0_n(c_argc + 1, sizeof(char*));
+ for(i = 0; i < c_argc; ++i)
+ c_argv[i] = strdup(PyString_AsString(PyList_GetItem(argv, i)));
+ return(c_argv);
+}
+
%%
include
%%
@@ -22,3 +34,39 @@ ignore-glob
%%
ignore-win32
%%
+override xfce_spawn_on_screen kwargs
+static PyObject *
+_wrap_xfce_spawn_on_screen(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+static char *kwlist[] = { "screen", "working_directory", "argv", "envp",
"flags", "startup_notify", "startup_timestamp", "startup_icon_name", NULL };
+PyGObject *screen;
+char *working_directory, *startup_icon_name;
+char** c_argv;
+char** c_envp;
+PyObject* argv;
+PyObject* envp;
+int flags, startup_notify, ret;
+unsigned long startup_timestamp;
+GError *error = NULL;
+
+if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!sOOiiks:spawn_on_screen",
kwlist, &PyGdkScreen_Type, &screen, &working_directory, &argv, &envp, &flags,
&startup_notify, &startup_timestamp, &startup_icon_name))
+return NULL;
+
+if(!PySequence_Check(argv)) {
+PyErr_SetObject(PyExc_TypeError, argv);
+return NULL;
+}
+if(!PySequence_Check(envp)) {
+PyErr_SetObject(PyExc_TypeError, envp);
+return NULL;
+}
+c_envp = PyStringList_AsStrv(envp);
+c_argv = PyStringList_AsStrv(argv);
+ret = xfce_spawn_on_screen(GDK_SCREEN(screen->obj), working_directory,
c_argv, c_envp, flags, startup_notify, startup_timestamp, startup_icon_name,
&error);
+g_strfreev(c_envp);
+g_strfreev(c_argv);
+
+if (pyg_error_check(&error))
+return NULL;
+return PyBool_FromLong(ret);
+}
diff --git a/ui/ui.py b/ui/ui.py
index dc52da3..1f89115 100644
--- a/ui/ui.py
+++ b/ui/ui.py
@@ -5,3 +5,30 @@ from _ui import *
def spawn_command_line(*args, **kwargs):
import gtk
return(spawn_command_line_on_screen(gtk.gdk.screen_get_default(),
*args, **kwargs))
+
+SPAWN_LEAVE_DESCRIPTORS_OPEN = 1 << 0
+SPAWN_DO_NOT_REAP_CHILD = 1 << 1
+SPAWN_SEARCH_PATH= 1 << 2
+SPAWN_STDOUT_TO_DEV_NULL = 1 << 3
+SPAWN_STDERR_TO_DEV_NULL = 1 << 4
+SPAWN_CHILD_INHERITS_STDIN = 1 << 5
+SPAWN_FILE_AND_ARGV_ZERO = 1 << 6
+
+def spawn_on_screen(screen, working_directory, argv, envp, flags,
startup_notify, startup_timestamp, startup_icon_name):
+ def to_c_envp(source):
+ if hasattr(source, "items"):
+ return ["%s=%s" % (key, value) for key, value in
source.items()]
+ else:
+ return source
+ def to_c_flags(source):
+ if isinstance(source, int):
+ return(source)
+ else:
+ result = 0
+ bits = ["leave_descriptors_open", "do_not_reap_child",
"search_path", "stdout_to_dev_null", "stderr_to_dev_null",
"child_inherits_stdin", "file_and_argv_zero"]
+ for i, name in enumerate(bits):
+ if name in source:
+ result |= 1 << i
+ return result
+ import _ui
+ return(_ui.spawn_on_screen(screen, working_directory, argv,
to_c_envp(envp), to_c_flags(flags), startup_notify, startup_timestamp,
startup_icon_name))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] add 'spawn' of libxfce4ui. Fix required version of libxfce4menu to work with the version from GIT.
Updating branch refs/heads/master
to 3fb5079dcc88ead31f5b9291a09170bab856b026 (commit)
from 68012ea3a2764d40b69de38665f6da657cba273a (commit)
commit 3fb5079dcc88ead31f5b9291a09170bab856b026
Author: Danny Milosavljevic
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
[Xfce4-commits] add 'spawn' of libxfce4ui. Fix required version of libxfce4menu to work with the version from GIT.
Updating branch refs/heads/master
to 68012ea3a2764d40b69de38665f6da657cba273a (commit)
from b7e8118f4ae4c17221dd254898c951fdf83198d0 (commit)
commit 68012ea3a2764d40b69de38665f6da657cba273a
Author: Danny Milosavljevic
Date: Fri Jan 14 18:50:01 2011 +0100
add 'spawn' of libxfce4ui. Fix required version of libxfce4menu to work
with the version from GIT.
ui/{gtk_extensions.override => spawn.override} |0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/ui/gtk_extensions.override b/ui/spawn.override
similarity index 100%
copy from ui/gtk_extensions.override
copy to ui/spawn.override
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] add missing 'sys' import.
Updating branch refs/heads/master
to b7e8118f4ae4c17221dd254898c951fdf83198d0 (commit)
from 23d6995044ae2be74683eb0e1a4838c55d7b1078 (commit)
commit b7e8118f4ae4c17221dd254898c951fdf83198d0
Author: Danny Milosavljevic
Date: Mon Jan 10 22:34:16 2011 +0100
add missing 'sys' import.
examples/panel/testplugin1/testplugin.py |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/examples/panel/testplugin1/testplugin.py
b/examples/panel/testplugin1/testplugin.py
index 282a2b6..071e43b 100755
--- a/examples/panel/testplugin1/testplugin.py
+++ b/examples/panel/testplugin1/testplugin.py
@@ -1,8 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
import pygtk
pygtk.require("2.0")
import gtk
+import sys
import xfce4.panel
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] calls base ctor.
Updating branch refs/heads/master to 23d6995044ae2be74683eb0e1a4838c55d7b1078 (commit) from cb0c22061e46e113f59d50947da75249e3566746 (commit) commit 23d6995044ae2be74683eb0e1a4838c55d7b1078 Author: Danny Milosavljevic Date: Sun Jan 9 21:53:41 2011 +0100 calls base ctor. panel/panel.py |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel/panel.py b/panel/panel.py index 0819bb4..c6e9b06 100644 --- a/panel/panel.py +++ b/panel/panel.py @@ -36,6 +36,7 @@ class Plugin(PanelPlugin): unique_id = int(sys.argv[PLUGIN_ARGV_UNIQUE_ID]), display_name = sys.argv[PLUGIN_ARGV_DISPLAY_NAME], comment = sys.argv[PLUGIN_ARGV_COMMENT]) +PanelPlugin.__init__(self) socket_id = int(sys.argv[PLUGIN_ARGV_SOCKET_ID]) register_external_full_constructor(socket_id, self) # #define XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_FULL_CONSTRUCTOR(socket_id, xpp) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] update panel bindings.
Updating branch refs/heads/master
to cb0c22061e46e113f59d50947da75249e3566746 (commit)
from 3f430dd6f3ac90bbf0dc141e8d0b26d02ab5cf81 (commit)
commit cb0c22061e46e113f59d50947da75249e3566746
Author: Danny Milosavljevic
Date: Sun Jan 9 21:47:51 2011 +0100
update panel bindings.
panel/convenience.defs | 10 ++
panel/convenience.override |1 +
panel/plugin.override |1 +
panel/plugin_provider.defs |7 +++
4 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/panel/convenience.defs b/panel/convenience.defs
index 2f819e7..83b87f2 100644
--- a/panel/convenience.defs
+++ b/panel/convenience.defs
@@ -20,4 +20,14 @@
(return-type "const-gchar*")
)
+(define-function xfce_panel_pixbuf_from_source
+ (c-name "xfce_panel_pixbuf_from_source")
+ (return-type "GdkPixbuf*")
+ (parameters
+'("const-gchar*" "source")
+'("GtkIconTheme*" "icon_theme")
+'("gint" "size")
+ )
+)
+
diff --git a/panel/convenience.override b/panel/convenience.override
index c9b0bf4..2ec114a 100644
--- a/panel/convenience.override
+++ b/panel/convenience.override
@@ -17,6 +17,7 @@ modulename convenience
import gobject.GObject as PyGObject_Type
import gtk.Widget as PyGtkWidget_Type
import gtk.ToggleButton as PyGtkToggleButton_Type
+import gtk.IconTheme as PyGtkIconTheme_Type
%%
ignore
%%
diff --git a/panel/plugin.override b/panel/plugin.override
index 6f83586..7efba94 100644
--- a/panel/plugin.override
+++ b/panel/plugin.override
@@ -29,3 +29,4 @@ ignore-glob
%%
ignore-win32
%%
+new-constructor XFCE_TYPE_PANEL_PLUGIN
diff --git a/panel/plugin_provider.defs b/panel/plugin_provider.defs
index 1df4a04..952bde4 100644
--- a/panel/plugin_provider.defs
+++ b/panel/plugin_provider.defs
@@ -46,6 +46,7 @@
'("action-background-unset" "PROVIDER_PROP_TYPE_ACTION_BACKGROUND_UNSET")
'("action-show-configure" "PROVIDER_PROP_TYPE_ACTION_SHOW_CONFIGURE")
'("action-show-about" "PROVIDER_PROP_TYPE_ACTION_SHOW_ABOUT")
+'("action-ask-remove" "PROVIDER_PROP_TYPE_ACTION_ASK_REMOVE")
)
)
@@ -161,4 +162,10 @@
)
)
+(define-method ask_remove
+ (of-object "XfcePanelPluginProvider")
+ (c-name "xfce_panel_plugin_provider_ask_remove")
+ (return-type "none")
+)
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] handle construct-only arguments
Updating branch refs/heads/master
to 3f430dd6f3ac90bbf0dc141e8d0b26d02ab5cf81 (commit)
from 8b18960868c83d5c948958c7e108b1f2b31ceb9f (commit)
commit 3f430dd6f3ac90bbf0dc141e8d0b26d02ab5cf81
Author: Danny Milosavljevic
Date: Sun Jan 9 21:47:31 2011 +0100
handle construct-only arguments
panel/panel.py | 13 +++--
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/panel/panel.py b/panel/panel.py
index ecf7c83..0819bb4 100644
--- a/panel/panel.py
+++ b/panel/panel.py
@@ -5,6 +5,7 @@ from _panel import *
import pygtk
pygtk.require("2.0")
import gtk
+import gobject
import sys
PLUGIN_ARGV_0, \
@@ -29,12 +30,12 @@ PLUGIN_EXIT_SUCCESS_AND_RESTART = range(7)
class Plugin(PanelPlugin):
def __init__(self):
-PanelPlugin.__init__(self)
-self.props.name = sys.argv[PLUGIN_ARGV_NAME]
-self.props.unique_id = sys.argv[PLUGIN_ARGV_UNIQUE_ID]
-self.props.display_name = sys.argv[PLUGIN_ARGV_DISPLAY_NAME]
-self.props.comment = sys.argv[PLUGIN_ARGV_COMMENT]
-self.props.arguments = sys.argv[PLUGIN_ARGV_ARGUMENTS : ]
+# FIXME
+gobject.GObject.__init__(self,
+ name = sys.argv[PLUGIN_ARGV_NAME],
+ unique_id = int(sys.argv[PLUGIN_ARGV_UNIQUE_ID]),
+ display_name = sys.argv[PLUGIN_ARGV_DISPLAY_NAME],
+ comment = sys.argv[PLUGIN_ARGV_COMMENT])
socket_id = int(sys.argv[PLUGIN_ARGV_SOCKET_ID])
register_external_full_constructor(socket_id, self)
# #define XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_FULL_CONSTRUCTOR(socket_id,
xpp)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] clean up some warnings.
Updating branch refs/heads/master
to 8b18960868c83d5c948958c7e108b1f2b31ceb9f (commit)
from 744591da2d5aa1d4f44304f744436aea3e2f521a (commit)
commit 8b18960868c83d5c948958c7e108b1f2b31ceb9f
Author: Danny Milosavljevic
Date: Sun Jan 2 21:39:44 2011 +0100
clean up some warnings.
panel/external_plugin.c |1 -
panel/xfce-panel-macros-47.h |8
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/panel/external_plugin.c b/panel/external_plugin.c
index f94bb6d..37d13f2 100644
--- a/panel/external_plugin.c
+++ b/panel/external_plugin.c
@@ -17,7 +17,6 @@ static PyObject *
register_external_full_constructor(PyGObject *self, PyObject *args, PyObject
*kwargs)
{
static char *kwlist[] = { "socket_ID", "plugin", NULL };
-GtkOrientation orientation;
int socket_ID;
PyGObject *py_plugin = NULL;
XfcePanelPlugin* plugin = NULL;
diff --git a/panel/xfce-panel-macros-47.h b/panel/xfce-panel-macros-47.h
index 4dbe190..c7db7be 100644
--- a/panel/xfce-panel-macros-47.h
+++ b/panel/xfce-panel-macros-47.h
@@ -375,12 +375,12 @@ G_BEGIN_DECLS
"display-name", argv[PLUGIN_ARGV_DISPLAY_NAME], \
"comment", argv[PLUGIN_ARGV_COMMENT], \
"arguments", argv + PLUGIN_ARGV_ARGUMENTS, NULL); \
-gtk_container_add (GTK_CONTAINER (plug), xpp); \
+gtk_container_add (GTK_CONTAINER (plug), GTK_WIDGET(xpp)); \
g_signal_connect_after (G_OBJECT (xpp), "realize", \
G_CALLBACK (_xpp_realize), plug); \
g_signal_connect_after (G_OBJECT (xpp), "destroy", \
G_CALLBACK (_xpp_quit_main_loop), NULL); \
-gtk_widget_show (xpp); \
+gtk_widget_show (GTK_WIDGET(xpp)); \
\
if (*argv[PLUGIN_ARGV_BACKGROUND_IMAGE] != '\0') \
{ \
@@ -427,12 +427,12 @@ G_BEGIN_DECLS
colormap = gdk_screen_get_rgb_colormap (screen); \
if (colormap != NULL) \
gtk_widget_set_colormap (plug, colormap); \
-gtk_container_add (GTK_CONTAINER (plug), xpp); \
+gtk_container_add (GTK_CONTAINER (plug), GTK_WIDGET(xpp)); \
g_signal_connect_after (G_OBJECT (xpp), "realize", \
G_CALLBACK (_xpp_realize), plug); \
g_signal_connect_after (G_OBJECT (xpp), "destroy", \
G_CALLBACK (_xpp_quit_main_loop), NULL); \
-gtk_widget_show (xpp); \
+gtk_widget_show (GTK_WIDGET(xpp)); \
\
if (0) \
{ \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] add 'menu' module.
Updating branch refs/heads/master to 8e609a1ac637654e4ec4377f8efb824a5fe0c095 (commit) from b8dcfd800d67de1871b8e568df9081e983c8eac4 (commit) commit 8e609a1ac637654e4ec4377f8efb824a5fe0c095 Author: Danny Milosavljevic Date: Sun Jan 2 21:13:53 2011 +0100 add 'menu' module. Makefile.am|4 +- configure.ac |2 + menu/Makefile.am | 101 ++ menu/gen | 36 ++ .../binding.override => menu/libxfce4menu.override |4 +- .../libxfce4menu_config.override |4 +- xfconf/binding.override => menu/menu.override |4 +- ui/ui.py => menu/menu.py |2 +- .../menu_and_rules.override|4 +- .../menu_directory.override|4 +- .../binding.override => menu/menu_element.override |4 +- .../menu_environment.override |4 +- xfconf/binding.override => menu/menu_item.override |4 +- .../menu_item_cache.override |4 +- .../menu_item_pool.override|4 +- .../errors.override => menu/menu_layout.override |6 +- .../binding.override => menu/menu_monitor.override |4 +- xfconf/binding.override => menu/menu_move.override |4 +- .../menu_not_rules.override|4 +- .../menu_or_rules.override |4 +- .../binding.override => menu/menu_rules.override |4 +- .../menu_separator.override|4 +- .../menu_standard_rules.override |4 +- menu/menumodule.c | 141 panel/panelmodule.c|2 +- 25 files changed, 298 insertions(+), 64 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7b3fd10..29d7729 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,8 +13,8 @@ if HAVE_MIGHTY_MOUSE SUBDIR_MIGHTY_MOUSE = panel endif -SUBDIRS = ui util xfconf $(SUBDIR_MIGHTY_MOUSE) -DIST_SUBDIRS = ui util xfconf $(SUBDIR_MIGHTY_MOUSE) +SUBDIRS = ui util xfconf $(SUBDIR_MIGHTY_MOUSE) menu +DIST_SUBDIRS = ui util xfconf $(SUBDIR_MIGHTY_MOUSE) menu PLATFORM_VERSION = 4.2 PLATFORM_WIN32 = diff --git a/configure.ac b/configure.ac index 2f93b3c..f8e3a10 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +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]) dnl new panel @@ -89,5 +90,6 @@ AC_CONFIG_FILES( panel/Makefile util/Makefile xfconf/Makefile + menu/Makefile ) AC_OUTPUT diff --git a/menu/Makefile.am b/menu/Makefile.am new file mode 100644 index 000..0701ebb --- /dev/null +++ b/menu/Makefile.am @@ -0,0 +1,101 @@ +...@set_make@ + +PLATFORM_VERSION = 4.2 + +CODEGEN_PATH = @CODEGEN_PATH@ + +common_ldflags = -module -avoid-version -export-symbols-regex init_menu +if PLATFORM_WIN32 +common_ldflags += -no-undefined +endif + +INCLUDES = $(PYTHON_INCLUDES) + +pyxfceexecdir = $(pyexecdir)/xfce4 +pyxfceexec_LTLIBRARIES = _menu.la +pyxfceexec_PYTHON = menu.py + +_menu_la_CFLAGS = $(XFCE4_MENU_CFLAGS) $(PYTHON_CFLAGS) $(PYGTK_CFLAGS) +_menu_la_LDFLAGS = $(common_ldflags) +_menu_la_LIBADD = $(XFCE4_MENU_LIBS) +#-export-symbols-regex +_menu_la_SOURCES = \ + libxfce4menu_config.c \ + libxfce4menu.c \ + menu_and_rules.c \ + menu_directory.c \ + menu_element.c \ + menu_environment.c \ + menu_item_cache.c \ + menu_item.c \ + menu_item_pool.c \ + menu_layout.c \ + menu_monitor.c \ + menu_move.c \ + menu_not_rules.c \ + menu_or_rules.c \ + menu.c \ + menu_rules.c \ + menu_separator.c \ + menu_standard_rules.c \ + menumodule.c + +defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs +defs_DATA = \ + libxfce4menu_config.defs \ + libxfce4menu.defs \ + menu_and_rules.defs \ + menu_directory.defs \ + menu_element.defs \ + menu_environment.defs \ + menu_item_cache.defs \ + menu_item.defs \ + menu_item_pool.defs \ + menu_layout.defs \ + menu_monitor.defs \ + menu_move.defs \ + menu_not_rules.defs \ + menu_or_rules.defs \ + menu.defs \ + menu_rules.defs \ + menu_separator.defs \ + menu_standard_rules.defs + +menu_overrides = \ + libxfce4menu_config.override \ + libxfce4menu.override \ + menu_and_rules.override \ + menu_directory.override \ + menu_element.override \ + menu_environment.override \ + menu_item_cache.
[Xfce4-commits] add new defs.
Updating branch refs/heads/master
to b8dcfd800d67de1871b8e568df9081e983c8eac4 (commit)
from f003847dcad1c2034083bb53386d4c46eae0e1e7 (commit)
commit b8dcfd800d67de1871b8e568df9081e983c8eac4
Author: Danny Milosavljevic
Date: Sun Jan 2 20:34:54 2011 +0100
add new defs.
panel/convenience.defs | 23 +++
panel/hvbox.defs | 46 +
panel/image.defs | 81 +
panel/libxfce4panel.defs |8 +
panel/libxfce4panel_config.defs| 18 ++
panel/libxfce4panel_enum_types.defs| 13 ++
panel/{enums.defs => libxfce4panel_enums.defs} |2 +-
panel/macros.defs |8 +
panel/macros_46.defs |8 +
panel/plugin.defs | 224
panel/plugin_provider.defs | 164 +
ui/dialogs.defs| 97 ++
ui/gdk_extensions.defs | 16 ++
ui/gtk_extensions.defs | 44 +
ui/libxfce4ui.defs |8 +
ui/libxfce4ui_config.defs | 18 ++
ui/libxfce4ui_enum_types.defs | 18 ++
ui/sm_client.defs | 191
ui/spawn.defs | 53 ++
ui/titled_dialog.defs | 53 ++
20 files changed, 1092 insertions(+), 1 deletions(-)
diff --git a/panel/convenience.defs b/panel/convenience.defs
new file mode 100644
index 000..2f819e7
--- /dev/null
+++ b/panel/convenience.defs
@@ -0,0 +1,23 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-panel-convenience.h
+
+(define-function xfce_panel_create_button
+ (c-name "xfce_panel_create_button")
+ (return-type "GtkWidget*")
+)
+
+(define-function xfce_panel_create_toggle_button
+ (c-name "xfce_panel_create_toggle_button")
+ (return-type "GtkWidget*")
+)
+
+(define-function xfce_panel_get_channel_name
+ (c-name "xfce_panel_get_channel_name")
+ (return-type "const-gchar*")
+)
+
+
diff --git a/panel/hvbox.defs b/panel/hvbox.defs
new file mode 100644
index 000..1e3e6e6
--- /dev/null
+++ b/panel/hvbox.defs
@@ -0,0 +1,46 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object HVBox
+ (in-module "Xfce")
+ (parent "GtkBox")
+ (c-name "XfceHVBox")
+ (gtype-id "XFCE_TYPE_HV_BOX")
+)
+
+;; Enumerations and flags ...
+
+
+;; From xfce-hvbox.h
+
+(define-function xfce_hvbox_get_type
+ (c-name "xfce_hvbox_get_type")
+ (return-type "GType")
+)
+
+(define-function xfce_hvbox_new
+ (c-name "xfce_hvbox_new")
+ (is-constructor-of "XfceHvbox")
+ (return-type "GtkWidget*")
+ (parameters
+'("GtkOrientation" "orientation")
+'("gboolean" "homogeneous")
+'("gint" "spacing")
+ )
+)
+
+(define-method set_orientation
+ (of-object "XfceHVBox")
+ (c-name "xfce_hvbox_set_orientation")
+ (return-type "none")
+ (parameters
+'("GtkOrientation" "orientation")
+ )
+)
+
+(define-method get_orientation
+ (of-object "XfceHVBox")
+ (c-name "xfce_hvbox_get_orientation")
+ (return-type "GtkOrientation")
+)
+
+
diff --git a/panel/image.defs b/panel/image.defs
new file mode 100644
index 000..47ce250
--- /dev/null
+++ b/panel/image.defs
@@ -0,0 +1,81 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object PanelImage
+ (in-module "Xfce")
+ (parent "GtkWidget")
+ (c-name "XfcePanelImage")
+ (gtype-id "XFCE_TYPE_PANEL_IMAGE")
+)
+
+;; Enumerations and flags ...
+
+
+;; From xfce-panel-image.h
+
+(define-function xfce_panel_image_get_type
+ (c-name "xfce_panel_image_get_type")
+ (return-type "GType")
+)
+
+(define-function xfce_panel_image_new
+ (c-name "xfce_panel_image_new")
+ (is-constructor-of "XfcePanelImage")
+ (return-type "GtkWidget*")
+)
+
+(define-function xfce_panel_image_new_from_pixbuf
+ (c-name "xfce_panel_image_new_from_pixbuf")
+ (return-type "GtkWidget*")
+ (parameters
+'("GdkPixbuf*" "pixbuf")
+ )
+)
+
+(define-function xfce_panel_image_new_from_source
+ (c-name "xfce_panel_image_new_from_source")
+ (return-type "GtkWidget*")
+ (parameters
+'("const-gchar*" "source")
+ )
+)
+
+(define-method set_from_pixbuf
+ (of-object "XfcePanelImage")
+ (c-name "xfce_panel_image_set_from_pixbuf")
+ (return-type "none")
[Xfce4-commits] fix missing format string in tests.
Updating branch refs/heads/master
to 85c7226797540218db058652c91ab85eac5b0d81 (commit)
from 50cfa94cb3a3ce86ee318d6cca6b47da397324e3 (commit)
commit 85c7226797540218db058652c91ab85eac5b0d81
Author: Danny Milosavljevic
Date: Sun Jan 2 20:55:05 2011 +0100
fix missing format string in tests.
tests/test-display-menu.c |2 +-
tests/test-menu-spec.c|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/test-display-menu.c b/tests/test-display-menu.c
index f361d37..16d2f3a 100644
--- a/tests/test-display-menu.c
+++ b/tests/test-display-menu.c
@@ -408,7 +408,7 @@ main (intargc,
}
else
{
- g_error (error->message);
+ g_error ("%s", error->message);
exit_code = EXIT_FAILURE;
}
diff --git a/tests/test-menu-spec.c b/tests/test-menu-spec.c
index f5514bd..b979d11 100644
--- a/tests/test-menu-spec.c
+++ b/tests/test-menu-spec.c
@@ -107,7 +107,7 @@ main (intargc,
}
else
{
- g_error (error->message);
+ g_error ("%s", error->message);
g_error_free (error);
#ifdef HAVE_STDLIB_H
exit_code = EXIT_FAILURE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] add enum-types (enum value symbols).
Updating branch refs/heads/master
to 60310e06364f913c0a2bd21b2935689047f175b1 (commit)
from 85c7226797540218db058652c91ab85eac5b0d81 (commit)
commit 60310e06364f913c0a2bd21b2935689047f175b1
Author: Danny Milosavljevic
Date: Sun Jan 2 21:08:08 2011 +0100
add enum-types (enum value symbols).
libxfce4menu/Makefile.am| 45 ++-
libxfce4menu/libxfce4menu.h |1 +
2 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/libxfce4menu/Makefile.am b/libxfce4menu/Makefile.am
index 2bf778c..61c04f5 100644
--- a/libxfce4menu/Makefile.am
+++ b/libxfce4menu/Makefile.am
@@ -12,7 +12,12 @@ INCLUDES =
\
lib_LTLIBRARIES = \
libxfce4menu-0.1.la
+libxfce4menu_enum_headers = \
+ xfce-menu-layout.h \
+ xfce-menu-monitor.h
+
libxfce4menu_headers = \
+ libxfce4menu-enum-types.h \
xfce-menu.h \
xfce-menu-element.h \
xfce-menu-separator.h \
@@ -48,6 +53,10 @@ libxfce4menu_sources =
\
xfce-menu-monitor.c \
xfce-menu-item.c
+libxfce4menu_built_sources = \
+ libxfce4menu-enum-types.c \
+ libxfce4menu-enum-types.h
+
libxfce4menuincludedir = $(includedir)/xfce4/libxfce4menu-0.1/libxfce4menu
libxfce4menuinclude_HEADERS = \
@@ -57,7 +66,8 @@ libxfce4menuinclude_HEADERS =
\
libxfce4menu_0_1_la_SOURCES = \
$(libxfce4menu_sources) \
- $(libxfce4menu_headers)
+ $(libxfce4menu_headers) \
+ $(libxfce4menu_built_sources)
libxfce4menu_0_1_la_CFLAGS = \
$(GLIB_CFLAGS) \
@@ -90,3 +100,36 @@ pkgconfig_DATA = libxfce4menu-0.1.pc
# required for gtk-doc
dist-hook: all
+
+if MAINTAINER_MODE
+CLEANFILES =
+DISTCLEANFILES = \
+ $(libxfce4menu_built_sources)
+
+BUILT_SOURCES = \
+ $(libxfce4menu_built_sources)
+
+libxfce4menu-enum-types.h: stamp-libxfce4menu-enum-types.h
+ @true
+stamp-libxfce4menu-enum-types.h: $(libxfce4menu_enum_headers) Makefile
+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
+ --fhead "#ifndef __LIBXFCE4UI_ENUM_TYPES_H__\n#define
__LIBXFCE4UI_ENUM_TYPES_H__\n\nG_BEGIN_DECLS\n\n" \
+ --fprod "/* enumerations from \"@filen...@\" */\n\n" \
+ --vhead "GType @enum_n...@_get_type(void)
G_GNUC_CONST;\n#define xfce_ty...@enumshort@ (@enum_n...@_get_type())\n\n" \
+ --ftail "G_END_DECLS\n\n#endif /* !__LIBXFCE4UI_ENUM_TYPES_H__
*/" \
+ $(libxfce4menu_enum_headers) ) >xgen-leth
+ cmp -s xgen-leth libxfce4menu-enum-types.h || cp xgen-leth
libxfce4menu-enum-types.h
+ rm -f xgen-leth
+ echo timestamp > $(@F)
+libxfce4menu-enum-types.c: $(libxfce4menu_enum_headers) Makefile
+ $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
+ --fhead "#include \n\n" \
+ --fprod "/* enumerations from \"@filen...@\" */\n\n" \
+ --vhead "gtyp...@enum_name@_get_type(void)\n{\nstatic GType
type = 0;\n\nif(!type) {\nstatic const g...@type@Value values[] =
{"\
+ --vprod "{ @VALUENAME@, \"@valuen...@\",
\"@valuen...@\" }," \
+ --vtail "{ 0, NULL, NULL }\n\t};\n\ttype =
g...@type@_register_static(\"@enumn...@\", values);\n}\n\nreturn
type;\n}\n\n" \
+ --ftail "\n#define __LIBXFCE4UI_ENUM_TYPES_C__\n\n" \
+ $(libxfce4menu_enum_headers) ) > xgen-letc
+ cp xgen-letc libxfce4menu-enum-types.c
+ rm -f xgen-letc
+endif
diff --git a/libxfce4menu/libxfce4menu.h b/libxfce4menu/libxfce4menu.h
index 15c18b3..05758e0 100644
--- a/libxfce4menu/libxfce4menu.h
+++ b/libxfce4menu/libxfce4menu.h
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#define LIBXFCE4MENU_INSIDE_LIBXFCE4MENU_H
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] add xfconf to '__init__.py'.
Updating branch refs/heads/master to 13fdab2b3ef05a53bc28be66dc1cf23e73985cc3 (commit) from 5d30bc1232fc6a6c50cff22f5c2f8ca3197cc957 (commit) commit 13fdab2b3ef05a53bc28be66dc1cf23e73985cc3 Author: Danny Milosavljevic Date: Wed Dec 29 23:50:40 2010 +0100 add xfconf to '__init__.py'. __init__.py |2 +- configure.ac |1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/__init__.py b/__init__.py index ab8916f..01e6977 100644 --- a/__init__.py +++ b/__init__.py @@ -1,5 +1,5 @@ -__all__ = [ "gui", "menu", "netk", "panel", "util" ] +__all__ = [ "gui", "menu", "netk", "panel", "util", "xfconf" ] #import util #import gui diff --git a/configure.ac b/configure.ac index fe10f1e..3587f9a 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,7 @@ m4_define(pyxfce_version, pyxfce_major_version.pyxfce_minor_version.pyxfce_micro m4_define(xfce_required_version, 4.4.0) AC_INIT(pyxfce, pyxfce_version, []) +AC_CONFIG_MACRO_DIR([m4]) AC_DEFINE(PYXFCE_MAJOR_VERSION, pyxfce_major_version, [pyxfce major version]) AC_DEFINE(PYXFCE_MINOR_VERSION, pyxfce_minor_version, [pyxfce minor version]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] add xfconf files.
Updating branch refs/heads/master
to 5d30bc1232fc6a6c50cff22f5c2f8ca3197cc957 (commit)
from c397903391346d2078219ba03488f2ffa27cac6c (commit)
commit 5d30bc1232fc6a6c50cff22f5c2f8ca3197cc957
Author: Danny Milosavljevic
Date: Wed Dec 29 23:42:39 2010 +0100
add xfconf files.
xfconf/binding.c | 70 +
xfconf/binding.defs | 58
xfconf/channel.c | 501 ++
xfconf/channel.defs | 408 +++
gui/filechooser.c => xfconf/errors.c | 36 ++--
xfconf/errors.defs | 40 +++
util/rc.c => xfconf/types.c | 26 +-
xfconf/types.defs| 56
8 files changed, 1162 insertions(+), 33 deletions(-)
diff --git a/xfconf/binding.c b/xfconf/binding.c
new file mode 100644
index 000..144c89c
--- /dev/null
+++ b/xfconf/binding.c
@@ -0,0 +1,70 @@
+/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4
-*- */
+
+#include
+
+
+
+#line 6 "binding.override"
+#include "pygobject.h"
+#include
+#include
+
+#line 13 "binding.c"
+
+
+/* -- types from other modules -- */
+static PyTypeObject *_PyGObject_Type;
+#define PyGObject_Type (*_PyGObject_Type)
+
+
+/* -- forward type declarations -- */
+
+#line 23 "binding.c"
+
+
+
+/* --- functions --- */
+
+static PyObject *
+_wrap_xfconf_g_property_unbind(PyObject *self, PyObject *args, PyObject
*kwargs)
+{
+static char *kwlist[] = { "id", NULL };
+unsigned long id;
+
+if (!PyArg_ParseTupleAndKeywords(args, kwargs,"k:g_property_unbind",
kwlist, &id))
+return NULL;
+
+xfconf_g_property_unbind(id);
+
+Py_INCREF(Py_None);
+return Py_None;
+}
+
+const PyMethodDef pybinding_functions[] = {
+{ "g_property_unbind", (PyCFunction)_wrap_xfconf_g_property_unbind,
METH_VARARGS|METH_KEYWORDS,
+ NULL },
+{ NULL, NULL, 0, NULL }
+};
+
+/* initialise stuff extension classes */
+void
+pybinding_register_classes(PyObject *d)
+{
+PyObject *module;
+
+if ((module = PyImport_ImportModule("gobject")) != NULL) {
+_PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module,
"GObject");
+if (_PyGObject_Type == NULL) {
+PyErr_SetString(PyExc_ImportError,
+"cannot import name GObject from gobject");
+return ;
+}
+} else {
+PyErr_SetString(PyExc_ImportError,
+"could not import gobject");
+return ;
+}
+
+
+#line 70 "binding.c"
+}
diff --git a/xfconf/binding.defs b/xfconf/binding.defs
new file mode 100644
index 000..fa0880f
--- /dev/null
+++ b/xfconf/binding.defs
@@ -0,0 +1,58 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfconf-binding.h
+
+(define-function g_property_bind
+ (c-name "xfconf_g_property_bind")
+ (return-type "gulong")
+ (parameters
+'("XfconfChannel*" "channel")
+'("const-gchar*" "xfconf_property")
+'("GType" "xfconf_property_type")
+'("gpointer" "object")
+'("const-gchar*" "object_property")
+ )
+)
+
+(define-function g_property_bind_gdkcolor
+ (c-name "xfconf_g_property_bind_gdkcolor")
+ (return-type "gulong")
+ (parameters
+'("XfconfChannel*" "channel")
+'("const-gchar*" "xfconf_property")
+'("gpointer" "object")
+'("const-gchar*" "object_property")
+ )
+)
+
+(define-function g_property_unbind
+ (c-name "xfconf_g_property_unbind")
+ (return-type "none")
+ (parameters
+'("gulong" "id")
+ )
+)
+
+(define-function g_property_unbind_by_property
+ (c-name "xfconf_g_property_unbind_by_property")
+ (return-type "none")
+ (parameters
+'("XfconfChannel*" "channel")
+'("const-gchar*" "xfconf_property")
+'("gpointer" "object")
+'("const-gchar*" "object_property")
+ )
+)
+
+(define-function g_property_unbind_all
+ (c-name "xfconf_g_property_unbind_all")
+ (return-type "none")
+ (parameters
+'("gpointer" "channel_or_object")
+ )
+)
+
+
diff --git a/xfconf/channel.c b/xfconf/channel.c
new file mode 100644
index 000..2e4004a
--- /dev/null
+++ b/xfconf/channel.c
@@ -0,0 +1,501 @@
+/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4
-*- */
+
+#include
+
+
+
+#line 6 "channel.override"
+#inclu
[Xfce4-commits] fix XfconfChannel.get_properties()
Updating branch refs/heads/master
to c397903391346d2078219ba03488f2ffa27cac6c (commit)
from ed71ded18db1b056936cb44537aea2a84e640a76 (commit)
commit c397903391346d2078219ba03488f2ffa27cac6c
Author: Danny Milosavljevic
Date: Wed Dec 29 00:34:21 2010 +0100
fix XfconfChannel.get_properties()
xfconf/channel.override| 27 +++
xfconf/tests/testwmconf.py |9 +
xfconf/xfconfmodule.c |7 +--
3 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/xfconf/channel.override b/xfconf/channel.override
index c17574f..6c89fd9 100644
--- a/xfconf/channel.override
+++ b/xfconf/channel.override
@@ -44,3 +44,30 @@ _wrap_xfconf_list_channels(PyObject *self, PyObject *args,
PyObject *kwargs)
Py_INCREF(Py_None);
return Py_None;
}
+%%
+override xfconf_channel_get_properties kwargs
+static PyObject *
+_wrap_xfconf_channel_get_properties(PyGObject *self, PyObject *args, PyObject
*kwargs)
+{
+static char *kwlist[] = { "property_base", NULL };
+GHashTable *ret;
+char* path;
+
+if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"s:XfconfChannel.get_properties", kwlist, &path))
+return NULL;
+ret = xfconf_channel_get_properties(XFCONF_CHANNEL(self->obj), path);
+if (ret) {
+GHashTableIter iter;
+gpointer key, value;
+PyObject* py_ret;
+py_ret = PyDict_New();
+g_hash_table_iter_init(&iter, ret);
+while(g_hash_table_iter_next(&iter, &key, &value)) {
+PyDict_SetItem(py_ret, PyString_FromString((const char*) key),
pyg_value_as_pyobject((GValue*) value, TRUE));
+}
+g_hash_table_destroy(ret);
+return py_ret;
+}
+Py_INCREF(Py_None);
+return Py_None;
+}
diff --git a/xfconf/tests/testwmconf.py b/xfconf/tests/testwmconf.py
new file mode 100644
index 000..2b26a37
--- /dev/null
+++ b/xfconf/tests/testwmconf.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+import xfce4.xfconf
+print(xfce4.xfconf.list_channels())
+wm = xfce4.xfconf.channel_get("xfwm4")
+print(wm.get_properties("/"))
+wm = xfce4.xfconf.channel_get("xfwm4")
+print(wm.get_properties("/"))
+
diff --git a/xfconf/xfconfmodule.c b/xfconf/xfconfmodule.c
index 5cf0de0..3594597 100644
--- a/xfconf/xfconfmodule.c
+++ b/xfconf/xfconfmodule.c
@@ -11,6 +11,8 @@
#include
#include
+#include
+
extern const PyMethodDef pybinding_functions[];
extern const PyMethodDef pychannel_functions[];
extern const PyMethodDef pyerrors_functions[];
@@ -71,8 +73,9 @@ init_xfconf(void)
init_pygobject ();
if(!xfconf_init(&error)) {
- fprintf (stderr, "Unable to initialize xfconf: %s\n",
error->message);
- g_error_free(error);
+ fprintf(stderr, "Unable to initialize xfconf: %s\n",
error->message);
+ if(pyg_error_check(&error))
+ return;
}
my_register1 ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] init xfconf, add list_channels.
Updating branch refs/heads/master
to ed71ded18db1b056936cb44537aea2a84e640a76 (commit)
from 815985420f03d4b020a24037861829a0a86ddb62 (commit)
commit ed71ded18db1b056936cb44537aea2a84e640a76
Author: Danny Milosavljevic
Date: Tue Dec 28 23:48:50 2010 +0100
init xfconf, add list_channels.
xfconf/channel.override | 23 +++
xfconf/gen |8
xfconf/xfconfmodule.c |6 ++
3 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/xfconf/channel.override b/xfconf/channel.override
index fa9bf76..c17574f 100644
--- a/xfconf/channel.override
+++ b/xfconf/channel.override
@@ -21,3 +21,26 @@ ignore-glob
%%
ignore-win32
%%
+override xfconf_list_channels kwargs
+static PyObject *
+_wrap_xfconf_list_channels(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+static char *kwlist[] = { NULL };
+gchar **ret;
+int i;
+int count;
+
+if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":list_channels", kwlist))
+return NULL;
+ret = xfconf_list_channels();
+if (ret) {
+count = g_strv_length(ret);
+PyObject *py_ret = PyList_New(count);
+for(i = 0; i < count; ++i)
+PyList_SetItem(py_ret, i, PyString_FromString(ret[i]));
+g_strfreev(ret);
+return py_ret;
+}
+Py_INCREF(Py_None);
+return Py_None;
+}
diff --git a/xfconf/gen b/xfconf/gen
index bfe32eb..ad3f8fc 100755
--- a/xfconf/gen
+++ b/xfconf/gen
@@ -41,6 +41,14 @@ cat >P << EOF
(c-name "XfconfChannel")
(gtype-id "XFCONF_TYPE_CHANNEL")
)
+
+(define-function list_channels
+ (c-name "xfconf_list_channels")
+ (return-type "gchar**")
+ (parameters
+ )
+)
+
EOF
cat P channel.defs > channel.defs.new && mv channel.defs.new channel.defs
diff --git a/xfconf/xfconfmodule.c b/xfconf/xfconfmodule.c
index 597538b..5cf0de0 100644
--- a/xfconf/xfconfmodule.c
+++ b/xfconf/xfconfmodule.c
@@ -64,10 +64,16 @@ my_register1()
DL_EXPORT(void)
init_xfconf(void)
{
+ GError* error = NULL;
+
/* set the default python encoding to utf-8 */
PyUnicode_SetDefaultEncoding("utf-8");
init_pygobject ();
+ if(!xfconf_init(&error)) {
+ fprintf (stderr, "Unable to initialize xfconf: %s\n",
error->message);
+ g_error_free(error);
+ }
my_register1 ();
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] add xfconf support.
Updating branch refs/heads/master
to 815985420f03d4b020a24037861829a0a86ddb62 (commit)
from cff81899796df74e8ac7ee478e829588b117e8de (commit)
commit 815985420f03d4b020a24037861829a0a86ddb62
Author: Danny Milosavljevic
Date: Tue Dec 28 23:34:54 2010 +0100
add xfconf support.
Makefile.am |4 +-
configure.ac |3 +-
netk/gen |2 +-
xfconf/Makefile.am| 55 ++
netk/template.override => xfconf/binding.override |6 +-
netk/template.override => xfconf/channel.override |6 +-
netk/template.override => xfconf/errors.override |6 +-
xfconf/gen| 55 ++
netk/template.override => xfconf/types.override |6 +-
netk/netk.py => xfconf/xfconf.py |3 +-
netk/netkmodule.c => xfconf/xfconfmodule.c| 83 ++---
11 files changed, 152 insertions(+), 77 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a642c1d..810c84d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,8 +13,8 @@ if HAVE_MIGHTY_MOUSE
SUBDIR_MIGHTY_MOUSE = panel
endif
-SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE)
-DIST_SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE)
+SUBDIRS = gui netk util xfconf $(SUBDIR_MIGHTY_MOUSE)
+DIST_SUBDIRS = gui netk util xfconf $(SUBDIR_MIGHTY_MOUSE)
PLATFORM_VERSION = 4.2
PLATFORM_WIN32 =
diff --git a/configure.ac b/configure.ac
index fee8f0a..fe10f1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ dnl get rid of the -export-dynamic stuff from the configure
flags ...
export_dynamic=`(./libtool --config; echo eval echo
\\$export_dynamic_flag_spec) | sh`
BM_DEPEND([XFCE4_UTIL], [libxfce4util-1.0], [4.1.0])
-
+BM_DEPEND([XFCE4_XFCONF], [libxfconf-0], [4.6.2])
BM_DEPEND([XFCE4_GUI], [libxfcegui4-1.0], [4.3.90])
# new panel
@@ -88,5 +88,6 @@ AC_CONFIG_FILES(
netk/Makefile
panel/Makefile
util/Makefile
+ xfconf/Makefile
)
AC_OUTPUT
diff --git a/netk/gen b/netk/gen
index fb9c452..f1af90b 100755
--- a/netk/gen
+++ b/netk/gen
@@ -17,7 +17,7 @@ do
#echo "${defs}"
- python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
+ python
/usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
fi
done
rm -f util.defs
diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am
new file mode 100644
index 000..09d0e00
--- /dev/null
+++ b/xfconf/Makefile.am
@@ -0,0 +1,55 @@
+...@set_make@
+
+PLATFORM_VERSION = 4.2
+
+common_ldflags = -module -avoid-version -export-symbols-regex init_xfconf
+if PLATFORM_WIN32
+common_ldflags += -no-undefined
+endif
+
+INCLUDES = $(PYTHON_INCLUDES)
+
+CODEGEN_PATH = @CODEGEN_PATH@
+
+pyxfceexecdir = $(pyexecdir)/xfce4
+pyxfceexec_LTLIBRARIES = _xfconf.la
+pyxfceexec_PYTHON = xfconf.py
+_xfconf_la_CFLAGS = $(XFCE4_XFCONF_CFLAGS) $(PYTHON_CFLAGS) $(PYGTK_CFLAGS)
+_xfconf_la_LDFLAGS = $(common_ldflags)
+_xfconf_la_LIBADD = $(XFCE4_XFCONF_LIBS) $(PYTHON_LIBS)
+_xfconf_la_SOURCES = \
+ binding.c \
+ channel.c \
+ errors.c \
+ types.c \
+ xfconfmodule.c
+
+defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
+defs_DATA = \
+ binding.defs \
+ channel.defs \
+ errors.defs \
+ types.defs
+
+xfconf_overrides = binding.override channel.override errors.override
types.override
+
+EXTRA_DIST = $(defs_DATA) $(xfconf_overrides) gen
+nodist__xfconf_la_SOURCES =
+
+PYGTK_DEFS="`pkg-config --variable=defsdir pygtk-2.0`"
+
+.defs.c:
+ (cd $(srcdir) \
+&& $(PYTHON) $(CODEGEN_PATH)/codegen.py \
+ $(PYGTK_CODEGEN_DEFINES) \
+--override $*.override \
+--register $(PYGTK_DEFS)/gtk-types.defs \
+--register $(PYGTK_DEFS)/gdk-types.defs \
+--register binding.defs \
+--register channel.defs \
+--register errors.defs \
+--register types.defs \
+--prefix py$* $*.defs) > gen-$*.c \
+&& cp gen-$*.c $*.c \
+&& rm -f gen-$*.c
+
diff --git a/netk/template.override b/xfconf/binding.override
similarity index 73%
copy from netk/template.override
copy to xfconf/binding.override
index 0a4011a..fa9bf76 100644
--- a/netk/template.override
+++ b/xfconf/binding.override
@@ -4,13 +4,13 @@
%%
headers
#include "pygobject.h"
-#include
-#include
+#include
+#include
%%
include
%%
-modulename *
+modulename classgroup
%%
import gobject.GObject as PyGObject_Type
%%
diff --git a/netk/template.override b/xfconf/channel.override
similarity index 73%
copy from netk/template.override
copy to xfconf/channel.override
index 0a4011a..fa9bf76 100644
--- a/netk/template.override
+++ b/xfconf/channel.o
[Xfce4-commits] fix netk test.
Updating branch refs/heads/master
to cff81899796df74e8ac7ee478e829588b117e8de (commit)
from 77c0630a736158bbac5a82b38e64d63b22def281 (commit)
commit cff81899796df74e8ac7ee478e829588b117e8de
Author: Danny Milosavljevic
Date: Tue Dec 28 22:57:47 2010 +0100
fix netk test.
netk/tests/iwindowlist.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/netk/tests/iwindowlist.py b/netk/tests/iwindowlist.py
index 3b1e108..ae5989e 100644
--- a/netk/tests/iwindowlist.py
+++ b/netk/tests/iwindowlist.py
@@ -3,7 +3,7 @@
import pygtk
pygtk.require("2.0")
import gtk
-import xfce4
+import xfce4.netk
screen = xfce4.netk.screen_get_default()
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] remove unused files from 'pyxfce/panel'.
Updating branch refs/heads/master
to 77c0630a736158bbac5a82b38e64d63b22def281 (commit)
from e8ae0bda3e33f0bde4ae46fc45848f575c3679aa (commit)
commit 77c0630a736158bbac5a82b38e64d63b22def281
Author: Danny Milosavljevic
Date: Sun Dec 26 20:06:23 2010 +0100
remove unused files from 'pyxfce/panel'.
panel/Makefile.am |2 -
panel/enum_types.c| 55 -
panel/enum_types.defs | 18 --
panel/enum_types.override | 25
4 files changed, 0 insertions(+), 100 deletions(-)
diff --git a/panel/Makefile.am b/panel/Makefile.am
index 892262b..c2ec5c9 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -20,7 +20,6 @@ _panel_la_LIBADD = $(MIGHTY_MOUSE_LIBS) $(PYTHON_LIBS)
_panel_la_SOURCES = \
arrow_button.c \
enums.c \
- enum_types.c \
external_plugin.c \
itembar.c \
plugin_iface.c \
@@ -31,7 +30,6 @@ defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
defs_DATA = \
arrow_button.defs \
enums.defs \
- enum_types.defs \
external_plugin.defs \
itembar.defs \
plugin_iface.defs \
diff --git a/panel/enum_types.c b/panel/enum_types.c
deleted file mode 100644
index 79feb24..000
--- a/panel/enum_types.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4
-*- */
-
-#include
-
-
-
-#line 6 "enum_types.override"
-#include "pygobject.h"
-#include
-#include
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 15 "enum_types.c"
-
-
-/* -- types from other modules -- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* -- forward type declarations -- */
-
-#line 25 "enum_types.c"
-
-
-
-/* --- functions --- */
-
-const PyMethodDef pyenum_types_functions[] = {
-{ NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pyenum_types_register_classes(PyObject *d)
-{
-PyObject *module;
-
-if ((module = PyImport_ImportModule("gobject")) != NULL) {
-_PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module,
"GObject");
-if (_PyGObject_Type == NULL) {
-PyErr_SetString(PyExc_ImportError,
-"cannot import name GObject from gobject");
-return ;
-}
-} else {
-PyErr_SetString(PyExc_ImportError,
-"could not import gobject");
-return ;
-}
-
-
-#line 55 "enum_types.c"
-}
diff --git a/panel/enum_types.defs b/panel/enum_types.defs
deleted file mode 100644
index 68184d8..000
--- a/panel/enum_types.defs
+++ /dev/null
@@ -1,18 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-enum-types.h
-
-(define-function xfce_handle_style_get_type
- (c-name "xfce_handle_style_get_type")
- (return-type "GType")
-)
-
-(define-function xfce_screen_position_get_type
- (c-name "xfce_screen_position_get_type")
- (return-type "GType")
-)
-
-
diff --git a/panel/enum_types.override b/panel/enum_types.override
deleted file mode 100644
index 096d70e..000
--- a/panel/enum_types.override
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include
-#include
-
-extern PyTypeObject PyGtkWidget_Type;
-
-%%
-include
-%%
-modulename enumtypes
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] remove 'xfce-panel-enums.h' usage, part 2.
Updating branch refs/heads/master
to e8ae0bda3e33f0bde4ae46fc45848f575c3679aa (commit)
from f85ff6131fd35e2d759e221aa01572db37d62c9d (commit)
commit e8ae0bda3e33f0bde4ae46fc45848f575c3679aa
Author: Danny Milosavljevic
Date: Sun Dec 26 20:01:29 2010 +0100
remove 'xfce-panel-enums.h' usage, part 2.
panel/enum_types.c| 16 +++-
panel/enum_types.override |2 +-
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/panel/enum_types.c b/panel/enum_types.c
index 8dc519f..79feb24 100644
--- a/panel/enum_types.c
+++ b/panel/enum_types.c
@@ -7,7 +7,7 @@
#line 6 "enum_types.override"
#include "pygobject.h"
#include
-#include
+#include
extern PyTypeObject PyGtkWidget_Type;
@@ -27,8 +27,8 @@ static PyTypeObject *_PyGObject_Type;
/* --- functions --- */
-PyMethodDef pyenum_types_functions[] = {
-{ NULL, NULL, 0 }
+const PyMethodDef pyenum_types_functions[] = {
+{ NULL, NULL, 0, NULL }
};
/* initialise stuff extension classes */
@@ -38,20 +38,18 @@ pyenum_types_register_classes(PyObject *d)
PyObject *module;
if ((module = PyImport_ImportModule("gobject")) != NULL) {
-PyObject *moddict = PyModule_GetDict(module);
-
-_PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict,
"GObject");
+_PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module,
"GObject");
if (_PyGObject_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name GObject from gobject");
-return;
+return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gobject");
-return;
+return ;
}
-#line 57 "enum_types.c"
+#line 55 "enum_types.c"
}
diff --git a/panel/enum_types.override b/panel/enum_types.override
index 79dca0a..096d70e 100644
--- a/panel/enum_types.override
+++ b/panel/enum_types.override
@@ -5,7 +5,7 @@
headers
#include "pygobject.h"
#include
-#include
+#include
extern PyTypeObject PyGtkWidget_Type;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] remove 'xfce-panel-enums.h'.
Updating branch refs/heads/master
to f85ff6131fd35e2d759e221aa01572db37d62c9d (commit)
from c090ae95fcf375a6c176a992c5d461d27c81bbf0 (commit)
commit f85ff6131fd35e2d759e221aa01572db37d62c9d
Author: Danny Milosavljevic
Date: Sun Dec 26 19:59:49 2010 +0100
remove 'xfce-panel-enums.h'.
panel/arrow_button.c| 112 +++---
panel/enums.c |7 +-
panel/external_plugin.c | 90 +--
panel/itembar.c | 236 +++
panel/plugin_iface.c| 15 +++-
5 files changed, 274 insertions(+), 186 deletions(-)
diff --git a/panel/arrow_button.c b/panel/arrow_button.c
index 9ba7e65..e6ee685 100644
--- a/panel/arrow_button.c
+++ b/panel/arrow_button.c
@@ -24,7 +24,7 @@ static PyTypeObject *_PyGtkToggleButton_Type;
/* -- forward type declarations -- */
-PyTypeObject PyXfceArrowButton_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceArrowButton_Type;
#line 30 "arrow_button.c"
@@ -39,9 +39,9 @@ _wrap_xfce_arrow_button_new(PyGObject *self, PyObject *args,
PyObject *kwargs)
PyObject *py_type = NULL;
GtkArrowType type;
-if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"O:XfceArrowButton.__init__", kwlist, &py_type))
+if (!PyArg_ParseTupleAndKeywords(args,
kwargs,"O:XfceArrowButton.__init__", kwlist, &py_type))
return -1;
-if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gint *)&type))
+if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gpointer)&type))
return -1;
self->obj = (GObject *)xfce_arrow_button_new(type);
@@ -60,11 +60,13 @@ _wrap_xfce_arrow_button_set_arrow_type(PyGObject *self,
PyObject *args, PyObject
PyObject *py_type = NULL;
GtkArrowType type;
-if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"O:XfceArrowButton.set_arrow_type", kwlist, &py_type))
+if (!PyArg_ParseTupleAndKeywords(args,
kwargs,"O:XfceArrowButton.set_arrow_type", kwlist, &py_type))
return NULL;
-if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gint *)&type))
+if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gpointer)&type))
return NULL;
+
xfce_arrow_button_set_arrow_type(XFCE_ARROW_BUTTON(self->obj), type);
+
Py_INCREF(Py_None);
return Py_None;
}
@@ -74,55 +76,59 @@ _wrap_xfce_arrow_button_get_arrow_type(PyGObject *self)
{
gint ret;
+
ret = xfce_arrow_button_get_arrow_type(XFCE_ARROW_BUTTON(self->obj));
+
return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
}
-static PyMethodDef _PyXfceArrowButton_methods[] = {
-{ "set_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_set_arrow_type,
METH_VARARGS|METH_KEYWORDS },
-{ "get_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_get_arrow_type,
METH_NOARGS },
-{ NULL, NULL, 0 }
+static const PyMethodDef _PyXfceArrowButton_methods[] = {
+{ "set_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_set_arrow_type,
METH_VARARGS|METH_KEYWORDS,
+ NULL },
+{ "get_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_get_arrow_type,
METH_NOARGS,
+ NULL },
+{ NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceArrowButton_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceArrowButton_Type = {
PyObject_HEAD_INIT(NULL)
-0, /* ob_size */
-"arrowbutton.ArrowButton", /* tp_name */
-sizeof(PyGObject), /* tp_basicsize */
-0, /* tp_itemsize */
+0, /* ob_size */
+"arrowbutton.ArrowButton", /* tp_name */
+sizeof(PyGObject), /* tp_basicsize */
+0, /* tp_itemsize */
/* methods */
-(destructor)0, /* tp_dealloc */
-(printfunc)0, /* tp_print */
-(getattrfunc)0,/* tp_getattr */
-(setattrfunc)0,/* tp_setattr */
-(cmpfunc)0,/* tp_compare */
-(reprfunc)0, /* tp_repr */
+(destructor)0,/* tp_dealloc */
+(printfunc)0, /* tp_print */
+(getattrfunc)0, /* tp_getattr */
+(setattrfunc)0, /* tp_setattr */
+(cmpfunc)0, /* tp_compare */
+(reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
-(hashfunc)0, /* tp_hash */
-(ternaryfunc)0,/* tp_call */
-(reprfunc)0, /* tp_str */
-(getattrofunc)0, /* tp_getattro */
-(setattrofunc)0, /* tp_setattro */
-(PyBufferProcs*)0, /* tp_as_buffer */
+(hashfunc)0, /* tp_hash */
+(ternaryfunc)0, /* tp_call */
+(reprf
[Xfce4-commits] changed to use only 'libxfce4panel-enum-types.h'.
Updating branch refs/heads/master
to c090ae95fcf375a6c176a992c5d461d27c81bbf0 (commit)
from e41f8efd7133baa1ee85dbe3874c5e381d8d177b (commit)
commit c090ae95fcf375a6c176a992c5d461d27c81bbf0
Author: Danny Milosavljevic
Date: Wed Dec 22 07:55:08 2010 +0100
changed to use only 'libxfce4panel-enum-types.h'.
panel/arrow_button.defs|2 +-
panel/enums.defs |2 +-
panel/enums.override |1 -
panel/external_plugin.defs |6 ++--
panel/gen |2 +-
panel/itembar.defs | 40 -
panel/plugin_iface.defs| 53 ++-
panel/window.defs |2 +-
8 files changed, 82 insertions(+), 26 deletions(-)
diff --git a/panel/arrow_button.defs b/panel/arrow_button.defs
index d627a78..a0782de 100644
--- a/panel/arrow_button.defs
+++ b/panel/arrow_button.defs
@@ -10,7 +10,7 @@
;; Enumerations and flags ...
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-arrow-button.h
+;; From xfce-arrow-button.h
(define-function xfce_arrow_button_get_type
(c-name "xfce_arrow_button_get_type")
diff --git a/panel/enums.defs b/panel/enums.defs
index 38aa51a..7e6834a 100644
--- a/panel/enums.defs
+++ b/panel/enums.defs
@@ -26,6 +26,6 @@
)
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-enums.h
+;; From xfce-panel-enums.h
diff --git a/panel/enums.override b/panel/enums.override
index b16e01c..162b70a 100644
--- a/panel/enums.override
+++ b/panel/enums.override
@@ -5,7 +5,6 @@
headers
#include "pygobject.h"
#include
-#include
#include
extern PyTypeObject PyGtkWidget_Type;
diff --git a/panel/external_plugin.defs b/panel/external_plugin.defs
index d0a1190..16a75f9 100644
--- a/panel/external_plugin.defs
+++ b/panel/external_plugin.defs
@@ -12,7 +12,7 @@
;; Enumerations and flags ...
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-external-plugin.h
+;; From xfce-panel-external-plugin.h
(define-function xfce_external_panel_plugin_get_type
(c-name "xfce_external_panel_plugin_get_type")
@@ -24,8 +24,8 @@
(is-constructor-of "XfceExternalPanelPlugin")
(return-type "GtkWidget*")
(parameters
-'("int" "argc")
-'("char**" "argv")
+'("gint" "argc")
+'("gchar**" "argv")
'("XfcePanelPluginFunc" "construct")
)
)
diff --git a/panel/gen b/panel/gen
index 9f8bb66..fffe123 100755
--- a/panel/gen
+++ b/panel/gen
@@ -19,7 +19,7 @@ do
[ "${defs}" = "internal_plugin.defs" ] && continue
[ "${defs}" = "plugin.defs" ] && continue
- python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
+ python2
/usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
fi
done
diff --git a/panel/itembar.defs b/panel/itembar.defs
index b29336b..9376478 100644
--- a/panel/itembar.defs
+++ b/panel/itembar.defs
@@ -10,7 +10,7 @@
;; Enumerations and flags ...
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-itembar.h
+;; From xfce-itembar.h
(define-function xfce_itembar_get_type
(c-name "xfce_itembar_get_type")
@@ -26,6 +26,24 @@
)
)
+(define-method set_maximum_size
+ (of-object "XfceItembar")
+ (c-name "xfce_itembar_set_maximum_size")
+ (return-type "none")
+ (parameters
+'("gint" "size")
+ )
+)
+
+(define-method set_allow_expand
+ (of-object "XfceItembar")
+ (c-name "xfce_itembar_set_allow_expand")
+ (return-type "none")
+ (parameters
+'("gboolean" "allow")
+ )
+)
+
(define-method set_orientation
(of-object "XfceItembar")
(c-name "xfce_itembar_set_orientation")
@@ -47,7 +65,7 @@
(return-type "none")
(parameters
'("GtkWidget*" "item")
-'("int" "position")
+'("gint" "position")
)
)
@@ -75,7 +93,7 @@
(return-type "none")
(parameters
'("GtkWidget*" "item")
-'("int" "position")
+'("gint" "position")
)
)
@@ -101,13 +119,13 @@
(define-method get_n_items
(of-object "XfceItembar")
(c-name "xfce_itembar_get_n_items")
- (return-type "int")
+ (return-type "gint")
)
(define-method get_item_index
(of-object "XfceItembar")
(c-name "xfce_itembar_get_item_index")
- (return-type "int")
+ (return-type "gint")
(parameters
'("GtkWidget*" &q
[Xfce4-commits] update automake config.
Updating branch refs/heads/master to e41f8efd7133baa1ee85dbe3874c5e381d8d177b (commit) from 09cea4d95731956d9a23ed96ae90d4c85e3f64ae (commit) commit e41f8efd7133baa1ee85dbe3874c5e381d8d177b Author: Danny Milosavljevic Date: Thu Dec 16 18:43:02 2010 +0100 update automake config. Makefile.am |4 ++-- configure.ac |4 +--- examples/configure.ac |2 -- pyxfce-1.0.pc.in |1 + 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 93d76c1..a642c1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,8 +13,8 @@ if HAVE_MIGHTY_MOUSE SUBDIR_MIGHTY_MOUSE = panel endif -SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) -DIST_SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) +SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE) +DIST_SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE) PLATFORM_VERSION = 4.2 PLATFORM_WIN32 = diff --git a/configure.ac b/configure.ac index d0e505e..fee8f0a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ -*- mode: m4 -*- AC_PREREQ(2.52) +AC_CONFIG_MACRO_DIR([m4]) ACLOCAL_AMFLAGS = -I m4 @@ -57,8 +58,6 @@ dnl XFCE_MIGHTY_MOUSE_PANEL_PLUGIN([PANEL], [4.3]) dnl PANEL_EXTERNALPLUGINDIR dnl PANEL_DESKTOPDATADIR -BM_DEPEND([XFCE4_MCS_CLIENT], [libxfce4mcs-client-1.0], [4.1.0]) -BM_DEPEND([XFCE4_MCS_MANAGER], [libxfce4mcs-manager-1.0], [4.1.0]) BM_DEPEND([GTK], [gtk+-2.0], [2.4]) BM_DEPEND([PYGTK], [pygtk-2.0], [2.6.0]) @@ -86,7 +85,6 @@ AC_CONFIG_FILES( Makefile pyxfce-1.0.pc gui/Makefile - mcs/Makefile netk/Makefile panel/Makefile util/Makefile diff --git a/examples/configure.ac b/examples/configure.ac index 52ea38c..66a0542 100644 --- a/examples/configure.ac +++ b/examples/configure.ac @@ -37,8 +37,6 @@ XFCE_MIGHTY_MOUSE_PANEL_PLUGIN([PANEL], [4.3]) dnl PANEL_EXTERNALPLUGINDIR dnl PANEL_DESKTOPDATADIR -BM_DEPEND([XFCE4_MCS_CLIENT], [libxfce4mcs-client-1.0], [4.1.0]) -BM_DEPEND([XFCE4_MCS_MANAGER], [libxfce4mcs-manager-1.0], [4.1.0]) dnl BM_DEPEND([GTK], [gtk+-2.0], [2.4]) dnl BM_DEPEND([PYGTK], [pygtk-2.0], [2.6.0]) diff --git a/pyxfce-1.0.pc.in b/pyxfce-1.0.pc.in index 11a37d9..2509e1b 100644 --- a/pyxfce-1.0.pc.in +++ b/pyxfce-1.0.pc.in @@ -1,4 +1,5 @@ pref...@prefix@ +datarootd...@datarootdir@ exec_pref...@exec_prefix@ included...@includedir@ datad...@datadir@ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30409 - pyxfce/branches/4.6/netk
Author: dannym
Date: 2009-07-28 07:38:31 + (Tue, 28 Jul 2009)
New Revision: 30409
Modified:
pyxfce/branches/4.6/netk/window.c
pyxfce/branches/4.6/netk/window.override
Log:
pyxfce 4.6: add 'set_geometry'.
Modified: pyxfce/branches/4.6/netk/window.c
===
--- pyxfce/branches/4.6/netk/window.c 2009-07-28 02:14:55 UTC (rev 30408)
+++ pyxfce/branches/4.6/netk/window.c 2009-07-28 07:38:31 UTC (rev 30409)
@@ -12,9 +12,11 @@
extern PyTypeObject PyNetkWorkspace_Type;
-#line 16 "window.c"
+void netk_window_set_geometry(NetkWindow* window, int x, int y, int width, int
height);
+#line 18 "window.c"
+
/* -- types from other modules -- */
static PyTypeObject *_PyGObject_Type;
#define PyGObject_Type (*_PyGObject_Type)
@@ -25,7 +27,7 @@
/* -- forward type declarations -- */
PyTypeObject G_GNUC_INTERNAL PyNetkWindow_Type;
-#line 29 "window.c"
+#line 31 "window.c"
@@ -147,7 +149,7 @@
return Py_None;
}
-#line 43 "window.override"
+#line 45 "window.override"
static PyObject *
_wrap_netk_window_get_pid(PyGObject *self)
{
@@ -161,7 +163,7 @@
return PyInt_FromLong(ret);
}
-#line 165 "window.c"
+#line 167 "window.c"
static PyObject *
@@ -708,7 +710,7 @@
return pyg_flags_from_gtype(NETK_TYPE_WINDOW_STATE, ret);
}
-#line 33 "window.override"
+#line 35 "window.override"
static PyObject *
_wrap_netk_window_get_geometry(PyGObject *self)
{
@@ -717,7 +719,7 @@
netk_window_get_geometry(NETK_WINDOW(self->obj), &x, &y, &width, &height);
return Py_BuildValue("()", x, y, width, height);
}
-#line 721 "window.c"
+#line 723 "window.c"
static PyObject *
@@ -768,6 +770,21 @@
}
+static PyObject *
+_wrap_netk_window_set_geometry(PyGObject *self, PyObject *args, PyObject
*kwargs)
+{
+static char *kwlist[] = { "xp", "yp", "widthp", "heightp", NULL };
+int xp, yp, widthp, heightp;
+
+if (!PyArg_ParseTupleAndKeywords(args,
kwargs,":NetkWindow.set_geometry", kwlist, &xp, &yp, &widthp, &heightp))
+return NULL;
+
+netk_window_set_geometry(NETK_WINDOW(self->obj), xp, yp, widthp, heightp);
+
+Py_INCREF(Py_None);
+return Py_None;
+}
+
static const PyMethodDef _PyNetkWindow_methods[] = {
{ "get_screen", (PyCFunction)_wrap_netk_window_get_screen, METH_NOARGS,
NULL },
@@ -891,6 +908,8 @@
NULL },
{ "is_in_viewport", (PyCFunction)_wrap_netk_window_is_in_viewport,
METH_VARARGS|METH_KEYWORDS,
NULL },
+{ "set_geometry", (PyCFunction)_wrap_netk_window_set_geometry,
METH_VARARGS|METH_KEYWORDS,
+ NULL },
{ NULL, NULL, 0, NULL }
};
@@ -1014,7 +1033,7 @@
}
-#line 1018 "window.c"
+#line 1037 "window.c"
pygobject_register_class(d, "NetkWindow", NETK_TYPE_WINDOW,
&PyNetkWindow_Type, Py_BuildValue("(O)", &PyGObject_Type));
pyg_set_object_has_new_constructor(NETK_TYPE_WINDOW);
}
Modified: pyxfce/branches/4.6/netk/window.override
===
--- pyxfce/branches/4.6/netk/window.override2009-07-28 02:14:55 UTC (rev
30408)
+++ pyxfce/branches/4.6/netk/window.override2009-07-28 07:38:31 UTC (rev
30409)
@@ -10,6 +10,8 @@
extern PyTypeObject PyNetkWorkspace_Type;
+void netk_window_set_geometry(NetkWindow* window, int x, int y, int width, int
height);
+
%%
include
%%
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30395 - pyxfce/branches/4.6/netk
Author: dannym
Date: 2009-07-26 09:04:45 + (Sun, 26 Jul 2009)
New Revision: 30395
Modified:
pyxfce/branches/4.6/netk/window.defs
Log:
add 'NetkWindow.set_geometry' to the defs.
Modified: pyxfce/branches/4.6/netk/window.defs
===
--- pyxfce/branches/4.6/netk/window.defs2009-07-26 09:01:29 UTC (rev
30394)
+++ pyxfce/branches/4.6/netk/window.defs2009-07-26 09:04:45 UTC (rev
30395)
@@ -497,3 +497,14 @@
)
+(define-method set_geometry
+ (of-object "NetkWindow")
+ (c-name "netk_window_set_geometry")
+ (return-type "none")
+ (parameters
+'("int" "xp")
+'("int" "yp")
+'("int" "widthp")
+'("int" "heightp")
+ )
+)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30394 - pyxfce/branches/4.6/netk
Author: dannym
Date: 2009-07-26 09:01:29 + (Sun, 26 Jul 2009)
New Revision: 30394
Added:
pyxfce/branches/4.6/netk/set_geometry.c
Modified:
pyxfce/branches/4.6/netk/Makefile.am
pyxfce/branches/4.6/netk/gen
Log:
pygtk: add a local function 'netk_window_set_geometry' to xfce4.netk.Window .
Modified: pyxfce/branches/4.6/netk/Makefile.am
===
--- pyxfce/branches/4.6/netk/Makefile.am2009-07-26 09:01:15 UTC (rev
30393)
+++ pyxfce/branches/4.6/netk/Makefile.am2009-07-26 09:01:29 UTC (rev
30394)
@@ -30,7 +30,8 @@
window.c \
window_menu.c \
workspace.c \
- netkmodule.c
+ netkmodule.c \
+ set_geometry.c
defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
defs_DATA = \
Modified: pyxfce/branches/4.6/netk/gen
===
--- pyxfce/branches/4.6/netk/gen2009-07-26 09:01:15 UTC (rev 30393)
+++ pyxfce/branches/4.6/netk/gen2009-07-26 09:01:29 UTC (rev 30394)
@@ -77,3 +77,17 @@
# )
#)
#EOF
+
+cat >>window.defs << EXF
+(define-method set_geometry
+ (of-object "NetkWindow")
+ (c-name "netk_window_set_geometry")
+ (return-type "none")
+ (parameters
+'("int" "xp")
+'("int" "yp")
+'("int" "widthp")
+'("int" "heightp")
+ )
+)
+EXF
Added: pyxfce/branches/4.6/netk/set_geometry.c
===
--- pyxfce/branches/4.6/netk/set_geometry.c (rev 0)
+++ pyxfce/branches/4.6/netk/set_geometry.c 2009-07-26 09:01:29 UTC (rev
30394)
@@ -0,0 +1,64 @@
+#include
+
+static void p_netk_move_window (Screen * screen, Window xwindow, int x, int y,
int width, int height);
+Screen *p_netk_screen_get_xscreen (NetkScreen * screen);
+Atom p_netk_atom_get (const char *atom_name);
+
+#define NETK_SCREEN_XSCREEN(screen) (p_netk_screen_get_xscreen (screen))
+
+/**
+* netk_window_set_geometry:
+* @window: a #NetkWindow
+* @x: the new x coordinate of the default corner, or -1 to leave unchanged.
+* @y: the new y coordinate of the default corner, or -1 to leave unchanged.
+* @width: the new width of the window, or -1 to leave unchanged.
+* @height: the new height of the window, or -1 to leave unchanged.
+*
+* Note that the geometry is NOT changed immediately but rather by the window
manager when or if it sees fit.
+*/
+void
+netk_window_set_geometry(NetkWindow* window, int x, int y, int width, int
height)
+/*const GdkGeometry* geometry*/
+{
+g_return_if_fail (NETK_IS_WINDOW (window));
+/** uses "_NET_MOVERESIZE_WINDOW" to set the geometry. */
+p_netk_move_window (NETK_SCREEN_XSCREEN (netk_window_get_screen (window)),
netk_window_get_xid (window), x, y, width, height);
+}
+
+/* TODO maybe fallback to manual XMoveWindow since Xfce <= 4.4 didn't support
"_NET_MOVERESIZE_WINDOW".*/
+/* pass -1 for the field that you do not want to change. */
+void
+p_netk_move_window (Screen * screen, Window xwindow, int x, int y, int width,
int height)
+{
+XEvent xev;
+unsigned long grflags = 0; /* default gravity, */
+
+xev.xclient.type = ClientMessage;
+xev.xclient.serial = 0;
+xev.xclient.send_event = True;
+xev.xclient.display = gdk_display;
+xev.xclient.window = xwindow;
+xev.xclient.message_type = p_netk_atom_get ("_NET_MOVERESIZE_WINDOW");
+xev.xclient.format = 32;
+
+if (x != -1)
+grflags |= (1 << 8);
+
+if (y != -1)
+grflags |= (1 << 9);
+
+if (width != -1)
+grflags |= (1 << 10);
+
+if (height != -1)
+grflags |= (1 << 11);
+
+xev.xclient.data.l[0] = grflags;
+xev.xclient.data.l[1] = x;
+xev.xclient.data.l[2] = y;
+xev.xclient.data.l[3] = width;
+xev.xclient.data.l[4] = height;
+
+XSendEvent (gdk_display, RootWindowOfScreen (screen), False,
SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+}
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30393 - pyxfce/branches/4.4/netk
Author: dannym
Date: 2009-07-26 09:01:15 + (Sun, 26 Jul 2009)
New Revision: 30393
Added:
pyxfce/branches/4.4/netk/set_geometry.c
Modified:
pyxfce/branches/4.4/netk/Makefile.am
pyxfce/branches/4.4/netk/gen
Log:
pygtk: add a local function 'netk_window_set_geometry' to xfce4.netk.Window .
Modified: pyxfce/branches/4.4/netk/Makefile.am
===
--- pyxfce/branches/4.4/netk/Makefile.am2009-07-25 11:12:29 UTC (rev
30392)
+++ pyxfce/branches/4.4/netk/Makefile.am2009-07-26 09:01:15 UTC (rev
30393)
@@ -30,7 +30,8 @@
window.c \
window_menu.c \
workspace.c \
- netkmodule.c
+ netkmodule.c \
+ set_geometry.c
defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
defs_DATA = \
Modified: pyxfce/branches/4.4/netk/gen
===
--- pyxfce/branches/4.4/netk/gen2009-07-25 11:12:29 UTC (rev 30392)
+++ pyxfce/branches/4.4/netk/gen2009-07-26 09:01:15 UTC (rev 30393)
@@ -17,7 +17,8 @@
#echo "${defs}"
- python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
+ python
/usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
+ #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
fi
done
rm -f util.defs
@@ -77,3 +78,17 @@
)
)
EOF
+
+cat >>window.defs << EXF
+(define-method set_geometry
+ (of-object "NetkWindow")
+ (c-name "netk_window_set_geometry")
+ (return-type "none")
+ (parameters
+'("int" "xp")
+'("int" "yp")
+'("int" "widthp")
+'("int" "heightp")
+ )
+)
+EXF
Added: pyxfce/branches/4.4/netk/set_geometry.c
===
--- pyxfce/branches/4.4/netk/set_geometry.c (rev 0)
+++ pyxfce/branches/4.4/netk/set_geometry.c 2009-07-26 09:01:15 UTC (rev
30393)
@@ -0,0 +1,64 @@
+#include
+
+static void p_netk_move_window (Screen * screen, Window xwindow, int x, int y,
int width, int height);
+Screen *p_netk_screen_get_xscreen (NetkScreen * screen);
+Atom p_netk_atom_get (const char *atom_name);
+
+#define NETK_SCREEN_XSCREEN(screen) (p_netk_screen_get_xscreen (screen))
+
+/**
+* netk_window_set_geometry:
+* @window: a #NetkWindow
+* @x: the new x coordinate of the default corner, or -1 to leave unchanged.
+* @y: the new y coordinate of the default corner, or -1 to leave unchanged.
+* @width: the new width of the window, or -1 to leave unchanged.
+* @height: the new height of the window, or -1 to leave unchanged.
+*
+* Note that the geometry is NOT changed immediately but rather by the window
manager when or if it sees fit.
+*/
+void
+netk_window_set_geometry(NetkWindow* window, int x, int y, int width, int
height)
+/*const GdkGeometry* geometry*/
+{
+g_return_if_fail (NETK_IS_WINDOW (window));
+/** uses "_NET_MOVERESIZE_WINDOW" to set the geometry. */
+p_netk_move_window (NETK_SCREEN_XSCREEN (netk_window_get_screen (window)),
netk_window_get_xid (window), x, y, width, height);
+}
+
+/* TODO maybe fallback to manual XMoveWindow since Xfce <= 4.4 didn't support
"_NET_MOVERESIZE_WINDOW".*/
+/* pass -1 for the field that you do not want to change. */
+void
+p_netk_move_window (Screen * screen, Window xwindow, int x, int y, int width,
int height)
+{
+XEvent xev;
+unsigned long grflags = 0; /* default gravity, */
+
+xev.xclient.type = ClientMessage;
+xev.xclient.serial = 0;
+xev.xclient.send_event = True;
+xev.xclient.display = gdk_display;
+xev.xclient.window = xwindow;
+xev.xclient.message_type = p_netk_atom_get ("_NET_MOVERESIZE_WINDOW");
+xev.xclient.format = 32;
+
+if (x != -1)
+grflags |= (1 << 8);
+
+if (y != -1)
+grflags |= (1 << 9);
+
+if (width != -1)
+grflags |= (1 << 10);
+
+if (height != -1)
+grflags |= (1 << 11);
+
+xev.xclient.data.l[0] = grflags;
+xev.xclient.data.l[1] = x;
+xev.xclient.data.l[2] = y;
+xev.xclient.data.l[3] = width;
+xev.xclient.data.l[4] = height;
+
+XSendEvent (gdk_display, RootWindowOfScreen (screen), False,
SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+}
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30206 - pyxfce/branches/4.6/netk
Author: dannym
Date: 2009-07-06 16:46:35 + (Mon, 06 Jul 2009)
New Revision: 30206
Modified:
pyxfce/branches/4.6/netk/trayicon.defs
Log:
pyxfce 4.6: netk: update to PyGTK 2.14.
Modified: pyxfce/branches/4.6/netk/trayicon.defs
===
--- pyxfce/branches/4.6/netk/trayicon.defs 2009-07-06 16:44:35 UTC (rev
30205)
+++ pyxfce/branches/4.6/netk/trayicon.defs 2009-07-06 16:46:35 UTC (rev
30206)
@@ -10,7 +10,7 @@
;; Enumerations and flags ...
-;; From /usr/local/include/xfce4/libxfcegui4/netk-trayicon.h
+;; From netk-trayicon.h
(define-function tray_icon_get_type
(c-name "netk_tray_icon_get_type")
@@ -21,8 +21,19 @@
(c-name "netk_tray_icon_new")
(is-constructor-of "NetkTrayIcon")
(return-type "GtkWidget*")
+ (parameters
+'("Screen*" "screen")
+ )
)
+(define-function tray_icon_new_gdk
+ (c-name "netk_tray_icon_new_gdk")
+ (return-type "NetkTrayIcon*")
+ (parameters
+'("GdkScreen*" "screen")
+ )
+)
+
(define-method set_screen
(of-object "NetkTrayIcon")
(c-name "netk_tray_icon_set_screen")
@@ -32,6 +43,15 @@
)
)
+(define-method set_gdkscreen
+ (of-object "NetkTrayIcon")
+ (c-name "netk_tray_icon_set_gdkscreen")
+ (return-type "none")
+ (parameters
+'("GdkScreen*" "screen")
+ )
+)
+
(define-method message_new
(of-object "NetkTrayIcon")
(c-name "netk_tray_icon_message_new")
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30205 - pyxfce/branches/4.6/util
Author: dannym
Date: 2009-07-06 16:44:35 + (Mon, 06 Jul 2009)
New Revision: 30205
Modified:
pyxfce/branches/4.6/util/desktopentry.c
pyxfce/branches/4.6/util/fileutils.c
pyxfce/branches/4.6/util/i18n.c
pyxfce/branches/4.6/util/kiosk.c
pyxfce/branches/4.6/util/miscutils.c
pyxfce/branches/4.6/util/rc.c
pyxfce/branches/4.6/util/resource.c
pyxfce/branches/4.6/util/utf8.c
Log:
pyxfce 4.6: util: update to PyGTK 2.14.
Modified: pyxfce/branches/4.6/util/desktopentry.c
===
--- pyxfce/branches/4.6/util/desktopentry.c 2009-07-06 16:44:10 UTC (rev
30204)
+++ pyxfce/branches/4.6/util/desktopentry.c 2009-07-06 16:44:35 UTC (rev
30205)
@@ -18,7 +18,7 @@
/* -- forward type declarations -- */
-PyTypeObject PyXfceDesktopEntry_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfceDesktopEntry_Type;
#line 24 "desktopentry.c"
@@ -31,7 +31,9 @@
{
const gchar *ret;
+
ret = xfce_desktop_entry_get_file(XFCE_DESKTOP_ENTRY(self->obj));
+
if (ret)
return PyString_FromString(ret);
Py_INCREF(Py_None);
@@ -56,7 +58,7 @@
Py_INCREF(Py_None);
return Py_None;
}
-#line 60 "desktopentry.c"
+#line 62 "desktopentry.c"
#line 29 "desktopentry.override"
@@ -83,7 +85,7 @@
Py_INCREF(Py_None);
return Py_None;
}
-#line 87 "desktopentry.c"
+#line 89 "desktopentry.c"
static PyObject *
@@ -93,60 +95,66 @@
char *key;
int ret;
-if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"s:XfceDesktopEntry.has_translated_entry", kwlist, &key))
+if (!PyArg_ParseTupleAndKeywords(args,
kwargs,"s:XfceDesktopEntry.has_translated_entry", kwlist, &key))
return NULL;
+
ret =
xfce_desktop_entry_has_translated_entry(XFCE_DESKTOP_ENTRY(self->obj), key);
+
return PyBool_FromLong(ret);
}
-static PyMethodDef _PyXfceDesktopEntry_methods[] = {
-{ "get_file", (PyCFunction)_wrap_xfce_desktop_entry_get_file, METH_NOARGS
},
-{ "get_int", (PyCFunction)_wrap_xfce_desktop_entry_get_int,
METH_VARARGS|METH_KEYWORDS },
-{ "get_string", (PyCFunction)_wrap_xfce_desktop_entry_get_string,
METH_VARARGS|METH_KEYWORDS },
-{ "has_translated_entry",
(PyCFunction)_wrap_xfce_desktop_entry_has_translated_entry,
METH_VARARGS|METH_KEYWORDS },
-{ NULL, NULL, 0 }
+static const PyMethodDef _PyXfceDesktopEntry_methods[] = {
+{ "get_file", (PyCFunction)_wrap_xfce_desktop_entry_get_file, METH_NOARGS,
+ NULL },
+{ "get_int", (PyCFunction)_wrap_xfce_desktop_entry_get_int,
METH_VARARGS|METH_KEYWORDS,
+ NULL },
+{ "get_string", (PyCFunction)_wrap_xfce_desktop_entry_get_string,
METH_VARARGS|METH_KEYWORDS,
+ NULL },
+{ "has_translated_entry",
(PyCFunction)_wrap_xfce_desktop_entry_has_translated_entry,
METH_VARARGS|METH_KEYWORDS,
+ NULL },
+{ NULL, NULL, 0, NULL }
};
-PyTypeObject PyXfceDesktopEntry_Type = {
+PyTypeObject G_GNUC_INTERNAL PyXfceDesktopEntry_Type = {
PyObject_HEAD_INIT(NULL)
-0, /* ob_size */
-"desktopentry.DesktopEntry", /* tp_name */
-sizeof(PyGObject), /* tp_basicsize */
-0, /* tp_itemsize */
+0, /* ob_size */
+"desktopentry.DesktopEntry", /* tp_name */
+sizeof(PyGObject), /* tp_basicsize */
+0, /* tp_itemsize */
/* methods */
-(destructor)0, /* tp_dealloc */
-(printfunc)0, /* tp_print */
-(getattrfunc)0,/* tp_getattr */
-(setattrfunc)0,/* tp_setattr */
-(cmpfunc)0,/* tp_compare */
-(reprfunc)0, /* tp_repr */
+(destructor)0,/* tp_dealloc */
+(printfunc)0, /* tp_print */
+(getattrfunc)0, /* tp_getattr */
+(setattrfunc)0, /* tp_setattr */
+(cmpfunc)0, /* tp_compare */
+(reprfunc)0, /* tp_repr */
(PyNumberMethods*)0, /* tp_as_number */
(PySequenceMethods*)0, /* tp_as_sequence */
(PyMappingMethods*)0, /* tp_as_mapping */
-(hashfunc)0, /* tp_hash */
-(ternaryfunc)0,/* tp_call */
-(reprfunc)0, /* tp_str */
-(getattrofunc)0, /* tp_getattro */
-(setattrofunc)0, /* tp_setattro */
-(PyBufferProcs*)0, /* tp_as_buffer */
+(hashfunc)0, /* tp_hash */
+(ternaryfunc)0, /* tp_call */
+(reprfunc)0, /* tp_str */
+(getattrofunc)0, /* tp_getattro */
+(setattrofunc)0, /* tp_setattro */
+(PyBufferProcs*)0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags
*/
-NULL, /* Documentation string */
-(traverseproc)0, /* tp_traverse */
-(inquiry)0,/* tp_clear */
-(ric
[Xfce4-commits] r30178 - in pyxfce/branches/4.6: . menu
Author: dannym Date: 2009-07-02 22:35:48 + (Thu, 02 Jul 2009) New Revision: 30178 Added: pyxfce/branches/4.6/menu/ pyxfce/branches/4.6/menu/Makefile.am pyxfce/branches/4.6/menu/gen pyxfce/branches/4.6/menu/libxfce4menu.defs pyxfce/branches/4.6/menu/libxfce4menu_config.defs pyxfce/branches/4.6/menu/menumodule.c pyxfce/branches/4.6/menu/xfce_menu-and-rules.defs pyxfce/branches/4.6/menu/xfce_menu-directory.defs pyxfce/branches/4.6/menu/xfce_menu-element.defs pyxfce/branches/4.6/menu/xfce_menu-environment.defs pyxfce/branches/4.6/menu/xfce_menu-item-cache.defs pyxfce/branches/4.6/menu/xfce_menu-item-pool.defs pyxfce/branches/4.6/menu/xfce_menu-item.defs pyxfce/branches/4.6/menu/xfce_menu-layout.defs pyxfce/branches/4.6/menu/xfce_menu-monitor.defs pyxfce/branches/4.6/menu/xfce_menu-move.defs pyxfce/branches/4.6/menu/xfce_menu-not-rules.defs pyxfce/branches/4.6/menu/xfce_menu-or-rules.defs pyxfce/branches/4.6/menu/xfce_menu-rules.defs pyxfce/branches/4.6/menu/xfce_menu-separator.defs pyxfce/branches/4.6/menu/xfce_menu-standard-rules.defs pyxfce/branches/4.6/menu/xfce_menu.defs Modified: pyxfce/branches/4.6/__init__.py pyxfce/branches/4.6/configure.ac Log: add 'menu' module. Modified: pyxfce/branches/4.6/__init__.py === --- pyxfce/branches/4.6/__init__.py 2009-07-02 22:30:40 UTC (rev 30177) +++ pyxfce/branches/4.6/__init__.py 2009-07-02 22:35:48 UTC (rev 30178) @@ -1,5 +1,5 @@ -__all__ = [ "gui", "mcs", "netk", "panel", "util" ] +__all__ = [ "gui", "menu", "netk", "panel", "util" ] #import util #import gui Modified: pyxfce/branches/4.6/configure.ac === --- pyxfce/branches/4.6/configure.ac2009-07-02 22:30:40 UTC (rev 30177) +++ pyxfce/branches/4.6/configure.ac2009-07-02 22:35:48 UTC (rev 30178) @@ -57,6 +57,7 @@ dnl PANEL_EXTERNALPLUGINDIR dnl PANEL_DESKTOPDATADIR +BM_DEPEND([XFCE4_MENU], [libxfce4menu-0.1], [4.5.92]) BM_DEPEND([GTK], [gtk+-2.0], [2.4]) BM_DEPEND([PYGTK], [pygtk-2.0], [2.6.0]) @@ -84,6 +85,7 @@ Makefile pyxfce-1.0.pc gui/Makefile + menu/Makefile netk/Makefile panel/Makefile util/Makefile Added: pyxfce/branches/4.6/menu/Makefile.am === --- pyxfce/branches/4.6/menu/Makefile.am(rev 0) +++ pyxfce/branches/4.6/menu/Makefile.am2009-07-02 22:35:48 UTC (rev 30178) @@ -0,0 +1,90 @@ +...@set_make@ + +PLATFORM_VERSION = 4.2 + +CODEGEN_PATH = @CODEGEN_PATH@ + +common_ldflags = -module -avoid-version -export-symbols-regex init_menu +if PLATFORM_WIN32 +common_ldflags += -no-undefined +endif + +INCLUDES = $(PYTHON_INCLUDES) + +pyxfceexecdir = $(pyexecdir)/xfce4 +pyxfceexec_LTLIBRARIES = _menu.la +pyxfceexec_PYTHON = menu.py + +_menu_la_CFLAGS = $(XFCE4_MENU_CFLAGS) $(PYTHON_CFLAGS) $(PYGTK_CFLAGS) +_menu_la_LDFLAGS = $(common_ldflags) +_menu_la_LIBADD = $(XFCE4_MENU_LIBS) +#-export-symbols-regex +_menu_la_SOURCES = \ + aboutdialog.c \ + appmenuitem.c \ + clock.c \ + colorbutton.c \ + decorbutton.c \ + decortoggle.c \ + dialogs.c \ + filechooser.c \ + framebox.c \ + gdk_extensions.c \ + gtk_extensions.c \ + gtk_style.c \ + gtktoxevent.c \ + iconbutton.c \ + icontheme.c \ + icons.c \ + menubutton.c \ + movehandler.c \ + scaled_image.c \ + session_client.c \ + systemtray.c \ + titled_dialog.c \ + togglebutton.c \ + menumodule.c \ + startup-notification.c + +defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs +defs_DATA = \ +libxfce4menu_config.defs \ +libxfce4menu.defs \ +xfce_menu-and-rules.defs \ +xfce_menu.defs \ +xfce_menu-directory.defs \ +xfce_menu-element.defs \ +xfce_menu-environment.defs \ +xfce_menu-item-cache.defs \ +xfce_menu-item.defs \ +xfce_menu-item-pool.defs \ +xfce_menu-layout.defs \ +xfce_menu-monitor.defs \ +xfce_menu-move.defs \ +xfce_menu-not-rules.defs \ +xfce_menu-or-rules.defs \ +xfce_menu-rules.defs \ +xfce_menu-separator.defs \ +xfce_menu-standard-rules.defs + +menu_overrides = + + +EXTRA_DIST = $(defs_DATA) $(menu_overrides) gen + +nodist__menu_la_SOURCES = + +PYGTK_DEFS="`pkg-config --variable=defsdir pygtk-2.0`" + +.defs.c: + (cd $(srcdir) \ +&& $(PYTHON) $(CODEGEN_PATH)/codegen.py \ + $(PYGTK_CODEGEN_DEFINES) \ +--override $*.override \ +--register $(PYGTK_DEFS)/gtk-types.defs \ +--register $(PYGTK_DEFS)/gdk-types.defs \ +--register ../util/desktopentry.defs \ +--prefix py$* $*.defs) > gen-$*.c \ +&& cp gen-$*.c $*.c \ +&& rm -f gen-$*.c + Added: pyxfce/branches/4.6/menu/gen === --- pyxfce/branches/4.6/menu/gen
[Xfce4-commits] r30177 - pyxfce/branches/4.6/gui
Author: dannym
Date: 2009-07-02 22:30:40 + (Thu, 02 Jul 2009)
New Revision: 30177
Modified:
pyxfce/branches/4.6/gui/appmenuitem.defs
Log:
pyxfce 4.6: gui/appmenuitem: add 'app_menu_item_set_icon_theme_name'.
Modified: pyxfce/branches/4.6/gui/appmenuitem.defs
===
--- pyxfce/branches/4.6/gui/appmenuitem.defs2009-07-02 22:29:54 UTC (rev
30176)
+++ pyxfce/branches/4.6/gui/appmenuitem.defs2009-07-02 22:30:40 UTC (rev
30177)
@@ -10,7 +10,7 @@
;; Enumerations and flags ...
-;; From /usr/local/include/xfce4/libxfcegui4/xfce-appmenuitem.h
+;; From xfce-appmenuitem.h
(define-function app_menu_item_get_type
(c-name "xfce_app_menu_item_get_type")
@@ -148,19 +148,19 @@
(return-type "gboolean")
)
-(define-function app_menu_item_set_icon_size
- (c-name "xfce_app_menu_item_set_icon_size")
+(define-function app_menu_item_set_icon_theme_name
+ (c-name "xfce_app_menu_item_set_icon_theme_name")
(return-type "none")
(parameters
-'("guint" "icon_size")
+'("const-gchar*" "theme_name")
)
)
-(define-function app_menu_item_set_icon_theme_name
- (c-name "xfce_app_menu_item_set_icon_theme_name")
+(define-function app_menu_item_set_icon_size
+ (c-name "xfce_app_menu_item_set_icon_size")
(return-type "none")
(parameters
-'("const-gchar*" "theme_name")
+'("guint" "icon_size")
)
)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30175 - pyxfce/branches/4.6/netk
Author: dannym
Date: 2009-07-02 22:28:12 + (Thu, 02 Jul 2009)
New Revision: 30175
Modified:
pyxfce/branches/4.6/netk/window.defs
Log:
pyxfce 4.6: netk/window: add 'demands-attention',
'or_transient_demands_attention', 'set_fullscreen', 'get_icon_geometry'.
Modified: pyxfce/branches/4.6/netk/window.defs
===
--- pyxfce/branches/4.6/netk/window.defs2009-07-02 22:26:57 UTC (rev
30174)
+++ pyxfce/branches/4.6/netk/window.defs2009-07-02 22:28:12 UTC (rev
30175)
@@ -24,6 +24,7 @@
'("hidden" "NETK_WINDOW_STATE_HIDDEN")
'("fullscreen" "NETK_WINDOW_STATE_FULLSCREEN")
'("urgent" "NETK_WINDOW_STATE_URGENT")
+'("demands-attention" "NETK_WINDOW_STATE_DEMANDS_ATTENTION")
)
)
@@ -69,7 +70,7 @@
)
-;; From /usr/local/include/xfce4/libxfcegui4/netk-window.h
+;; From netk-window.h
(define-function window_get_type
(c-name "netk_window_get_type")
@@ -216,6 +217,24 @@
(return-type "gboolean")
)
+(define-method is_fullscreen
+ (of-object "NetkWindow")
+ (c-name "netk_window_is_fullscreen")
+ (return-type "gboolean")
+)
+
+(define-method demands_attention
+ (of-object "NetkWindow")
+ (c-name "netk_window_demands_attention")
+ (return-type "gboolean")
+)
+
+(define-method or_transient_demands_attention
+ (of-object "NetkWindow")
+ (c-name "netk_window_or_transient_demands_attention")
+ (return-type "gboolean")
+)
+
(define-method set_skip_pager
(of-object "NetkWindow")
(c-name "netk_window_set_skip_pager")
@@ -234,6 +253,15 @@
)
)
+(define-method set_fullscreen
+ (of-object "NetkWindow")
+ (c-name "netk_window_set_fullscreen")
+ (return-type "none")
+ (parameters
+'("gboolean" "fullscreen")
+ )
+)
+
(define-method close
(of-object "NetkWindow")
(c-name "netk_window_close")
@@ -405,6 +433,18 @@
)
)
+(define-method get_icon_geometry
+ (of-object "NetkWindow")
+ (c-name "netk_window_get_icon_geometry")
+ (return-type "gboolean")
+ (parameters
+'("int*" "xp")
+'("int*" "yp")
+'("int*" "widthp")
+'("int*" "heightp")
+ )
+)
+
(define-method get_actions
(of-object "NetkWindow")
(c-name "netk_window_get_actions")
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30174 - pyxfce/branches/4.6/netk
Author: dannym Date: 2009-07-02 22:26:57 + (Thu, 02 Jul 2009) New Revision: 30174 Modified: pyxfce/branches/4.6/netk/screen.defs Log: pyxfce 4.6: netk/screen: minimal changes. Modified: pyxfce/branches/4.6/netk/screen.defs === --- pyxfce/branches/4.6/netk/screen.defs2009-07-02 22:25:47 UTC (rev 30173) +++ pyxfce/branches/4.6/netk/screen.defs2009-07-02 22:26:57 UTC (rev 30174) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-screen.h +;; From netk-screen.h (define-function screen_get_type (c-name "netk_screen_get_type") @@ -77,6 +77,12 @@ (return-type "GList*") ) +(define-method get_workspaces + (of-object "NetkScreen") + (c-name "netk_screen_get_workspaces") + (return-type "GList*") +) + (define-method force_update (of-object "NetkScreen") (c-name "netk_screen_force_update") @@ -171,10 +177,3 @@ ) -(define-method get_workspaces - (of-object "NetkScreen") - (c-name "netk_screen_get_workspaces") - (return-type "GList*") - (parameters - ) -) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30173 - pyxfce/branches/4.6/netk
Author: dannym
Date: 2009-07-02 22:25:47 + (Thu, 02 Jul 2009)
New Revision: 30173
Modified:
pyxfce/branches/4.6/netk/tasklist.defs
Log:
pyxfce 4.6 netk/tasklist: add 'set_button_relief', 'get_screen',
'get_grouping', 'get_switch_workspace_on_unminimize', 'get_grouping_limit',
'get_include_all_workspaces', 'get_show_label', 'get_button_relief'.
Modified: pyxfce/branches/4.6/netk/tasklist.defs
===
--- pyxfce/branches/4.6/netk/tasklist.defs 2009-07-02 22:24:06 UTC (rev
30172)
+++ pyxfce/branches/4.6/netk/tasklist.defs 2009-07-02 22:25:47 UTC (rev
30173)
@@ -21,7 +21,7 @@
)
-;; From /usr/local/include/xfce4/libxfcegui4/netk-tasklist.h
+;; From netk-tasklist.h
(define-function tasklist_get_type
(c-name "netk_tasklist_get_type")
@@ -141,4 +141,55 @@
)
)
+(define-method set_button_relief
+ (of-object "NetkTasklist")
+ (c-name "netk_tasklist_set_button_relief")
+ (return-type "none")
+ (parameters
+'("GtkReliefStyle" "relief")
+ )
+)
+(define-method get_screen
+ (of-object "NetkTasklist")
+ (c-name "netk_tasklist_get_screen")
+ (return-type "NetkScreen*")
+)
+
+(define-method get_grouping
+ (of-object "NetkTasklist")
+ (c-name "netk_tasklist_get_grouping")
+ (return-type "NetkTasklistGroupingType")
+)
+
+(define-method get_switch_workspace_on_unminimize
+ (of-object "NetkTasklist")
+ (c-name "netk_tasklist_get_switch_workspace_on_unminimize")
+ (return-type "gboolean")
+)
+
+(define-method get_grouping_limit
+ (of-object "NetkTasklist")
+ (c-name "netk_tasklist_get_grouping_limit")
+ (return-type "gint")
+)
+
+(define-method get_include_all_workspaces
+ (of-object "NetkTasklist")
+ (c-name "netk_tasklist_get_include_all_workspaces")
+ (return-type "gboolean")
+)
+
+(define-method get_show_label
+ (of-object "NetkTasklist")
+ (c-name "netk_tasklist_get_show_label")
+ (return-type "gboolean")
+)
+
+(define-method get_button_relief
+ (of-object "NetkTasklist")
+ (c-name "netk_tasklist_get_button_relief")
+ (return-type "GtkReliefStyle")
+)
+
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30172 - pyxfce/branches/4.6/netk
Author: dannym
Date: 2009-07-02 22:24:06 + (Thu, 02 Jul 2009)
New Revision: 30172
Modified:
pyxfce/branches/4.6/netk/gen
Log:
pyxfce 4.6: netk: simplify 'gen'.
Modified: pyxfce/branches/4.6/netk/gen
===
--- pyxfce/branches/4.6/netk/gen2009-07-02 22:23:29 UTC (rev 30171)
+++ pyxfce/branches/4.6/netk/gen2009-07-02 22:24:06 UTC (rev 30172)
@@ -64,16 +64,16 @@
# message_new
# message_cancel
-cat trayicon.defs \
-| awk ' /^\(define-/ { n = 0; } /^\(define-function tray_icon_new/ { n = 1; }
/^\)/ { n = 0; } /\(parameters/ { if (n) skip1 = 1; } /\("Screen\*" "screen"\)/
{ if (n) skip1 = 1; } / \)/ { if (n) skip1 = 1; } // { if (skip1 == 1) skip1 =
0; else print $_; } ' >trayicon.defs.new \
-&& mv trayicon.defs.new trayicon.defs
+#cat trayicon.defs \
+#| awk ' /^\(define-/ { n = 0; } /^\(define-function tray_icon_new/ { n = 1; }
/^\)/ { n = 0; } /\(parameters/ { if (n) skip1 = 1; } /\("Screen\*" "screen"\)/
{ if (n) skip1 = 1; } / \)/ { if (n) skip1 = 1; } // { if (skip1 == 1) skip1 =
0; else print $_; } ' >trayicon.defs.new \
+#&& mv trayicon.defs.new trayicon.defs
-cat >> screen.defs << EOF
-(define-method get_workspaces
- (of-object "NetkScreen")
- (c-name "netk_screen_get_workspaces")
- (return-type "GList*")
- (parameters
- )
-)
-EOF
+#cat >> screen.defs << EOF
+#(define-method get_workspaces
+# (of-object "NetkScreen")
+# (c-name "netk_screen_get_workspaces")
+# (return-type "GList*")
+# (parameters
+# )
+#)
+#EOF
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30169 - pyxfce/branches/4.6
Author: dannym Date: 2009-07-02 21:54:51 + (Thu, 02 Jul 2009) New Revision: 30169 Modified: pyxfce/branches/4.6/configure.ac Log: pyxfce 4.6: update required Xfce version Modified: pyxfce/branches/4.6/configure.ac === --- pyxfce/branches/4.6/configure.ac2009-07-02 21:51:38 UTC (rev 30168) +++ pyxfce/branches/4.6/configure.ac2009-07-02 21:54:51 UTC (rev 30169) @@ -4,11 +4,11 @@ ACLOCAL_AMFLAGS = -I m4 m4_define(pyxfce_major_version, 4) -m4_define(pyxfce_minor_version, 4) +m4_define(pyxfce_minor_version, 6) m4_define(pyxfce_micro_version, 0) m4_define(pyxfce_version, pyxfce_major_version.pyxfce_minor_version.pyxfce_micro_version) -m4_define(xfce_required_version, 4.4.0) +m4_define(xfce_required_version, 4.6.0) AC_INIT(pyxfce, pyxfce_version, []) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30170 - pyxfce/branches/4.6/netk
Author: dannym
Date: 2009-07-02 21:58:45 + (Thu, 02 Jul 2009)
New Revision: 30170
Modified:
pyxfce/branches/4.6/netk/pager.defs
Log:
netk/pager: add 'set_workspace_scrolling'
Modified: pyxfce/branches/4.6/netk/pager.defs
===
--- pyxfce/branches/4.6/netk/pager.defs 2009-07-02 21:54:51 UTC (rev 30169)
+++ pyxfce/branches/4.6/netk/pager.defs 2009-07-02 21:58:45 UTC (rev 30170)
@@ -20,7 +20,7 @@
)
-;; From /usr/local/include/xfce4/libxfcegui4/netk-pager.h
+;; From netk-pager.h
(define-function pager_get_type
(c-name "netk_pager_get_type")
@@ -81,6 +81,15 @@
)
)
+(define-method set_workspace_scrolling
+ (of-object "NetkPager")
+ (c-name "netk_pager_set_workspace_scrolling")
+ (return-type "none")
+ (parameters
+'("gboolean" "workspace_scrolling")
+ )
+)
+
(define-method set_shadow_type
(of-object "NetkPager")
(c-name "netk_pager_set_shadow_type")
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30168 - pyxfce/branches/4.6
Author: dannym Date: 2009-07-02 21:51:38 + (Thu, 02 Jul 2009) New Revision: 30168 Modified: pyxfce/branches/4.6/ChangeLog Log: pyxfce 4.6: update 'ChangeLog' Modified: pyxfce/branches/4.6/ChangeLog === --- pyxfce/branches/4.6/ChangeLog 2009-07-02 21:50:02 UTC (rev 30167) +++ pyxfce/branches/4.6/ChangeLog 2009-07-02 21:51:38 UTC (rev 30168) @@ -1,3 +1,7 @@ +2009-07-03 00:49 dannym + + * support Xfce 4.6. + 2006-03-25 16:16 dannym * COPYING: swich e-mairl now that it works :) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30167 - pyxfce/branches/4.6/panel
Author: dannym
Date: 2009-07-02 21:50:02 + (Thu, 02 Jul 2009)
New Revision: 30167
Modified:
pyxfce/branches/4.6/panel/external_plugin.defs
Log:
pyxfce 4.6: 'panel/panel/external_plugin.defs': commit trivial changes.
Modified: pyxfce/branches/4.6/panel/external_plugin.defs
===
--- pyxfce/branches/4.6/panel/external_plugin.defs 2009-07-02 21:46:22 UTC
(rev 30166)
+++ pyxfce/branches/4.6/panel/external_plugin.defs 2009-07-02 21:50:02 UTC
(rev 30167)
@@ -12,7 +12,7 @@
;; Enumerations and flags ...
-;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-external-plugin.h
+;; From xfce-panel-external-plugin.h
(define-function xfce_external_panel_plugin_get_type
(c-name "xfce_external_panel_plugin_get_type")
@@ -24,8 +24,8 @@
(is-constructor-of "XfceExternalPanelPlugin")
(return-type "GtkWidget*")
(parameters
-'("int" "argc")
-'("char**" "argv")
+'("gint" "argc")
+'("gchar**" "argv")
'("XfcePanelPluginFunc" "construct")
)
)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30166 - pyxfce/branches/4.6/gui
Author: dannym
Date: 2009-07-02 21:46:22 + (Thu, 02 Jul 2009)
New Revision: 30166
Modified:
pyxfce/branches/4.6/gui/icons.defs
Log:
pyxfce 4.6: clock: add: 'icon-category-accessories'
Modified: pyxfce/branches/4.6/gui/icons.defs
===
--- pyxfce/branches/4.6/gui/icons.defs 2009-07-02 21:45:36 UTC (rev 30165)
+++ pyxfce/branches/4.6/gui/icons.defs 2009-07-02 21:46:22 UTC (rev 30166)
@@ -18,18 +18,20 @@
'("icon-category-graphics" "XFCE_ICON_CATEGORY_GRAPHICS")
'("icon-category-printer" "XFCE_ICON_CATEGORY_PRINTER")
'("icon-category-productivity" "XFCE_ICON_CATEGORY_PRODUCTIVITY")
+'("icon-category-office" "XFCE_ICON_CATEGORY_OFFICE")
'("icon-category-sound" "XFCE_ICON_CATEGORY_SOUND")
'("icon-category-terminal" "XFCE_ICON_CATEGORY_TERMINAL")
'("icon-category-development" "XFCE_ICON_CATEGORY_DEVELOPMENT")
'("icon-category-settings" "XFCE_ICON_CATEGORY_SETTINGS")
'("icon-category-system" "XFCE_ICON_CATEGORY_SYSTEM")
'("icon-category-wine" "XFCE_ICON_CATEGORY_WINE")
+'("icon-category-accessories" "XFCE_ICON_CATEGORY_ACCESSORIES")
'("n-builtin-icon-categories" "XFCE_N_BUILTIN_ICON_CATEGORIES")
)
)
-;; From /usr/local/include/xfce4/libxfcegui4/icons.h
+;; From icons.h
(define-function inline_icon_at_size
(c-name "xfce_inline_icon_at_size")
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30165 - pyxfce/branches/4.6/gui
Author: dannym
Date: 2009-07-02 21:45:36 + (Thu, 02 Jul 2009)
New Revision: 30165
Modified:
pyxfce/branches/4.6/gui/clock.defs
Log:
pyxfce 4.6: clock: add: set_format, set_formatted_view, get_formatted_view.
Modified: pyxfce/branches/4.6/gui/clock.defs
===
--- pyxfce/branches/4.6/gui/clock.defs 2009-07-02 21:43:50 UTC (rev 30164)
+++ pyxfce/branches/4.6/gui/clock.defs 2009-07-02 21:45:36 UTC (rev 30165)
@@ -33,7 +33,7 @@
)
-;; From /usr/local/include/xfce4/libxfcegui4/xfce_clock.h
+;; From xfce_clock.h
(define-function clock_get_type
(c-name "xfce_clock_get_type")
@@ -166,6 +166,30 @@
(return-type "none")
)
+(define-method set_format
+ (of-object "XfceClock")
+ (c-name "xfce_clock_set_format")
+ (return-type "none")
+ (parameters
+'("const-gchar*" "format")
+ )
+)
+
+(define-method set_formatted_view
+ (of-object "XfceClock")
+ (c-name "xfce_clock_set_formatted_view")
+ (return-type "none")
+ (parameters
+'("gboolean" "formatted")
+ )
+)
+
+(define-method get_formatted_view
+ (of-object "XfceClock")
+ (c-name "xfce_clock_get_formatted_view")
+ (return-type "gboolean")
+)
+
(define-method get_mode
(of-object "XfceClock")
(c-name "xfce_clock_get_mode")
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30164 - pyxfce/branches/4.6/gui
Author: dannym Date: 2009-07-02 21:43:50 + (Thu, 02 Jul 2009) New Revision: 30164 Modified: pyxfce/branches/4.6/gui/decorbutton.defs pyxfce/branches/4.6/gui/dialogs.defs pyxfce/branches/4.6/gui/gdk_extensions.defs pyxfce/branches/4.6/gui/gtktoxevent.defs pyxfce/branches/4.6/gui/iconbutton.defs pyxfce/branches/4.6/gui/libxfcegui4.defs pyxfce/branches/4.6/gui/libxfcegui4_config.defs pyxfce/branches/4.6/gui/movehandler.defs pyxfce/branches/4.6/gui/scaled_image.defs pyxfce/branches/4.6/gui/systemtray.defs pyxfce/branches/4.6/gui/titled_dialog.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/decorbutton.defs === --- pyxfce/branches/4.6/gui/decorbutton.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/decorbutton.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -20,7 +20,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/xfce_decorbutton.h +;; From xfce_decorbutton.h (define-function decorbutton_get_type (c-name "xfce_decorbutton_get_type") Modified: pyxfce/branches/4.6/gui/dialogs.defs === --- pyxfce/branches/4.6/gui/dialogs.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/dialogs.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/dialogs.h +;; From dialogs.h (define-function show_info (c-name "show_info") Modified: pyxfce/branches/4.6/gui/gdk_extensions.defs === --- pyxfce/branches/4.6/gui/gdk_extensions.defs 2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/gdk_extensions.defs 2009-07-02 21:43:50 UTC (rev 30164) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-gdk-extensions.h +;; From xfce-gdk-extensions.h (define-function gdk_display_get_fullname (c-name "xfce_gdk_display_get_fullname") Modified: pyxfce/branches/4.6/gui/gtktoxevent.defs === --- pyxfce/branches/4.6/gui/gtktoxevent.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/gtktoxevent.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -13,7 +13,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/gtktoxevent.h +;; From gtktoxevent.h (define-function push_event_filter (c-name "xfce_push_event_filter") Modified: pyxfce/branches/4.6/gui/iconbutton.defs === --- pyxfce/branches/4.6/gui/iconbutton.defs 2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/iconbutton.defs 2009-07-02 21:43:50 UTC (rev 30164) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_iconbutton.h +;; From xfce_iconbutton.h (define-function iconbutton_get_type (c-name "xfce_iconbutton_get_type") Modified: pyxfce/branches/4.6/gui/libxfcegui4.defs === --- pyxfce/branches/4.6/gui/libxfcegui4.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/libxfcegui4.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -3,6 +3,6 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/libxfcegui4.h +;; From libxfcegui4.h Modified: pyxfce/branches/4.6/gui/libxfcegui4_config.defs === --- pyxfce/branches/4.6/gui/libxfcegui4_config.defs 2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/libxfcegui4_config.defs 2009-07-02 21:43:50 UTC (rev 30164) @@ -3,6 +3,6 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/libxfcegui4-config.h +;; From libxfcegui4-config.h Modified: pyxfce/branches/4.6/gui/movehandler.defs === --- pyxfce/branches/4.6/gui/movehandler.defs2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/movehandler.defs2009-07-02 21:43:50 UTC (rev 30164) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_movehandler.h +;; From xfce_movehandler.h (define-function void (c-name "void") Modified: pyxfce/branches/4.6/gui/scaled_image.defs === --- pyxfce/branches/4.6/gui/scaled_image.defs 2009-07-02 21:41:35 UTC (rev 30163) +++ pyxfce/branches/4.6/gui/scaled_image.defs 2009-07-02 21:43:50 UTC (rev 30164) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_scaled_image.h +;; From xfce_scaled_image.h (define-function scaled_image_get_type (c-name "xfce_scaled_image_get_type")
[Xfce4-commits] r30163 - in pyxfce/branches/4.6: gui panel util
Author: dannym Date: 2009-07-02 21:41:35 + (Thu, 02 Jul 2009) New Revision: 30163 Modified: pyxfce/branches/4.6/gui/framebox.defs pyxfce/branches/4.6/gui/gtk_style.defs pyxfce/branches/4.6/gui/togglebutton.defs pyxfce/branches/4.6/panel/arrow_button.defs pyxfce/branches/4.6/util/miscutils.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/framebox.defs === --- pyxfce/branches/4.6/gui/framebox.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/gui/framebox.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_framebox.h +;; From xfce_framebox.h (define-function framebox_get_type (c-name "xfce_framebox_get_type") Modified: pyxfce/branches/4.6/gui/gtk_style.defs === --- pyxfce/branches/4.6/gui/gtk_style.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/gui/gtk_style.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/gtk_style.h +;; From gtk_style.h (define-function get_style (c-name "get_style") Modified: pyxfce/branches/4.6/gui/togglebutton.defs === --- pyxfce/branches/4.6/gui/togglebutton.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/gui/togglebutton.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_togglebutton.h +;; From xfce_togglebutton.h (define-function togglebutton_get_type (c-name "xfce_togglebutton_get_type") Modified: pyxfce/branches/4.6/panel/arrow_button.defs === --- pyxfce/branches/4.6/panel/arrow_button.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/panel/arrow_button.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4panel/xfce-arrow-button.h +;; From xfce-arrow-button.h (define-function xfce_arrow_button_get_type (c-name "xfce_arrow_button_get_type") Modified: pyxfce/branches/4.6/util/miscutils.defs === --- pyxfce/branches/4.6/util/miscutils.defs 2009-07-02 21:39:49 UTC (rev 30162) +++ pyxfce/branches/4.6/util/miscutils.defs 2009-07-02 21:41:35 UTC (rev 30163) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-miscutils.h +;; From xfce-miscutils.h (define-function version_string (c-name "xfce_version_string") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30162 - in pyxfce/branches/4.6: gui netk panel util
Author: dannym
Date: 2009-07-02 21:39:49 + (Thu, 02 Jul 2009)
New Revision: 30162
Modified:
pyxfce/branches/4.6/gui/gen
pyxfce/branches/4.6/netk/gen
pyxfce/branches/4.6/panel/gen
pyxfce/branches/4.6/util/gen
Log:
fix path for new 2.6 pygtk codegen
Modified: pyxfce/branches/4.6/gui/gen
===
--- pyxfce/branches/4.6/gui/gen 2009-07-02 21:39:02 UTC (rev 30161)
+++ pyxfce/branches/4.6/gui/gen 2009-07-02 21:39:49 UTC (rev 30162)
@@ -12,7 +12,8 @@
then
defs="${t/-/_}.defs"
defs="${defs/-/_}"
- python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
+ python
/usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
+ #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
fi
done
rm -f util.defs
Modified: pyxfce/branches/4.6/netk/gen
===
--- pyxfce/branches/4.6/netk/gen2009-07-02 21:39:02 UTC (rev 30161)
+++ pyxfce/branches/4.6/netk/gen2009-07-02 21:39:49 UTC (rev 30162)
@@ -16,8 +16,8 @@
defs="${defs/-/_}"
#echo "${defs}"
-
- python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
+ python
/usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
+ #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
fi
done
rm -f util.defs
Modified: pyxfce/branches/4.6/panel/gen
===
--- pyxfce/branches/4.6/panel/gen 2009-07-02 21:39:02 UTC (rev 30161)
+++ pyxfce/branches/4.6/panel/gen 2009-07-02 21:39:49 UTC (rev 30162)
@@ -19,7 +19,8 @@
[ "${defs}" = "internal_plugin.defs" ] && continue
[ "${defs}" = "plugin.defs" ] && continue
- python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
+ python
/usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
+ #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
fi
done
Modified: pyxfce/branches/4.6/util/gen
===
--- pyxfce/branches/4.6/util/gen2009-07-02 21:39:02 UTC (rev 30161)
+++ pyxfce/branches/4.6/util/gen2009-07-02 21:39:49 UTC (rev 30162)
@@ -9,7 +9,8 @@
t="${t%.h}"
defs="${t}.defs"
- python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
+ python /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s"
>"${defs}"
+ #python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
done
rm -f util.defs
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30161 - in pyxfce/branches/4.6: gui netk panel util
Author: dannym Date: 2009-07-02 21:39:02 + (Thu, 02 Jul 2009) New Revision: 30161 Modified: pyxfce/branches/4.6/gui/colorbutton.defs pyxfce/branches/4.6/gui/decortoggle.defs pyxfce/branches/4.6/gui/filechooser.defs pyxfce/branches/4.6/gui/gtk_extensions.defs pyxfce/branches/4.6/gui/icontheme.defs pyxfce/branches/4.6/netk/application.defs pyxfce/branches/4.6/netk/class_group.defs pyxfce/branches/4.6/panel/window.defs pyxfce/branches/4.6/util/rc.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/colorbutton.defs === --- pyxfce/branches/4.6/gui/colorbutton.defs2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/colorbutton.defs2009-07-02 21:39:02 UTC (rev 30161) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-colorbutton.h +;; From xfce-colorbutton.h (define-function color_button_new (c-name "xfce_color_button_new") Modified: pyxfce/branches/4.6/gui/decortoggle.defs === --- pyxfce/branches/4.6/gui/decortoggle.defs2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/decortoggle.defs2009-07-02 21:39:02 UTC (rev 30161) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_decortoggle.h +;; From xfce_decortoggle.h (define-function decortoggle_get_type (c-name "xfce_decortoggle_get_type") Modified: pyxfce/branches/4.6/gui/filechooser.defs === --- pyxfce/branches/4.6/gui/filechooser.defs2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/filechooser.defs2009-07-02 21:39:02 UTC (rev 30161) @@ -15,7 +15,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/xfce-filechooser.h +;; From xfce-filechooser.h (define-function file_chooser_new (c-name "xfce_file_chooser_new") Modified: pyxfce/branches/4.6/gui/gtk_extensions.defs === --- pyxfce/branches/4.6/gui/gtk_extensions.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/gtk_extensions.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-gtk-extensions.h +;; From xfce-gtk-extensions.h (define-function gtk_window_center_on_monitor (c-name "xfce_gtk_window_center_on_monitor") Modified: pyxfce/branches/4.6/gui/icontheme.defs === --- pyxfce/branches/4.6/gui/icontheme.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/gui/icontheme.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-icontheme.h +;; From xfce-icontheme.h (define-function icon_theme_get_type (c-name "xfce_icon_theme_get_type") Modified: pyxfce/branches/4.6/netk/application.defs === --- pyxfce/branches/4.6/netk/application.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/netk/application.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-application.h +;; From netk-application.h (define-function application_get_type (c-name "netk_application_get_type") Modified: pyxfce/branches/4.6/netk/class_group.defs === --- pyxfce/branches/4.6/netk/class_group.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/netk/class_group.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-class-group.h +;; From netk-class-group.h (define-function class_group_get_type (c-name "netk_class_group_get_type") Modified: pyxfce/branches/4.6/panel/window.defs === --- pyxfce/branches/4.6/panel/window.defs 2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/panel/window.defs 2009-07-02 21:39:02 UTC (rev 30161) @@ -22,7 +22,7 @@ ) -;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-window.h +;; From xfce-panel-window.h (define-function xfce_panel_window_get_type (c-name "xfce_panel_window_get_type") Modified: pyxfce/branches/4.6/util/rc.defs === --- pyxfce/branches/4.6/util/rc.defs2009-07-02 21:36:30 UTC (rev 30160) +++ pyxfce/branches/4.6/util/rc.defs2009-07-02 21:39:02 UTC (rev 30161) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-rc.h +;; From xfc
[Xfce4-commits] r30160 - in pyxfce/branches/4.6: gui netk panel util
Author: dannym Date: 2009-07-02 21:36:30 + (Thu, 02 Jul 2009) New Revision: 30160 Modified: pyxfce/branches/4.6/gui/aboutdialog.defs pyxfce/branches/4.6/netk/enum_types.defs pyxfce/branches/4.6/netk/window_action_menu.defs pyxfce/branches/4.6/netk/workspace.defs pyxfce/branches/4.6/panel/enums.defs pyxfce/branches/4.6/util/fileutils.defs pyxfce/branches/4.6/util/i18n.defs pyxfce/branches/4.6/util/resource.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/aboutdialog.defs === --- pyxfce/branches/4.6/gui/aboutdialog.defs2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/gui/aboutdialog.defs2009-07-02 21:36:30 UTC (rev 30160) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_aboutdialog.h +;; From xfce_aboutdialog.h (define-function about_info_get_type (c-name "xfce_about_info_get_type") Modified: pyxfce/branches/4.6/netk/enum_types.defs === --- pyxfce/branches/4.6/netk/enum_types.defs2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/netk/enum_types.defs2009-07-02 21:36:30 UTC (rev 30160) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-enum-types.h +;; From netk-enum-types.h (define-function window_state_get_type (c-name "netk_window_state_get_type") Modified: pyxfce/branches/4.6/netk/window_action_menu.defs === --- pyxfce/branches/4.6/netk/window_action_menu.defs2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/netk/window_action_menu.defs2009-07-02 21:36:30 UTC (rev 30160) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-window-action-menu.h +;; From netk-window-action-menu.h (define-function create_window_action_menu (c-name "netk_create_window_action_menu") Modified: pyxfce/branches/4.6/netk/workspace.defs === --- pyxfce/branches/4.6/netk/workspace.defs 2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/netk/workspace.defs 2009-07-02 21:36:30 UTC (rev 30160) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-workspace.h +;; From netk-workspace.h (define-function workspace_get_type (c-name "netk_workspace_get_type") Modified: pyxfce/branches/4.6/panel/enums.defs === --- pyxfce/branches/4.6/panel/enums.defs2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/panel/enums.defs2009-07-02 21:36:30 UTC (rev 30160) @@ -26,6 +26,6 @@ ) -;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-enums.h +;; From xfce-panel-enums.h Modified: pyxfce/branches/4.6/util/fileutils.defs === --- pyxfce/branches/4.6/util/fileutils.defs 2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/util/fileutils.defs 2009-07-02 21:36:30 UTC (rev 30160) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-fileutils.h +;; From xfce-fileutils.h (define-function mkdirhier (c-name "xfce_mkdirhier") Modified: pyxfce/branches/4.6/util/i18n.defs === --- pyxfce/branches/4.6/util/i18n.defs 2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/util/i18n.defs 2009-07-02 21:36:30 UTC (rev 30160) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-i18n.h +;; From xfce-i18n.h (define-function textdomain (c-name "xfce_textdomain") Modified: pyxfce/branches/4.6/util/resource.defs === --- pyxfce/branches/4.6/util/resource.defs 2009-07-02 21:34:58 UTC (rev 30159) +++ pyxfce/branches/4.6/util/resource.defs 2009-07-02 21:36:30 UTC (rev 30160) @@ -16,7 +16,7 @@ ) -;; From /usr/local/include/xfce4/libxfce4util/xfce-resource.h +;; From xfce-resource.h (define-function resource_dirs (c-name "xfce_resource_dirs") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30159 - in pyxfce/branches/4.6: gui netk util
Author: dannym Date: 2009-07-02 21:34:58 + (Thu, 02 Jul 2009) New Revision: 30159 Modified: pyxfce/branches/4.6/gui/menubutton.defs pyxfce/branches/4.6/netk/util.defs pyxfce/branches/4.6/netk/window_menu.defs pyxfce/branches/4.6/util/desktopentry.defs pyxfce/branches/4.6/util/kiosk.defs pyxfce/branches/4.6/util/utf8.defs Log: commit trivial (comment only) changes Modified: pyxfce/branches/4.6/gui/menubutton.defs === --- pyxfce/branches/4.6/gui/menubutton.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/gui/menubutton.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_menubutton.h +;; From xfce_menubutton.h (define-function menubutton_get_type (c-name "xfce_menubutton_get_type") Modified: pyxfce/branches/4.6/netk/util.defs === --- pyxfce/branches/4.6/netk/util.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/netk/util.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-util.h +;; From netk-util.h (define-function gtk_window_set_type (c-name "netk_gtk_window_set_type") Modified: pyxfce/branches/4.6/netk/window_menu.defs === --- pyxfce/branches/4.6/netk/window_menu.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/netk/window_menu.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-window-menu.h +;; From netk-window-menu.h (define-function create_window_menu (c-name "netk_create_window_menu") Modified: pyxfce/branches/4.6/util/desktopentry.defs === --- pyxfce/branches/4.6/util/desktopentry.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/util/desktopentry.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-desktopentry.h +;; From xfce-desktopentry.h (define-function desktop_entry_get_type (c-name "xfce_desktop_entry_get_type") Modified: pyxfce/branches/4.6/util/kiosk.defs === --- pyxfce/branches/4.6/util/kiosk.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/util/kiosk.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-kiosk.h +;; From xfce-kiosk.h (define-function kiosk_new (c-name "xfce_kiosk_new") Modified: pyxfce/branches/4.6/util/utf8.defs === --- pyxfce/branches/4.6/util/utf8.defs 2009-07-02 21:33:29 UTC (rev 30158) +++ pyxfce/branches/4.6/util/utf8.defs 2009-07-02 21:34:58 UTC (rev 30159) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-utf8.h +;; From xfce-utf8.h (define-function utf8_remove_controls (c-name "xfce_utf8_remove_controls") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30158 - pyxfce/branches/4.6
Author: dannym Date: 2009-07-02 21:33:29 + (Thu, 02 Jul 2009) New Revision: 30158 Removed: pyxfce/branches/4.6/mcs/ Modified: pyxfce/branches/4.6/Makefile.am pyxfce/branches/4.6/configure.ac Log: pyxfce 4.6: get rid of mcs. Modified: pyxfce/branches/4.6/Makefile.am === --- pyxfce/branches/4.6/Makefile.am 2009-07-02 21:28:55 UTC (rev 30157) +++ pyxfce/branches/4.6/Makefile.am 2009-07-02 21:33:29 UTC (rev 30158) @@ -13,8 +13,8 @@ SUBDIR_MIGHTY_MOUSE = panel endif -SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) -DIST_SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE) +SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE) +DIST_SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE) PLATFORM_VERSION = 4.2 PLATFORM_WIN32 = Modified: pyxfce/branches/4.6/configure.ac === --- pyxfce/branches/4.6/configure.ac2009-07-02 21:28:55 UTC (rev 30157) +++ pyxfce/branches/4.6/configure.ac2009-07-02 21:33:29 UTC (rev 30158) @@ -57,8 +57,6 @@ dnl PANEL_EXTERNALPLUGINDIR dnl PANEL_DESKTOPDATADIR -BM_DEPEND([XFCE4_MCS_CLIENT], [libxfce4mcs-client-1.0], [4.1.0]) -BM_DEPEND([XFCE4_MCS_MANAGER], [libxfce4mcs-manager-1.0], [4.1.0]) BM_DEPEND([GTK], [gtk+-2.0], [2.4]) BM_DEPEND([PYGTK], [pygtk-2.0], [2.6.0]) @@ -86,7 +84,6 @@ Makefile pyxfce-1.0.pc gui/Makefile - mcs/Makefile netk/Makefile panel/Makefile util/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30157 - pyxfce/branches
Author: dannym Date: 2009-07-02 21:28:55 + (Thu, 02 Jul 2009) New Revision: 30157 Added: pyxfce/branches/4.6/ Log: pyxfce: new 4.6 branch ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30156 - pyxfce/branches
Author: dannym Date: 2009-07-02 21:28:27 + (Thu, 02 Jul 2009) New Revision: 30156 Removed: pyxfce/branches/4.6/ Log: re-create branch for 4.6 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30155 - pyxfce/branches
Author: dannym Date: 2009-07-02 21:27:06 + (Thu, 02 Jul 2009) New Revision: 30155 Added: pyxfce/branches/4.6/ Log: branch for 4.6 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30154 - pyxfce/branches/4.4/examples/panel/testplugin1
Author: dannym
Date: 2009-07-02 21:26:19 + (Thu, 02 Jul 2009)
New Revision: 30154
Modified:
pyxfce/branches/4.4/examples/panel/testplugin1/testplugin.py
Log:
add relieflessness to make the panel example look like a normal panel plugin.
Modified: pyxfce/branches/4.4/examples/panel/testplugin1/testplugin.py
===
--- pyxfce/branches/4.4/examples/panel/testplugin1/testplugin.py
2009-07-02 21:25:49 UTC (rev 30153)
+++ pyxfce/branches/4.4/examples/panel/testplugin1/testplugin.py
2009-07-02 21:26:19 UTC (rev 30154)
@@ -11,6 +11,7 @@
xfce4.panel.Plugin.__init__(self)
button1 = gtk.Button("test")
+ button1.set_relief(gtk.RELIEF_NONE)
button1.show()
self.add(button1)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r30153 - pyxfce/trunk/examples/panel/testplugin1
Author: dannym
Date: 2009-07-02 21:25:49 + (Thu, 02 Jul 2009)
New Revision: 30153
Modified:
pyxfce/trunk/examples/panel/testplugin1/testplugin.py
Log:
add relieflessness to make the panel example look like a normal panel plugin.
Modified: pyxfce/trunk/examples/panel/testplugin1/testplugin.py
===
--- pyxfce/trunk/examples/panel/testplugin1/testplugin.py 2009-07-02
21:14:16 UTC (rev 30152)
+++ pyxfce/trunk/examples/panel/testplugin1/testplugin.py 2009-07-02
21:25:49 UTC (rev 30153)
@@ -11,6 +11,7 @@
xfce4.panel.Plugin.__init__(self)
button1 = gtk.Button("test")
+ button1.set_relief(gtk.RELIEF_NONE)
button1.show()
self.add(button1)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29183 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym
Date: 2009-01-11 22:24:56 + (Sun, 11 Jan 2009)
New Revision: 29183
Modified:
xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-prefbox.gob
xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h
xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c
Log:
fix bug# 3600: Wannabe Master dosn't work properly for multiple instances, bug#
4541: 10 wakeups (speedstep) per seconds.
Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-prefbox.gob
===
--- xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-prefbox.gob
2009-01-11 21:44:30 UTC (rev 29182)
+++ xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-prefbox.gob
2009-01-11 22:24:56 UTC (rev 29183)
@@ -163,6 +163,18 @@
}
+ protected gboolean focus_out_event_cb(self, GdkEventFocus* event,
GtkWidget* widget)
+ {
+ /* handle the device change immediately so the Wannabe Master
option box will have the new device's entries for sure. */
+ if (self->_priv->device_entry_delayer) { /* something was
changed. */
+ delayer_free(self->_priv->device_entry_delayer);
+ self->_priv->device_entry_delayer = 0;
+ emit self_device_changed (self);
+ }
+
+ return FALSE;
+ }
+
init(self)
{
GtkWidget *dentry;
@@ -170,9 +182,12 @@
gtk_box_set_spacing (GTK_BOX (self), 5);
self->device_cb = GTK_COMBO (gtk_combo_new ());
+
+ g_signal_connect_data
(G_OBJECT(GTK_COMBO(self->device_cb)->entry), "focus-out-event",
G_CALLBACK(self_focus_out_event_cb), self, NULL, G_CONNECT_SWAPPED |
G_CONNECT_AFTER);
+ /* = g_signal_connect_after_swapped
(G_OBJECT(GTK_COMBO(self->device_cb)->entry), "focus-out-event",
G_CALLBACK(self_focus_out_event_cb), self); */
+
self->master_om = GTK_OPTION_MENU (gtk_option_menu_new ());
-
gtk_container_set_border_width (GTK_CONTAINER (self), 5);
gtk_box_pack_start (GTK_BOX (self), twocol_label (_("Device:"),
GTK_WIDGET (self->device_cb)), FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (self), twocol_label (_("Wannabe
Master:"), GTK_WIDGET (self->master_om)), FALSE, FALSE, 0);
@@ -214,8 +229,8 @@
protected gboolean device_changed_delayed_cb (self)
{
- /*printf ("delayed\n");*/
emit self_device_changed (self);
+ self->_priv->device_entry_delayer = 0;
return FALSE;
}
@@ -273,15 +288,7 @@
gtk_entry_set_text (GTK_ENTRY (self->device_cb->entry), nvl
(device, ""));
- omi = self_find_master_by_name (self, master_control);
- gtk_option_menu_set_history (self->master_om, omi);
-
- if (master_control) {
- g_free (master_control);
- master_control = NULL;
- }
-
if (device) {
g_free (device);
device = NULL;
@@ -293,6 +300,16 @@
}
emit self_device_changed (self);
+
+ omi = self_find_master_by_name (self, master_control);
+
+ gtk_option_menu_set_history (self->master_om, omi);
+
+ if (master_control) {
+ g_free (master_control);
+ master_control = NULL;
+ }
+
}
public void save_preferences (self, XfceMixerPreferences *p)
Modified:
xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h
===
--- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h
2009-01-11 21:44:30 UTC (rev 29182)
+++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h
2009-01-11 22:24:56 UTC (rev 29183)
@@ -34,6 +34,7 @@
void xfce_mixer_prefbox_fill_master_list (XfceMixerPrefbox * self);
gchar *xfce_mixer_prefbox_find_name_by_master_i
(XfceMixerPrefbox * self, gint master_i);
gint xfce_mixer_prefbox_find_master_by_name (XfceMixerPrefbox * self, gchar
const * name);
+gboolean xfce_mixer_prefbox_focus_out_event_cb (XfceMixerPrefbox *
self, GdkEventFocus * event, GtkWidget * widget);
void xfce_mixer_prefbox_add_command_box (XfceMixerPrefbox * self);
gboolean xfce_mixer_prefbox_device_changed_delayed_cb
(XfceMixerPrefbox * self);
void xfce_mixer_prefbox_device_changed_cb(XfceMixerPrefbox * self,
GtkEditable * e);
Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c
===
--- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c
2009-01-11 21:44:30 UTC (rev 29182)
+++
[Xfce4-commits] r29182 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym
Date: 2009-01-11 21:44:30 + (Sun, 11 Jan 2009)
New Revision: 29182
Modified:
xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob
xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c
Log:
fix source indentation.
Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob
===
--- xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob
2009-01-11 21:11:34 UTC (rev 29181)
+++ xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob
2009-01-11 21:44:30 UTC (rev 29182)
@@ -119,7 +119,7 @@
}
/* returns the volume in range 0..100, given a coordinate in the
widget. */
-protected int figure_out_volume(self, GtkWidget *widget, int y) {
+ protected int figure_out_volume(self, GtkWidget *widget, int y) {
int sy; /* size in pixels. */
sy = widget->allocation.height; /* size */
@@ -139,7 +139,7 @@
y = 100;
}
return y;
-}
+ }
protected gboolean motion_cb (self, GdkEventMotion *m, GtkWidget
*widget)
{
@@ -172,8 +172,8 @@
}
override (Xfce:Mixer:Control) void
-vcname_changed (Xfce:Mixer:Control *pself (check null type))
-{
+ vcname_changed (Xfce:Mixer:Control *pself (check null type))
+ {
Self *self;
char *sanename;
PARENT_HANDLER (pself);
Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c
===
--- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c
2009-01-11 21:11:34 UTC (rev 29181)
+++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c
2009-01-11 21:44:30 UTC (rev 29182)
@@ -328,7 +328,7 @@
y = 100;
}
return y;
-}}
+ }}
#line 333 "xfce-mixer-slider-tiny.c"
#undef __GOB_FUNCTION__
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29181 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym
Date: 2009-01-11 21:11:34 + (Sun, 11 Jan 2009)
New Revision: 29181
Modified:
xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob
xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny-private.h
xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.c
xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny.h
Log:
fix bug# 3410: drag slider.
Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob
===
--- xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob
2009-01-11 20:52:13 UTC (rev 29180)
+++ xfce4-mixer/branches/xfce_4_4/panel-plugin/mixer-slider-tiny.gob
2009-01-11 21:11:34 UTC (rev 29181)
@@ -15,6 +15,7 @@
protected GtkProgressBar *progress = NULL;
/*protected GtkBox *hbox = NULL;*/
public GtkEventBox *eb = NULL;
+ protected gboolean pressed = FALSE;
protected void set_vval (self, gint vval)
{
@@ -63,6 +64,7 @@
g_signal_connect_swapped (self->eb, "scroll-event",
G_CALLBACK(self_scroll_cb), self);
g_signal_connect_swapped (self->eb, "button-press-event",
G_CALLBACK(self_button_cb), self);
g_signal_connect_swapped (self->eb, "button-release-event",
G_CALLBACK(self_button_cb), self);
+ g_signal_connect_swapped (self->eb, "motion-notify-event",
G_CALLBACK(self_motion_cb), self);
}
public gboolean scroll_cb (self, GdkEventScroll *event, GtkWidget *w)
@@ -88,37 +90,68 @@
protected gboolean button_cb (self, GdkEventButton *b, GtkWidget
*widget)
{
- int y; /* pos */
- int sy; /* size */
+ inty;
- y = (int)b->y;
+ y = (int) b->y; /* pos */
if (b->button == 3 || b->button == 2) {
if (b->type == GDK_BUTTON_PRESS) {
+ /* mute */
y = 0;
} else {
return TRUE;
}
} else if (b->button == 1) {
- sy = widget->allocation.height;
- if (sy != 0) {
- /* this is a hack 'cause I dont know how to get
the height
-* of the border of the progressbar yet ;)
-*/
- y = (sy + 2 - y) * 100 / sy;
- if (y <= 0) y = 0;
- } else y = 0;
+ if (b->type == GDK_BUTTON_PRESS) {
+ y = self_figure_out_volume(self, widget, y);
+ self->pressed = TRUE;
+ } else if (b->type == GDK_BUTTON_RELEASE){
+ y = self_figure_out_volume(self, widget, y);
+ self->pressed = FALSE;
+ } else {
+ return TRUE;
+ }
} else {
return FALSE;
}
-
- if (y < 0) { y = 0; }
- if (y > 100) { y = 100; }
self_set_vval (self, y);
return TRUE;
}
+ /* returns the volume in range 0..100, given a coordinate in the
widget. */
+protected int figure_out_volume(self, GtkWidget *widget, int y) {
+ int sy; /* size in pixels. */
+ sy = widget->allocation.height; /* size */
+ if (sy > 4) {
+ sy -= 4;
+ /* this is a hack 'cause I dont know how to get the
height of the border of the progressbar yet ;) */
+ y = (sy + 2 - y) * 100 / sy;
+ if (y <= 0)
+ y = 0;
+ } else {
+ y = 0;
+ }
+
+ if (y < 0) {
+ y = 0;
+ } else if (y > 100) {
+ y = 100;
+ }
+ return y;
+}
+
+ protected gboolean motion_cb (self, GdkEventMotion *m, GtkWidget
*widget)
+ {
+ if (self->pressed) {
+ int y = (int) m->y; /* pos */
+ y = self_figure_out_volume(self, widget, y);
+ self_set_vval (self, y);
+ return TRUE;
+ }
+ return FALSE;
+ }
+
public XfceMixerControl *new(void)
{
return XFCE_MIXER_CONTROL(GET_NEW);
Modified:
xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny-private.h
===
--- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-slider-tiny-p
[Xfce4-commits] r29180 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 20:52:13 + (Sun, 11 Jan 2009) New Revision: 29180 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.c xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.c Log: update comments. Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.c 2009-01-11 20:51:23 UTC (rev 29179) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.c 2009-01-11 20:52:13 UTC (rev 29180) @@ -1,10 +1,10 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ /* End world hunger, donate to the World Food Programme, http://www.wfp.org */ #define GOB_VERSION_MAJOR 2 #define GOB_VERSION_MINOR 0 -#define GOB_VERSION_PATCHLEVEL 14 +#define GOB_VERSION_PATCHLEVEL 15 #define selfp (self->_priv) Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.h 2009-01-11 20:51:23 UTC (rev 29179) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-control.h 2009-01-11 20:52:13 UTC (rev 29180) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #include #include Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c 2009-01-11 20:51:23 UTC (rev 29179) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.c 2009-01-11 20:52:13 UTC (rev 29180) @@ -1,10 +1,10 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ /* End world hunger, donate to the World Food Programme, http://www.wfp.org */ #define GOB_VERSION_MAJOR 2 #define GOB_VERSION_MINOR 0 -#define GOB_VERSION_PATCHLEVEL 14 +#define GOB_VERSION_PATCHLEVEL 15 #define selfp (self->_priv) Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.c 2009-01-11 20:51:23 UTC (rev 29179) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.c 2009-01-11 20:52:13 UTC (rev 29180) @@ -1,10 +1,10 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ /* End world hunger, donate to the World Food Programme, http://www.wfp.org */ #define GOB_VERSION_MAJOR 2 #define GOB_VERSION_MINOR 0 -#define GOB_VERSION_PATCHLEVEL 14 +#define GOB_VERSION_PATCHLEVEL 15 #define selfp (self->_priv) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29179 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 20:51:23 + (Sun, 11 Jan 2009) New Revision: 29179 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences-private.h xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.h Log: update comments. Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h 2009-01-11 20:40:09 UTC (rev 29178) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox-private.h 2009-01-11 20:51:23 UTC (rev 29179) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #ifndef __XFCE_MIXER_PREFBOX_PRIVATE_H__ #define __XFCE_MIXER_PREFBOX_PRIVATE_H__ Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.h 2009-01-11 20:40:09 UTC (rev 29178) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-prefbox.h 2009-01-11 20:51:23 UTC (rev 29179) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #include #include Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences-private.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences-private.h 2009-01-11 20:40:09 UTC (rev 29178) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences-private.h 2009-01-11 20:51:23 UTC (rev 29179) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #ifndef __XFCE_MIXER_PREFERENCES_PRIVATE_H__ #define __XFCE_MIXER_PREFERENCES_PRIVATE_H__ Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.h === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.h 2009-01-11 20:40:09 UTC (rev 29178) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/xfce-mixer-preferences.h 2009-01-11 20:51:23 UTC (rev 29179) @@ -1,4 +1,4 @@ -/* Generated by GOB (v2.0.14) (do not edit directly) */ +/* Generated by GOB (v2.0.15) (do not edit directly) */ #include #include ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29178 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym
Date: 2009-01-11 20:40:09 + (Sun, 11 Jan 2009)
New Revision: 29178
Modified:
xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c
Log:
update callback so that it will notice when the driver is being removed.
Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c
===
--- xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 19:56:33 UTC
(rev 29177)
+++ xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 20:40:09 UTC
(rev 29178)
@@ -284,11 +284,16 @@
}
-static void callback_vc_cb(char const *which, void *privdata)
+static void callback_vc_cb(char const *which, volchanger_callback_event_t
kind, void *privdata)
{
t_mixer *mixer;
mixer = (t_mixer *) privdata;
+ if (kind == VE_REMOVED) {
+ vc_close_device ();
+ return;
+ }
+
xfce_mixer_control_vc_feed_value (mixer->slider);
mixer_update_tips (mixer);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29175 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym Date: 2009-01-11 19:49:01 + (Sun, 11 Jan 2009) New Revision: 29175 Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c Log: remove callback before closing device, just in case. Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c === --- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 19:46:39 UTC (rev 29174) +++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 19:49:01 UTC (rev 29175) @@ -547,6 +547,9 @@ return; } + snd_mixer_set_callback_private (handle, NULL); + snd_mixer_set_callback (handle, NULL); + snd_mixer_close (handle); /* FIXME does this close all related stuff? */ handle = NULL; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29174 - xfce4-mixer/branches/xfce_4_4/settings
Author: dannym
Date: 2009-01-11 19:46:39 + (Sun, 11 Jan 2009)
New Revision: 29174
Modified:
xfce4-mixer/branches/xfce_4_4/settings/mixer-settingsbox.gob
xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox-private.h
xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.c
xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.h
Log:
add a 'device removed' callback to the settings dialog (disconnects from the
sound device). Note that it only reconnects when you enter the dialog again.
Modified: xfce4-mixer/branches/xfce_4_4/settings/mixer-settingsbox.gob
===
--- xfce4-mixer/branches/xfce_4_4/settings/mixer-settingsbox.gob
2009-01-11 19:37:33 UTC (rev 29173)
+++ xfce4-mixer/branches/xfce_4_4/settings/mixer-settingsbox.gob
2009-01-11 19:46:39 UTC (rev 29174)
@@ -42,6 +42,14 @@
return s;
}
+static void volume_event_cb(char const *control, volchanger_callback_event_t
kind, void *p_settings_box)
+{
+ if (kind == VE_REMOVED) {
+ g_warning ("sound device was removed.");
+ vc_close_device ();
+ }
+}
+
%}
class Xfce:Mixer:Settingsbox from Gtk:VBox {
@@ -219,7 +227,9 @@
gtk_label_set_text (self->dev_label, s);
TRACE ("set vc device");
+ vc_set_volume_callback (NULL, NULL);
vc_set_device (s);
+ vc_set_volume_callback (volume_event_cb, self);
TRACE ("free sel_device");
if (self->sel_device) {
g_free (self->sel_device);
Modified:
xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox-private.h
===
--- xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox-private.h
2009-01-11 19:37:33 UTC (rev 29173)
+++ xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox-private.h
2009-01-11 19:46:39 UTC (rev 29174)
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.14) (do not edit directly) */
+/* Generated by GOB (v2.0.15) (do not edit directly) */
#ifndef __XFCE_MIXER_SETTINGSBOX_PRIVATE_H__
#define __XFCE_MIXER_SETTINGSBOX_PRIVATE_H__
Modified: xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.c
===
--- xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.c
2009-01-11 19:37:33 UTC (rev 29173)
+++ xfce4-mixer/branches/xfce_4_4/settings/xfce-mixer-settingsbox.c
2009-01-11 19:46:39 UTC (rev 29174)
@@ -1,16 +1,13 @@
-/* Generated by GOB (v2.0.14) (do not edit directly) */
+/* Generated by GOB (v2.0.15) (do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
#define GOB_VERSION_MAJOR 2
#define GOB_VERSION_MINOR 0
-#define GOB_VERSION_PATCHLEVEL 14
+#define GOB_VERSION_PATCHLEVEL 15
#define selfp (self->_priv)
-#ifdef HAVE_CONFIG_H
-#include
-#endif
#include /* memset() */
#include "xfce-mixer-settingsbox.h"
@@ -37,7 +34,7 @@
#include
#include
-#line 41 "xfce-mixer-settingsbox.c"
+#line 38 "xfce-mixer-settingsbox.c"
#line 12 "mixer-settingsbox.gob"
@@ -73,8 +70,16 @@
return s;
}
+static void volume_event_cb(char const *control, volchanger_callback_event_t
kind, void *p_settings_box)
+{
+ if (kind == VE_REMOVED) {
+ g_warning ("sound device was removed.");
+ vc_close_device ();
+ }
+}
-#line 78 "xfce-mixer-settingsbox.c"
+
+#line 83 "xfce-mixer-settingsbox.c"
/* self casting macros */
#define SELF(x) XFCE_MIXER_SETTINGSBOX(x)
#define SELF_CONST(x) XFCE_MIXER_SETTINGSBOX_CONST(x)
@@ -161,26 +166,26 @@
#define device_lst (self->device_lst)
#define VAR device_lst
{
-#line 59 "mixer-settingsbox.gob"
+#line 67 "mixer-settingsbox.gob"
stringlist_free(VAR);
VAR = NULL;
}
-#line 170 "xfce-mixer-settingsbox.c"
+#line 175 "xfce-mixer-settingsbox.c"
memset(&device_lst, 0, sizeof(device_lst));
#undef VAR
#undef device_lst
#define sel_device (self->sel_device)
#define VAR sel_device
{
-#line 64 "mixer-settingsbox.gob"
+#line 72 "mixer-settingsbox.gob"
if (VAR) {
g_free (VAR);
VAR = NULL;
}
}
-#line 184 "xfce-mixer-settingsbox.c"
+#line 189 "xfce-mixer-settingsbox.c"
memset(&sel_device, 0, sizeof(sel_device));
#undef VAR
#undef sel_device
@@ -198,50 +203,50 @@
g_object_class->finalize = ___finalize;
}
#undef __GOB_FUNCTION__
-#line 114 "mixer-settingsbox.gob"
+#line 122 "mixer-settingsbox.gob"
static void
xfce_mixer_settingsbox_init (XfceMixerSettingsbox * self G_GNUC_UNUSED)
-#line 205 "xfce-mix
[Xfce4-commits] r29173 - xfce4-mixer/branches/xfce_4_4/include
Author: dannym Date: 2009-01-11 19:37:33 + (Sun, 11 Jan 2009) New Revision: 29173 Modified: xfce4-mixer/branches/xfce_4_4/include/vcs.h Log: fix recurring 'handle_events'. Modified: xfce4-mixer/branches/xfce_4_4/include/vcs.h === --- xfce4-mixer/branches/xfce_4_4/include/vcs.h 2009-01-11 19:36:07 UTC (rev 29172) +++ xfce4-mixer/branches/xfce_4_4/include/vcs.h 2009-01-11 19:37:33 UTC (rev 29173) @@ -4,6 +4,11 @@ /* call this at the beginning of your program. */ int register_vcs (); +/* Optionally register a event callback (per device) with + vc_set_volume_callback(callback, user_data); + call vc_handle_events() periodically. + */ + #include "vc.h" #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29172 - xfce4-mixer/branches/xfce_4_4/src
Author: dannym
Date: 2009-01-11 19:36:07 + (Sun, 11 Jan 2009)
New Revision: 29172
Modified:
xfce4-mixer/branches/xfce_4_4/src/main.c
Log:
fix recurring 'handle_events'.
Modified: xfce4-mixer/branches/xfce_4_4/src/main.c
===
--- xfce4-mixer/branches/xfce_4_4/src/main.c2009-01-11 19:34:53 UTC (rev
29171)
+++ xfce4-mixer/branches/xfce_4_4/src/main.c2009-01-11 19:36:07 UTC (rev
29172)
@@ -38,7 +38,7 @@
timer_vc_cb (gpointer data)
{
vc_handle_events ();
- vol_changed_cb (NULL, NULL);
+ vol_changed_cb (NULL, VE_VALUE_CHANGED, NULL);
return TRUE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29171 - xfce4-mixer/branches/xfce_4_4
Author: dannym Date: 2009-01-11 19:34:53 + (Sun, 11 Jan 2009) New Revision: 29171 Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog Log: update ChangeLog. Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog === --- xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 19:33:42 UTC (rev 29170) +++ xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 19:34:53 UTC (rev 29171) @@ -1,3 +1,7 @@ +2009-01-11 20:38 dannym + + * libxfce4mixer: notification when the sound driver is being unloaded. + 2009-01-11 18:00 dannym * support IRIX64. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29170 - in xfce4-mixer/branches/xfce_4_4: include lib src
Author: dannym
Date: 2009-01-11 19:33:42 + (Sun, 11 Jan 2009)
New Revision: 29170
Modified:
xfce4-mixer/branches/xfce_4_4/include/vc.h
xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
xfce4-mixer/branches/xfce_4_4/src/main.c
Log:
try to add support for detecting the unloading of an ALSA module (bug# 3374
etc).
Modified: xfce4-mixer/branches/xfce_4_4/include/vc.h
===
--- xfce4-mixer/branches/xfce_4_4/include/vc.h 2009-01-11 17:59:09 UTC (rev
29169)
+++ xfce4-mixer/branches/xfce_4_4/include/vc.h 2009-01-11 19:33:42 UTC (rev
29170)
@@ -31,8 +31,13 @@
/* this is the volume changer stuff */
-typedef void (*volchanger_callback_t)(char const *which, void *privdata);
+typedef enum {
+ VE_VALUE_CHANGED,
+ VE_REMOVED,
+} volchanger_callback_event_t;
+typedef void (*volchanger_callback_t)(char const *which,
volchanger_callback_event_t kind, void *privdata);
+
typedef enum {
CT_SLIDER = 0,
CT_ONOFF = 1,
@@ -56,6 +61,10 @@
void (*vc_set_switch)(char const *which, gboolean b);
char const *(*vc_get_device)(void);
void (*vc_handle_events)(void);
+ void (*__dummy_1)(void);
+ void (*__dummy_2)(void);
+ void (*__dummy_3)(void);
+ void (*__dummy_4)(void);
} volchanger_t;
typedef struct {
@@ -66,11 +75,15 @@
/* only for type == CT_SELECT: */
GList *choices; /* list item = volchoice_t */
+ void* __dummy_1;
+ void* __dummy_2;
} volcontrol_t;
typedef struct {
- gchar* name;
- gchar* displayname;
+ gchar* name;
+ gchar* displayname;
+ void* __dummy_1;
+ int__dummy_2;
} volchoice_t; /* choices entry for select */
void register_vc(volchanger_t *vc);
@@ -122,7 +135,11 @@
vc_get_switch: vc_get_switch, \
vc_set_switch: vc_set_switch, \
vc_get_device: vc_get_device, \
-vc_handle_events: vc_handle_events \
+vc_handle_events: vc_handle_events, \
+__dummy_1: 0, \
+__dummy_2: 0, \
+__dummy_3: 0, \
+__dummy_4: 0 \
}; \
\
int register_##a(void) \
Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 17:59:09 UTC (rev
29169)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 19:33:42 UTC (rev
29170)
@@ -499,15 +499,27 @@
static int alsa_cb(snd_mixer_t *ctl, unsigned int mask, snd_mixer_elem_t *elem)
{
const char *which;
+ volchanger_callback_event_t event;
+
g_warning ("alsa_cb\n");
+
+
if (elem && snd_mixer_elem_get_type (elem) == SND_MIXER_ELEM_SIMPLE) {
which = snd_mixer_selem_get_name (elem);
} else {
which = NULL;
}
-
+
+ if (mask == SND_CTL_EVENT_MASK_REMOVE) {
+ event = VE_REMOVED;
+ } else if (mask & (SND_CTL_EVENT_MASK_VALUE | SND_CTL_EVENT_MASK_INFO))
{
+ event = VE_VALUE_CHANGED;
+ } else {
+ return 0;
+ }
+
if (mycb)
- (*mycb) (which, mydata);
+ (*mycb) (which, event, mydata);
return 0;
}
@@ -526,6 +538,7 @@
snd_mixer_set_callback_private (handle, data);
snd_mixer_set_callback (handle, alsa_cb);
+ /* snd_mixer_elem_set_callback(elem, melem_event); */
}
static void vc_close_device()
Modified: xfce4-mixer/branches/xfce_4_4/src/main.c
===
--- xfce4-mixer/branches/xfce_4_4/src/main.c2009-01-11 17:59:09 UTC (rev
29169)
+++ xfce4-mixer/branches/xfce_4_4/src/main.c2009-01-11 19:33:42 UTC (rev
29170)
@@ -27,7 +27,7 @@
static guint src;
-static void vol_changed_cb (char const *vcname, void *privdata)
+static void vol_changed_cb (char const *vcname, volchanger_callback_event_t
kind, void *privdata)
{
if (mixer_window) {
xfce_mixer_window_refresh_value (XFCE_MIXER_WINDOW
(mixer_window), vcname);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29169 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym
Date: 2009-01-11 17:59:09 + (Sun, 11 Jan 2009)
New Revision: 29169
Modified:
xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c
Log:
fix bug# 3651 (block panel menu), thanks, Mike.
Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c
===
--- xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 17:15:12 UTC
(rev 29168)
+++ xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 17:59:09 UTC
(rev 29169)
@@ -127,6 +127,8 @@
{
t_mixer *mixer = (t_mixer *) user_data;
+xfce_panel_plugin_unblock_menu (mixer->temp_plugin);
+
xfce_mixer_prefbox_save_preferences (mixer->prefbox, mixer->prefs);
mixer_write_config(mixer->temp_plugin, mixer);
@@ -149,11 +151,13 @@
mixer = (t_mixer *) user_data;
+xfce_panel_plugin_block_menu (plugin);
+
/* TODO TRANSLATE TITLE OR SOMETHING */
dialog = GTK_DIALOG (
gtk_dialog_new_with_buttons (xfce_panel_plugin_get_name (plugin),
-
GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))),
+ NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29168 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym
Date: 2009-01-11 17:15:12 + (Sun, 11 Jan 2009)
New Revision: 29168
Modified:
xfce4-mixer/branches/xfce_4_4/lib/trans.c
Log:
fix bug# 3254: add SGI Mixer control names.
Modified: xfce4-mixer/branches/xfce_4_4/lib/trans.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/trans.c 2009-01-11 17:02:15 UTC (rev
29167)
+++ xfce4-mixer/branches/xfce_4_4/lib/trans.c 2009-01-11 17:15:12 UTC (rev
29168)
@@ -64,10 +64,13 @@
/*
* IRIX AL translatable names
*
- * The strings below come from SGI O2
+ * The strings below come from SGI
+ * O2
* (Iris Audio Processor: version A3 revision 0)
+ * Fuel
+ * (Iris Audio Processor: version MAD revision 1, number 1)
*
- * If you have an another processor (e.g. A2, RAD, MAD) and
+ * If you have an another processor (e.g. A2, RAD) and
* Device/Interface names, let me know.
*
*/
@@ -77,6 +80,9 @@
_("A3.AnalogIn"), /* Analog In*/
_("A3.AnalogOut"), /* Analog Out */
_("A3.AnalogOut2"), /* Analog Out 2 */
+ _("MAD1.AnalogIn"), /* Analog In*/
+ _("MAD1.AnalogOut"),/* Analog Out */
+ _("MAD1.AESOut"), /* AES Out */
/* Interface */
_("A3.CameraMic"), /* Camera Mic */
_("A3.Microphone"), /* Microphone */
@@ -85,7 +91,10 @@
_("A3.DAC2In"), /* DAC2 In */
_("A3.Speaker"),/* Speaker/Line Out */
_("A3.LineOut2"), /* Line Out 2 */
+ _("MAD1.Microphone"), /* Microphone */
+ _("MAD1.LineIn"), /* Line In */
+ _("MAD1.LineOut"), /* Line Out */
+ _("MAD1.AESOut"), /* AES Output */
};
/* vi: set ts=4 sw=4 cindent: */
-
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29167 - in xfce4-mixer/branches/xfce_4_4: include lib
Author: dannym Date: 2009-01-11 17:02:15 + (Sun, 11 Jan 2009) New Revision: 29167 Modified: xfce4-mixer/branches/xfce_4_4/include/vcs.h xfce4-mixer/branches/xfce_4_4/lib/Makefile.am Log: add 'vcs.h'. Modified: xfce4-mixer/branches/xfce_4_4/include/vcs.h === --- xfce4-mixer/branches/xfce_4_4/include/vcs.h 2009-01-11 16:59:20 UTC (rev 29166) +++ xfce4-mixer/branches/xfce_4_4/include/vcs.h 2009-01-11 17:02:15 UTC (rev 29167) @@ -1,6 +1,7 @@ #ifndef __MIXER_VCS_H #define __MIXER_VCS_H +/* call this at the beginning of your program. */ int register_vcs (); #include "vc.h" Modified: xfce4-mixer/branches/xfce_4_4/lib/Makefile.am === --- xfce4-mixer/branches/xfce_4_4/lib/Makefile.am 2009-01-11 16:59:20 UTC (rev 29166) +++ xfce4-mixer/branches/xfce_4_4/lib/Makefile.am 2009-01-11 17:02:15 UTC (rev 29167) @@ -26,5 +26,5 @@ xfce4_mixerincludedir = $(includedir)/xfce4/libxfce4mixer -xfce4_mixerinclude_HEADERS = ../include/vc.h +xfce4_mixerinclude_HEADERS = ../include/vc.h ../include/vcs.h ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29166 - in xfce4-mixer/branches/xfce_4_4: . include lib
Author: dannym
Date: 2009-01-11 16:59:20 + (Sun, 11 Jan 2009)
New Revision: 29166
Modified:
xfce4-mixer/branches/xfce_4_4/ChangeLog
xfce4-mixer/branches/xfce_4_4/include/vc.h
xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
Log:
fix 'vc_alsa' API usage.
Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog
===
--- xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 16:55:19 UTC (rev
29165)
+++ xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 16:59:20 UTC (rev
29166)
@@ -1,3 +1,11 @@
+2009-01-11 18:00 dannym
+
+ * support IRIX64.
+
+2009-01-11 17:30 dannym
+
+ * fix "libxfce4mixer" library.
+
2009-01-11 17:02 dannym
* apply patch to honor left/right balance.
Modified: xfce4-mixer/branches/xfce_4_4/include/vc.h
===
--- xfce4-mixer/branches/xfce_4_4/include/vc.h 2009-01-11 16:55:19 UTC (rev
29165)
+++ xfce4-mixer/branches/xfce_4_4/include/vc.h 2009-01-11 16:59:20 UTC (rev
29166)
@@ -82,6 +82,7 @@
volchanger_t **first_vc();
volchanger_t **next_vc(volchanger_t **);
+void vc_free_choices(GList* choices);
#ifndef VC_PLUGIN
/* these operate on the selected_vc: */
int vc_get_volume(char const *which);
@@ -96,7 +97,6 @@
GList *vc_get_control_list();
void vc_free_control_list(GList *g);
-void vc_free_choices(GList* choices);
volchoice_t* vc_choice_dup(const volchoice_t *choice);
void vc_set_volume_callback (volchanger_callback_t cb, void *data);
Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 16:55:19 UTC (rev
29165)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 16:59:20 UTC (rev
29166)
@@ -643,6 +643,7 @@
unsigned int jj;
GList *g;
volchoice_t* item;
+ char* s;
snd_mixer_elem_t *xelem = NULL;
if (handle == NULL) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29165 - xfce4-mixer/branches/xfce_4_4
Author: dannym Date: 2009-01-11 16:55:19 + (Sun, 11 Jan 2009) New Revision: 29165 Modified: xfce4-mixer/branches/xfce_4_4/configure.in.in Log: fix bug# 3253 (IRIX64 should not use OSS but SGI). Modified: xfce4-mixer/branches/xfce_4_4/configure.in.in === --- xfce4-mixer/branches/xfce_4_4/configure.in.in 2009-01-11 16:53:03 UTC (rev 29164) +++ xfce4-mixer/branches/xfce_4_4/configure.in.in 2009-01-11 16:55:19 UTC (rev 29165) @@ -33,7 +33,7 @@ if test x"$with_sound" != x"alsa" -a x"$with_sound" != x"oss" -a x"$with_sound" != x"sun" -a x"$with_sound" != x"sgi"; then if test x`uname -s` != x"SunOS"; then -if test x`uname -s` != x"IRIX"; then +if test x`uname -s` != x"IRIX" -a x`uname -s` != x"IRIX64"; then with_sound=oss else with_sound=sgi ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29164 - in xfce4-mixer/branches/xfce_4_4: . lib
Author: dannym
Date: 2009-01-11 16:53:03 + (Sun, 11 Jan 2009)
New Revision: 29164
Added:
xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in
Modified:
xfce4-mixer/branches/xfce_4_4/configure.in.in
xfce4-mixer/branches/xfce_4_4/lib/Makefile.am
xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c
Log:
fix 'libxfce4mixer' header usage.
Modified: xfce4-mixer/branches/xfce_4_4/configure.in.in
===
--- xfce4-mixer/branches/xfce_4_4/configure.in.in 2009-01-11 16:29:13 UTC
(rev 29163)
+++ xfce4-mixer/branches/xfce_4_4/configure.in.in 2009-01-11 16:53:03 UTC
(rev 29164)
@@ -120,6 +120,7 @@
xfce4-mixer.spec
include/Makefile
lib/Makefile
+lib/libxfce4mixer-1.0.pc
src/Makefile
panel-plugin/Makefile
settings/Makefile
Modified: xfce4-mixer/branches/xfce_4_4/lib/Makefile.am
===
--- xfce4-mixer/branches/xfce_4_4/lib/Makefile.am 2009-01-11 16:29:13 UTC
(rev 29163)
+++ xfce4-mixer/branches/xfce_4_4/lib/Makefile.am 2009-01-11 16:53:03 UTC
(rev 29164)
@@ -6,8 +6,13 @@
plugindir = $(libdir)/xfce4/modules
-plugin_LTLIBRARIES = libxfce4mixer.la
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libxfce4mixer-1.0.pc
+lib_LTLIBRARIES = libxfce4mixer.la
+
+#plugin_LTLIBRARIES = libxfce4mixer.la
+
libxfce4mixer_la_SOURCES = trans.c vc_alsa.c vc_alsa_fallback.c vc.c vc_oss.c
vcs.c vc_sun.c vc_sgi.c stringlist.inc
libxfce4mixer_la_LDFLAGS = -export-dynamic
@@ -18,3 +23,8 @@
test_vc_CFLAGS = @GTK_CFLAGS@ @XFCE4_UTIL_CFLAGS@
test_vc_LDFLAGS = @GTK_LIBS@ @XFCE4_UTIL_LIBS@ libxfce4mixer.la
noinst_PROGRAMS = test_vc
+
+xfce4_mixerincludedir = $(includedir)/xfce4/libxfce4mixer
+
+xfce4_mixerinclude_HEADERS = ../include/vc.h
+
Added: xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in
===
--- xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in
(rev 0)
+++ xfce4-mixer/branches/xfce_4_4/lib/libxfce4mixer-1.0.pc.in 2009-01-11
16:53:03 UTC (rev 29164)
@@ -0,0 +1,14 @@
+pref...@prefix@
+datad...@datadir@
+exec_pref...@exec_prefix@
+libd...@libdir@
+libexecd...@libexecdir@
+included...@includedir@
+localed...@localedir@
+
+Name: libxfce4mixer
+Description: Library for the Xfce Mixer
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lxfce4mixer
+Cflags: -I${includedir}/xfce4/
Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c 2009-01-11 16:29:13 UTC (rev
29163)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c 2009-01-11 16:53:03 UTC (rev
29164)
@@ -69,8 +69,6 @@
#include
-#include
-
#define VC_PLUGIN
#include "vc.h"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29162 - in xfce4-mixer/branches/xfce_4_4: . lib
Author: dannym
Date: 2009-01-11 16:02:32 + (Sun, 11 Jan 2009)
New Revision: 29162
Modified:
xfce4-mixer/branches/xfce_4_4/ChangeLog
xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
Log:
apply patch to honor left/right balance from Oliver (fixes bug# 2611).
Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog
===
--- xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 16:01:23 UTC (rev
29161)
+++ xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 16:02:32 UTC (rev
29162)
@@ -1,3 +1,11 @@
+2009-01-11 17:02 dannym
+
+ * apply patch to honor left/right balance.
+
+2009-01-11 17:00 dannym
+
+ * fix "lib/vc_alsa.c" memory leak.
+
2009-01-11 15:47 dannym
* add "src/xfce4-mixer.desktop.in".
Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 16:01:23 UTC (rev
29161)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 16:02:32 UTC (rev
29162)
@@ -232,6 +232,16 @@
return elem;
}
+static double calculate_balance_ratio(long left, long right)
+{
+ return (left != right) ? (left > right ? (double)left / right : 0
-(double)right / left) : 0;
+}
+
+static long calculate_volume_delta(long left, long right, long new)
+{
+ return new - ((left + right) >> 1);
+}
+
static int vc_get_volume(char const *which)
{
int playback_enable;
@@ -315,10 +325,11 @@
long playback_max;
long capture_min;
long capture_max;
- long playback_value;
+ long delta;
+ long playback_value, playback_value_left, playback_value_right;
long capture_value;
- double playback_value_double;
- double capture_value_double;
+ long playback_value_current_left, playback_value_current_right;
+ static double balance;
/*snd_mixer_selem_channel_id_t chn;*/
snd_mixer_elem_t *xelem;
@@ -335,34 +346,43 @@
snd_mixer_selem_get_playback_volume_range (xelem, &playback_min,
&playback_max);
snd_mixer_selem_get_capture_volume_range (xelem, &capture_min,
&capture_max);
+ snd_mixer_selem_get_playback_volume(xelem, SND_MIXER_SCHN_FRONT_LEFT,
&playback_value_current_left);
+ snd_mixer_selem_get_playback_volume(xelem, SND_MIXER_SCHN_FRONT_RIGHT,
&playback_value_current_right);
+ if (playback_value_current_left && playback_value_current_right) {
+ balance = calculate_balance_ratio(playback_value_current_left,
playback_value_current_right);
+ }
+
playback_min = 0;
capture_min = 0;
/*vol_p = (lval - pmin) * 100 / (pmax - pmin);*/
- playback_value_double = vol_p;
- capture_value_double = vol_p;
- if (vol_p != 0) {
- playback_value_double += 0.99;
- capture_value_double += 0.99;
- }
-
- playback_value = (long) playback_min + (playback_value_double) *
(playback_max - playback_min) / 100;
- capture_value = (long) capture_min + (capture_value_double) *
(capture_max - capture_min) / 100;
+ playback_value = (long)(((double)(vol_p *playback_max) /100) +0.5);
+ capture_value = (long)(((double)(vol_p *capture_max) /100) +0.5);
+ delta = calculate_volume_delta(playback_value_current_left,
playback_value_current_right, playback_value);
+
+ /* FIXME
+* This doesn't always work perfectly, due to rounding delta might
endup being +1 instead of 0.
+* Though not audiable, it might be visible on the slider.
+*/
+ playback_value_left = playback_value_current_left +delta;
+ playback_value_right = playback_value_current_right +delta;
+
+ /* TODO
+* Clipping top and bottom isn't respected yet.
+*/
+
/*
snd_mixer_selem_get_playback_switch(Ex_elem, SND_MIXER_SCHN_MONO,
&status);
*/
- /* use _all functions for sami's card ... */
- if (playback_value == 0) /* mute */
- snd_mixer_selem_set_playback_switch_all (xelem, 0);
- else /* unmute, just in case. */
- snd_mixer_selem_set_playback_switch_all (xelem, 1);
-
- snd_mixer_selem_set_playback_volume_all (xelem, playback_value);
+ snd_mixer_selem_set_playback_switch(xelem, SND_MIXER_SCHN_FRONT_LEFT,
playback_value_left);
+ snd_mixer_selem_set_playback_switch(xelem, SND_MIXER_SCHN_FRONT_RIGHT,
playback_value_right);
+
+ snd_mixer_selem_set_playback_volume(xelem, SND_MIXER_SCHN_FRONT_LEFT,
playback_value_left);
+ snd_mixer_selem_set_playback_volume(xelem, SND_MIXER_SCHN_FRONT_RIGHT,
playback_value_right);
snd_mixer_selem_set_capture_volume_all (xelem, capture_value);
-
#if 0
for (chn = 0; chn <= SND_MIXER_SCHN_LAST; chn++) {
if (!snd_mixer_selem_has_playback_channel(xelem, chn))
[Xfce4-commits] r29161 - xfce4-mixer/branches/xfce_4_4/po
Author: dannym Date: 2009-01-11 16:01:23 + (Sun, 11 Jan 2009) New Revision: 29161 Modified: xfce4-mixer/branches/xfce_4_4/po/am.po xfce4-mixer/branches/xfce_4_4/po/ar.po xfce4-mixer/branches/xfce_4_4/po/az.po xfce4-mixer/branches/xfce_4_4/po/be.po xfce4-mixer/branches/xfce_4_4/po/bg.po xfce4-mixer/branches/xfce_4_4/po/bn_IN.po xfce4-mixer/branches/xfce_4_4/po/ca.po xfce4-mixer/branches/xfce_4_4/po/cs.po xfce4-mixer/branches/xfce_4_4/po/de.po xfce4-mixer/branches/xfce_4_4/po/dz.po xfce4-mixer/branches/xfce_4_4/po/el.po xfce4-mixer/branches/xfce_4_4/po/en_GB.po xfce4-mixer/branches/xfce_4_4/po/es.po xfce4-mixer/branches/xfce_4_4/po/es_MX.po xfce4-mixer/branches/xfce_4_4/po/et.po xfce4-mixer/branches/xfce_4_4/po/eu.po xfce4-mixer/branches/xfce_4_4/po/fa.po xfce4-mixer/branches/xfce_4_4/po/fi.po xfce4-mixer/branches/xfce_4_4/po/fr.po xfce4-mixer/branches/xfce_4_4/po/gl.po xfce4-mixer/branches/xfce_4_4/po/gu.po xfce4-mixer/branches/xfce_4_4/po/he.po xfce4-mixer/branches/xfce_4_4/po/hi.po xfce4-mixer/branches/xfce_4_4/po/hu.po xfce4-mixer/branches/xfce_4_4/po/hy.po xfce4-mixer/branches/xfce_4_4/po/id.po xfce4-mixer/branches/xfce_4_4/po/it.po xfce4-mixer/branches/xfce_4_4/po/ja.po xfce4-mixer/branches/xfce_4_4/po/ka.po xfce4-mixer/branches/xfce_4_4/po/ko.po xfce4-mixer/branches/xfce_4_4/po/lt.po xfce4-mixer/branches/xfce_4_4/po/lv.po xfce4-mixer/branches/xfce_4_4/po/mk.po xfce4-mixer/branches/xfce_4_4/po/mr.po xfce4-mixer/branches/xfce_4_4/po/ms.po xfce4-mixer/branches/xfce_4_4/po/nb_NO.po xfce4-mixer/branches/xfce_4_4/po/nl.po xfce4-mixer/branches/xfce_4_4/po/pa.po xfce4-mixer/branches/xfce_4_4/po/pl.po xfce4-mixer/branches/xfce_4_4/po/pt_BR.po xfce4-mixer/branches/xfce_4_4/po/pt_PT.po xfce4-mixer/branches/xfce_4_4/po/ro.po xfce4-mixer/branches/xfce_4_4/po/ru.po xfce4-mixer/branches/xfce_4_4/po/si.po xfce4-mixer/branches/xfce_4_4/po/sk.po xfce4-mixer/branches/xfce_4_4/po/sq.po xfce4-mixer/branches/xfce_4_4/po/sv.po xfce4-mixer/branches/xfce_4_4/po/ta.po xfce4-mixer/branches/xfce_4_4/po/tr.po xfce4-mixer/branches/xfce_4_4/po/uk.po xfce4-mixer/branches/xfce_4_4/po/vi.po xfce4-mixer/branches/xfce_4_4/po/xfce4-mixer.pot xfce4-mixer/branches/xfce_4_4/po/zh_CN.po xfce4-mixer/branches/xfce_4_4/po/zh_TW.po Log: fix msgid for 'vc_alsa.c', update translations accordingly. Modified: xfce4-mixer/branches/xfce_4_4/po/am.po === --- xfce4-mixer/branches/xfce_4_4/po/am.po 2009-01-11 15:54:13 UTC (rev 29160) +++ xfce4-mixer/branches/xfce_4_4/po/am.po 2009-01-11 16:01:23 UTC (rev 29161) @@ -210,12 +210,12 @@ #: ../lib/vc_alsa.c:141 #, c-format -msgid "alsa: Mixer attach %s error: %s\n" +msgid "alsa: snd_mixer_attach(\"%s\"): error: %s\n" msgstr "" #: ../lib/vc_alsa.c:149 #, c-format -msgid "alsa: Mixer register error: %s\n" +msgid "alsa: snd_mixer_selem_register(...): error: %s\n" msgstr "" #: ../lib/vc_alsa.c:158 Modified: xfce4-mixer/branches/xfce_4_4/po/ar.po === --- xfce4-mixer/branches/xfce_4_4/po/ar.po 2009-01-11 15:54:13 UTC (rev 29160) +++ xfce4-mixer/branches/xfce_4_4/po/ar.po 2009-01-11 16:01:23 UTC (rev 29161) @@ -208,12 +208,12 @@ #: ../lib/vc_alsa.c:141 #, c-format -msgid "alsa: Mixer attach %s error: %s\n" +msgid "alsa: snd_mixer_attach(\"%s\"): error: %s\n" msgstr "" #: ../lib/vc_alsa.c:149 #, c-format -msgid "alsa: Mixer register error: %s\n" +msgid "alsa: snd_mixer_selem_register(...): error: %s\n" msgstr "" #: ../lib/vc_alsa.c:158 Modified: xfce4-mixer/branches/xfce_4_4/po/az.po === --- xfce4-mixer/branches/xfce_4_4/po/az.po 2009-01-11 15:54:13 UTC (rev 29160) +++ xfce4-mixer/branches/xfce_4_4/po/az.po 2009-01-11 16:01:23 UTC (rev 29161) @@ -209,12 +209,12 @@ #: ../lib/vc_alsa.c:141 #, c-format -msgid "alsa: Mixer attach %s error: %s\n" +msgid "alsa: snd_mixer_attach(\"%s\"): error: %s\n" msgstr "alsa: Mikser %s ilişdirmə xətası: %s\n" #: ../lib/vc_alsa.c:149 #, c-format -msgid "alsa: Mixer register error: %s\n" +msgid "alsa: snd_mixer_selem_register(...): error: %s\n" msgstr "alsa: Mikser qeydi xətası: %s\n" #: ../lib/vc_alsa.c:158 Modified: xfce4-mixer/branches/xfce_4_4/po/be.po === --- xfce4-mixer/branches/xfce_4_4/po/be.po 2009-01-11 15:54:13 UTC (rev 29160) +++ xfce4-mixer/branches/xfce_4_4/po/be.po 2009-01-11 16:01:23 UTC (rev 29161) @@ -211,12 +211,12 @@ #: ../lib/vc_alsa.c:141 #, c-format -msgid "alsa: Mixer attach %s error: %s\n" +msgid "alsa: snd_mixer_attach(\"%s\"): error: %s\n" msgstr "alsa: далучэньне мікшара %s памылка: %s\n" #: ../lib/vc_alsa.c:149 #, c-format -msgid "alsa: Mixer
[Xfce4-commits] r29160 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym
Date: 2009-01-11 15:54:13 + (Sun, 11 Jan 2009)
New Revision: 29160
Modified:
xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
Log:
fix bug# 3680.
Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 15:22:19 UTC (rev
29159)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2009-01-11 15:54:13 UTC (rev
29160)
@@ -135,14 +135,14 @@
}
if ((err = snd_mixer_attach(handle, card)) < 0) {
- error(_("alsa: Mixer attach %s error: %s\n"), card,
snd_strerror(err));
+ error(_("alsa: snd_mixer_attach(\"%s\"): error: %s\n"), card,
snd_strerror(err));
snd_mixer_close(handle); /* <-- alsa 0.9.3a fails assert(hctl)
if I do that... wird... */
handle = NULL;
return;
}
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) {
#ifdef DEBUG
- error(_("alsa: Mixer register error: %s\n"),
snd_strerror(err));
+ error(_("alsa: snd_mixer_selem_register(...): error: %s\n"),
snd_strerror(err));
#endif
snd_mixer_close(handle);
handle = NULL;
@@ -614,7 +614,7 @@
}
}
- stringlist_free (g);
+ vc_free_choices (g);
}
static gchar *vc_get_select(char const *which)
@@ -622,7 +622,8 @@
gint j;
unsigned int jj;
GList *g;
- gchar *s;
+ volchoice_t* item;
+
snd_mixer_elem_t *xelem = NULL;
if (handle == NULL) {
return NULL;
@@ -643,13 +644,15 @@
if (!g)
return NULL;
- s = (gchar *) g_list_nth_data (g, j);
+ item = (volchoice_t *) g_list_nth_data (g, j);
- if (!s)
+ if (!item) {
+ vc_free_choices (g);
return NULL;
+ }
- s = g_strdup (s);
- stringlist_free (g);
+ s = g_strdup (item->name);
+ vc_free_choices (g);
return s;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29159 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2009-01-11 15:22:19 + (Sun, 11 Jan 2009) New Revision: 29159 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c Log: fix bug# 2267 (border around slider)... Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 15:04:44 UTC (rev 29158) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/plugin.c 2009-01-11 15:22:19 UTC (rev 29159) @@ -438,6 +438,7 @@ t_mixer *mixer; GdkPixbuf *pb; GtkWidget *align; + GtkWidget *slider_box; mixer = g_new0 (t_mixer, 1); @@ -463,6 +464,10 @@ gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (mixer->ib), TRUE, TRUE, 0); + slider_box = gtk_hbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (slider_box), 2); + gtk_widget_show (slider_box); + mixer->slider = XFCE_MIXER_CONTROL (xfce_mixer_slider_tiny_new ()); g_signal_connect ( G_OBJECT (mixer->slider), "notify::value", @@ -470,7 +475,8 @@ ); gtk_widget_show (GTK_WIDGET (mixer->slider)); - gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (mixer->slider), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (slider_box), GTK_WIDGET (mixer->slider), FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (slider_box), FALSE, FALSE, 0); g_signal_connect_swapped ( G_OBJECT (mixer->ib), "scroll-event", ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29158 - in xfce4-mixer/branches/xfce_4_4: . src
Author: dannym Date: 2009-01-11 15:04:44 + (Sun, 11 Jan 2009) New Revision: 29158 Added: xfce4-mixer/branches/xfce_4_4/src/xfce4-mixer.desktop.in Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog xfce4-mixer/branches/xfce_4_4/src/Makefile.am Log: add '.desktop' file for mixer application (so that you can use it as standalone application) (fixes bug# 2889). Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog === --- xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 14:55:39 UTC (rev 29157) +++ xfce4-mixer/branches/xfce_4_4/ChangeLog 2009-01-11 15:04:44 UTC (rev 29158) @@ -1,3 +1,7 @@ +2009-01-11 15:47 dannym + + * add "src/xfce4-mixer.desktop.in". + 2008-10-22 21:37 lars * po/da.po: update-po Modified: xfce4-mixer/branches/xfce_4_4/src/Makefile.am === --- xfce4-mixer/branches/xfce_4_4/src/Makefile.am 2009-01-11 14:55:39 UTC (rev 29157) +++ xfce4-mixer/branches/xfce_4_4/src/Makefile.am 2009-01-11 15:04:44 UTC (rev 29158) @@ -67,6 +67,11 @@ #%.c %.h %-private.h: %.gob # @GOB2@ $< +appsdir = $(datadir)/applications +apps_in_files = xfce4-mixer.desktop.in +apps_DATA = $(apps_in_files:.desktop.in=.desktop) +...@intltool_desktop_rule@ + ACLOCAL_AMFLAGS = -I m4 xfce4_mixer_DEPENDENCIES = $(top_builddir)/lib/libxfce4mixer.la @@ -86,5 +91,7 @@ mixer-switch.gob\ mixer-view-tiny.gob \ mixer-view.gob \ - mixer-window.gob + mixer-window.gob \ + $(apps_in_files) +DISTCLEANFILES = $(apps_DATA) Added: xfce4-mixer/branches/xfce_4_4/src/xfce4-mixer.desktop.in === --- xfce4-mixer/branches/xfce_4_4/src/xfce4-mixer.desktop.in (rev 0) +++ xfce4-mixer/branches/xfce_4_4/src/xfce4-mixer.desktop.in2009-01-11 15:04:44 UTC (rev 29158) @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Name=Volume Control +Type=Application +Comment=Mixer GUI +Exec=xfce4-mixer +TryExec=xfce4-mixer +Icon=multimedia-volume-control +Categories=Application;AudioVideo; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29152 - pyxfce/trunk/panel
Author: dannym
Date: 2009-01-11 14:26:42 + (Sun, 11 Jan 2009)
New Revision: 29152
Modified:
pyxfce/trunk/panel/enums.c
pyxfce/trunk/panel/enums.override
pyxfce/trunk/panel/plugin_iface.c
pyxfce/trunk/panel/plugin_iface.override
pyxfce/trunk/panel/window.c
pyxfce/trunk/panel/window.override
Log:
use 'libxfce4-panel-enums.h', fixes bug#3054.
Modified: pyxfce/trunk/panel/enums.c
===
--- pyxfce/trunk/panel/enums.c 2009-01-11 13:44:31 UTC (rev 29151)
+++ pyxfce/trunk/panel/enums.c 2009-01-11 14:26:42 UTC (rev 29152)
@@ -8,7 +8,7 @@
#include "pygobject.h"
#include
#include
-#include
+#include
extern PyTypeObject PyGtkWidget_Type;
@@ -30,8 +30,8 @@
/* --- functions --- */
-PyMethodDef pyenums_functions[] = {
-{ NULL, NULL, 0 }
+const PyMethodDef pyenums_functions[] = {
+{ NULL, NULL, 0, NULL }
};
@@ -40,6 +40,9 @@
void
pyenums_add_constants(PyObject *module, const gchar *strip_prefix)
{
+#ifdef VERSION
+PyModule_AddStringConstant(module, "__version__", VERSION);
+#endif
pyg_enum_add(module, "ScreenPosition", strip_prefix,
XFCE_TYPE_SCREEN_POSITION);
if (PyErr_Occurred())
@@ -53,34 +56,30 @@
PyObject *module;
if ((module = PyImport_ImportModule("gobject")) != NULL) {
-PyObject *moddict = PyModule_GetDict(module);
-
-_PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict,
"GObject");
+_PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module,
"GObject");
if (_PyGObject_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name GObject from gobject");
-return;
+return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gobject");
-return;
+return ;
}
if ((module = PyImport_ImportModule("gtk")) != NULL) {
-PyObject *moddict = PyModule_GetDict(module);
-
-_PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict,
"Widget");
+_PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module,
"Widget");
if (_PyGtkWidget_Type == NULL) {
PyErr_SetString(PyExc_ImportError,
"cannot import name Widget from gtk");
-return;
+return ;
}
} else {
PyErr_SetString(PyExc_ImportError,
"could not import gtk");
-return;
+return ;
}
-#line 86 "enums.c"
+#line 85 "enums.c"
}
Modified: pyxfce/trunk/panel/enums.override
===
--- pyxfce/trunk/panel/enums.override 2009-01-11 13:44:31 UTC (rev 29151)
+++ pyxfce/trunk/panel/enums.override 2009-01-11 14:26:42 UTC (rev 29152)
@@ -6,7 +6,7 @@
#include "pygobject.h"
#include
#include
-#include
+#include
extern PyTypeObject PyGtkWidget_Type;
Modified: pyxfce/trunk/panel/plugin_iface.c
===
--- pyxfce/trunk/panel/plugin_iface.c 2009-01-11 13:44:31 UTC (rev 29151)
+++ pyxfce/trunk/panel/plugin_iface.c 2009-01-11 14:26:42 UTC (rev 29152)
@@ -8,7 +8,7 @@
#include "pygobject.h"
#include
#include
-#include
+#include
extern PyTypeObject PyGtkWidget_Type;
@@ -27,7 +27,7 @@
/* -- forward type declarations -- */
-PyTypeObject PyXfcePanelPlugin_Type;
+PyTypeObject G_GNUC_INTERNAL PyXfcePanelPlugin_Type;
#line 33 "plugin_iface.c"
@@ -38,11 +38,16 @@
static PyObject *
_wrap_xfce_panel_plugin_get_name(PyGObject *self)
{
-const gchar *ret;
+gchar *ret;
+
ret = xfce_panel_plugin_get_name(XFCE_PANEL_PLUGIN(self->obj));
-if (ret)
-return PyString_FromString(ret);
+
+if (ret) {
+PyObject *py_ret = PyString_FromString(ret);
+g_free(ret);
+return py_ret;
+}
Py_INCREF(Py_None);
return Py_None;
}
@@ -50,11 +55,16 @@
static PyObject *
_wrap_xfce_panel_plugin_get_id(PyGObject *self)
{
-const gchar *ret;
+gchar *ret;
+
ret = xfce_panel_plugin_get_id(XFCE_PANEL_PLUGIN(self->obj));
-if (ret)
-return PyString_FromString(ret);
+
+if (ret) {
+PyObject *py_ret = PyString_FromString(ret);
+g_free(ret);
+return py_ret;
+}
Py_INCREF(Py_None);
return Py_None;
}
@@ -62,11 +72,16 @@
static PyObject *
_wrap_xfce_panel_plugin_get_display_name(PyGObject *self)
{
-const gchar *ret;
+gchar *ret;
+
ret = xfce_panel_plugin_get_display_name(XFCE_PANEL_PLUGIN(self->obj));
-if (ret)
-return PyString_FromString(ret);
+
+if (ret) {
+PyObject *py_ret = PyString_FromString(ret);
+g_free(ret);
+return py_ret;
+}
Py_INCREF(Py_None);
return Py_None;
}
@@ -76,7 +91,9 @@
{
int ret;
+
ret = xfce_panel_plugin_get_s
[Xfce4-commits] r29151 - pyxfce/trunk/util
Author: dannym Date: 2009-01-11 13:44:31 + (Sun, 11 Jan 2009) New Revision: 29151 Modified: pyxfce/trunk/util/desktopentry.defs pyxfce/trunk/util/fileutils.defs pyxfce/trunk/util/i18n.defs pyxfce/trunk/util/kiosk.defs pyxfce/trunk/util/miscutils.defs pyxfce/trunk/util/rc.defs pyxfce/trunk/util/resource.defs pyxfce/trunk/util/utf8.defs Log: mini-changes in comments (nothing else). Modified: pyxfce/trunk/util/desktopentry.defs === --- pyxfce/trunk/util/desktopentry.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/desktopentry.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-desktopentry.h +;; From xfce-desktopentry.h (define-function desktop_entry_get_type (c-name "xfce_desktop_entry_get_type") Modified: pyxfce/trunk/util/fileutils.defs === --- pyxfce/trunk/util/fileutils.defs2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/fileutils.defs2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-fileutils.h +;; From xfce-fileutils.h (define-function mkdirhier (c-name "xfce_mkdirhier") Modified: pyxfce/trunk/util/i18n.defs === --- pyxfce/trunk/util/i18n.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/i18n.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-i18n.h +;; From xfce-i18n.h (define-function textdomain (c-name "xfce_textdomain") Modified: pyxfce/trunk/util/kiosk.defs === --- pyxfce/trunk/util/kiosk.defs2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/kiosk.defs2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-kiosk.h +;; From xfce-kiosk.h (define-function kiosk_new (c-name "xfce_kiosk_new") Modified: pyxfce/trunk/util/miscutils.defs === --- pyxfce/trunk/util/miscutils.defs2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/miscutils.defs2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-miscutils.h +;; From xfce-miscutils.h (define-function version_string (c-name "xfce_version_string") Modified: pyxfce/trunk/util/rc.defs === --- pyxfce/trunk/util/rc.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/rc.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-rc.h +;; From xfce-rc.h (define-function rc_simple_open (c-name "xfce_rc_simple_open") Modified: pyxfce/trunk/util/resource.defs === --- pyxfce/trunk/util/resource.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/resource.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -16,7 +16,7 @@ ) -;; From /usr/local/include/xfce4/libxfce4util/xfce-resource.h +;; From xfce-resource.h (define-function resource_dirs (c-name "xfce_resource_dirs") Modified: pyxfce/trunk/util/utf8.defs === --- pyxfce/trunk/util/utf8.defs 2009-01-11 13:43:07 UTC (rev 29150) +++ pyxfce/trunk/util/utf8.defs 2009-01-11 13:44:31 UTC (rev 29151) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4util/xfce-utf8.h +;; From xfce-utf8.h (define-function utf8_remove_controls (c-name "xfce_utf8_remove_controls") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29150 - pyxfce/trunk/gui
Author: dannym Date: 2009-01-11 13:43:07 + (Sun, 11 Jan 2009) New Revision: 29150 Modified: pyxfce/trunk/gui/aboutdialog.defs pyxfce/trunk/gui/colorbutton.defs pyxfce/trunk/gui/decorbutton.defs pyxfce/trunk/gui/decortoggle.defs pyxfce/trunk/gui/dialogs.defs pyxfce/trunk/gui/filechooser.defs pyxfce/trunk/gui/framebox.defs pyxfce/trunk/gui/gdk_extensions.defs pyxfce/trunk/gui/gtk_extensions.defs pyxfce/trunk/gui/gtk_style.defs pyxfce/trunk/gui/gtktoxevent.defs pyxfce/trunk/gui/iconbutton.defs pyxfce/trunk/gui/icontheme.defs pyxfce/trunk/gui/libxfcegui4.defs pyxfce/trunk/gui/libxfcegui4_config.defs pyxfce/trunk/gui/menubutton.defs pyxfce/trunk/gui/movehandler.defs pyxfce/trunk/gui/scaled_image.defs pyxfce/trunk/gui/systemtray.defs pyxfce/trunk/gui/titled_dialog.defs pyxfce/trunk/gui/togglebutton.defs Log: mini-changes in comments. Modified: pyxfce/trunk/gui/aboutdialog.defs === --- pyxfce/trunk/gui/aboutdialog.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/aboutdialog.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_aboutdialog.h +;; From xfce_aboutdialog.h (define-function about_info_get_type (c-name "xfce_about_info_get_type") Modified: pyxfce/trunk/gui/colorbutton.defs === --- pyxfce/trunk/gui/colorbutton.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/colorbutton.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-colorbutton.h +;; From xfce-colorbutton.h (define-function color_button_new (c-name "xfce_color_button_new") Modified: pyxfce/trunk/gui/decorbutton.defs === --- pyxfce/trunk/gui/decorbutton.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/decorbutton.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -20,7 +20,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/xfce_decorbutton.h +;; From xfce_decorbutton.h (define-function decorbutton_get_type (c-name "xfce_decorbutton_get_type") Modified: pyxfce/trunk/gui/decortoggle.defs === --- pyxfce/trunk/gui/decortoggle.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/decortoggle.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_decortoggle.h +;; From xfce_decortoggle.h (define-function decortoggle_get_type (c-name "xfce_decortoggle_get_type") Modified: pyxfce/trunk/gui/dialogs.defs === --- pyxfce/trunk/gui/dialogs.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/dialogs.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/dialogs.h +;; From dialogs.h (define-function show_info (c-name "show_info") Modified: pyxfce/trunk/gui/filechooser.defs === --- pyxfce/trunk/gui/filechooser.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/filechooser.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -15,7 +15,7 @@ ) -;; From /usr/local/include/xfce4/libxfcegui4/xfce-filechooser.h +;; From xfce-filechooser.h (define-function file_chooser_new (c-name "xfce_file_chooser_new") Modified: pyxfce/trunk/gui/framebox.defs === --- pyxfce/trunk/gui/framebox.defs 2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/framebox.defs 2009-01-11 13:43:07 UTC (rev 29150) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce_framebox.h +;; From xfce_framebox.h (define-function framebox_get_type (c-name "xfce_framebox_get_type") Modified: pyxfce/trunk/gui/gdk_extensions.defs === --- pyxfce/trunk/gui/gdk_extensions.defs2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/gdk_extensions.defs2009-01-11 13:43:07 UTC (rev 29150) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/xfce-gdk-extensions.h +;; From xfce-gdk-extensions.h (define-function gdk_display_get_fullname (c-name "xfce_gdk_display_get_fullname") Modified: pyxfce/trunk/gui/gtk_extensions.defs === --- pyxfce/trunk/gui/gtk_extensions.defs2009-01-11 13:38:47 UTC (rev 29149) +++ pyxfce/trunk/gui/gtk_extensions.defs2009-01-11 13:4
[Xfce4-commits] r29149 - pyxfce/trunk/netk
Author: dannym Date: 2009-01-11 13:38:47 + (Sun, 11 Jan 2009) New Revision: 29149 Modified: pyxfce/trunk/netk/application.defs pyxfce/trunk/netk/window_action_menu.defs Log: mini-changes in comments. Modified: pyxfce/trunk/netk/application.defs === --- pyxfce/trunk/netk/application.defs 2009-01-11 13:36:44 UTC (rev 29148) +++ pyxfce/trunk/netk/application.defs 2009-01-11 13:38:47 UTC (rev 29149) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-application.h +;; From netk-application.h (define-function application_get_type (c-name "netk_application_get_type") Modified: pyxfce/trunk/netk/window_action_menu.defs === --- pyxfce/trunk/netk/window_action_menu.defs 2009-01-11 13:36:44 UTC (rev 29148) +++ pyxfce/trunk/netk/window_action_menu.defs 2009-01-11 13:38:47 UTC (rev 29149) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-window-action-menu.h +;; From netk-window-action-menu.h (define-function create_window_action_menu (c-name "netk_create_window_action_menu") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29148 - pyxfce/trunk/netk
Author: dannym Date: 2009-01-11 13:36:44 + (Sun, 11 Jan 2009) New Revision: 29148 Modified: pyxfce/trunk/netk/class_group.defs pyxfce/trunk/netk/enum_types.defs pyxfce/trunk/netk/util.defs pyxfce/trunk/netk/window_menu.defs pyxfce/trunk/netk/workspace.defs Log: mini-changes in comments. Modified: pyxfce/trunk/netk/class_group.defs === --- pyxfce/trunk/netk/class_group.defs 2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/class_group.defs 2009-01-11 13:36:44 UTC (rev 29148) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-class-group.h +;; From netk-class-group.h (define-function class_group_get_type (c-name "netk_class_group_get_type") Modified: pyxfce/trunk/netk/enum_types.defs === --- pyxfce/trunk/netk/enum_types.defs 2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/enum_types.defs 2009-01-11 13:36:44 UTC (rev 29148) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-enum-types.h +;; From netk-enum-types.h (define-function window_state_get_type (c-name "netk_window_state_get_type") Modified: pyxfce/trunk/netk/util.defs === --- pyxfce/trunk/netk/util.defs 2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/util.defs 2009-01-11 13:36:44 UTC (rev 29148) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-util.h +;; From netk-util.h (define-function gtk_window_set_type (c-name "netk_gtk_window_set_type") Modified: pyxfce/trunk/netk/window_menu.defs === --- pyxfce/trunk/netk/window_menu.defs 2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/window_menu.defs 2009-01-11 13:36:44 UTC (rev 29148) @@ -3,7 +3,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-window-menu.h +;; From netk-window-menu.h (define-function create_window_menu (c-name "netk_create_window_menu") Modified: pyxfce/trunk/netk/workspace.defs === --- pyxfce/trunk/netk/workspace.defs2009-01-11 13:32:03 UTC (rev 29147) +++ pyxfce/trunk/netk/workspace.defs2009-01-11 13:36:44 UTC (rev 29148) @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfcegui4/netk-workspace.h +;; From netk-workspace.h (define-function workspace_get_type (c-name "netk_workspace_get_type") ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29147 - pyxfce/trunk
Author: dannym Date: 2009-01-11 13:32:03 + (Sun, 11 Jan 2009) New Revision: 29147 Removed: pyxfce/trunk/mcs/ Modified: pyxfce/trunk/__init__.py Log: remove 'libxfce4mcs' wrappers from trunk (gone from Xfce libs). Modified: pyxfce/trunk/__init__.py === --- pyxfce/trunk/__init__.py2009-01-11 13:31:09 UTC (rev 29146) +++ pyxfce/trunk/__init__.py2009-01-11 13:32:03 UTC (rev 29147) @@ -1,10 +1,10 @@ -__all__ = [ "gui", "mcs", "netk", "panel", "util" ] +__all__ = [ "gui", "menu", "netk", "panel", "util" ] #import util #import gui #import netk -#import mcs +#import menu #import exceptions # #try: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29146 - in pyxfce/trunk: . menu
Author: dannym
Date: 2009-01-11 13:31:09 + (Sun, 11 Jan 2009)
New Revision: 29146
Added:
pyxfce/trunk/menu/
pyxfce/trunk/menu/gen
Log:
add 'libxfce4menu' wrappers (unfinished).
Added: pyxfce/trunk/menu/gen
===
--- pyxfce/trunk/menu/gen (rev 0)
+++ pyxfce/trunk/menu/gen 2009-01-11 13:31:09 UTC (rev 29146)
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+inc="`pkg-config --variable=includedir libxfce4menu-1.0`"/xfce4
+
+if [ -z "${inc}" ]
+then
+ inc="`pkg-config --variable=includedir libxfcegui4-1.0`"/xfce4
+fi
+
+for s in "${inc}"/libxfce4menu/*.h
+do
+ if [ "${s%-private.h}" != "${s}" ]
+ then
+ continue
+ fi
+ t="${s##*/}"
+
+ t="${t%.h}"
+
+ if [ "${t#netk-}" = "$t" ]
+ then
+ defs="${t/-/_}.defs"
+ # doesn't work: python -m codegen.h2def "$s" >"${defs}"
+ python
/usr/lib/python2.5/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
+ fi
+done
+
+#rm -f util.defs
+#mmv -o 'xfce-*.defs' '#1.defs'
+#rm -f libxfce4util.defs
+#rm -f libxfce4util-config.defs
+#rm -f generics.defs
+#rm -f debug.defs
+#cat menu.defs | grep -v '(gtype-id "MCS_TYPE_ACTION")' >menu.defs.new && mv
mcs_client.defs.new mcs_client.defs
+
+#cat mcs_common.defs | egrep -v '\(gtype-id
"(MCS_TYPE_RESULT|MCS_TYPE_TYPE|MCS_TYPE_MANAGER_CHECK)"\)'
>mcs_common.defs.new && mv mcs_common.defs.new mcs_common.defs
+
+# (release-func mcs_manager_destroy))
+
+#sed -e 's;(define-object McsClient;(define-object Client;'
xfce_mcs-client.defs > xfce_mcs-client.defs.new && mv xfce_mcs-client.defs.new
xfce_mcs-client.defs
+#sed -e 's;(define-object McsChannel;(define-object Channel;'
xfce_mcs-channel.defs > xfce_mcs-channel.defs.new && mv
xfce_mcs-channel.defs.new xfce_mcs-channel.defs
+#sed -e 's;(define-object McsManager;(define-object Manager;'
xfce_mcs-manager.defs > xfce_mcs-manager.defs.new && mv
xfce_mcs-manager.defs.new xfce_mcs-manager.defs
+
Property changes on: pyxfce/trunk/menu/gen
___
Added: svn:executable
+ *
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29144 - pyxfce/branches
Author: dannym Date: 2009-01-11 12:15:26 + (Sun, 11 Jan 2009) New Revision: 29144 Added: pyxfce/branches/4.4/ Log: branch 4.4. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r29073 - pyxfce/trunk/examples/systemtray
Author: dannym Date: 2008-12-31 12:52:40 + (Wed, 31 Dec 2008) New Revision: 29073 Modified: pyxfce/trunk/examples/systemtray/testtrayarea.py Log: add 'import' to Python system tray area test. Modified: pyxfce/trunk/examples/systemtray/testtrayarea.py === --- pyxfce/trunk/examples/systemtray/testtrayarea.py2008-12-31 10:03:51 UTC (rev 29072) +++ pyxfce/trunk/examples/systemtray/testtrayarea.py2008-12-31 12:52:40 UTC (rev 29073) @@ -5,6 +5,7 @@ import gtk import xfce4 +import xfce4.gui import sys w = gtk.Window() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25901 - xfce4-trigger-launcher/trunk/panel-plugin
Author: dannym
Date: 2007-07-08 13:35:58 + (Sun, 08 Jul 2007)
New Revision: 25901
Modified:
xfce4-trigger-launcher/trunk/panel-plugin/triggerlauncher.c
xfce4-trigger-launcher/trunk/panel-plugin/xfce-file-chooser-button.c
xfce4-trigger-launcher/trunk/panel-plugin/xfce-icon-chooser-button.c
xfce4-trigger-launcher/trunk/panel-plugin/xfce-launcher-command-entry.c
xfce4-trigger-launcher/trunk/panel-plugin/xfce-trigger-launcher-options.c
Log:
fix memory management of LauncherCommandEntry, fix a few NULL warnings
Modified: xfce4-trigger-launcher/trunk/panel-plugin/triggerlauncher.c
===
--- xfce4-trigger-launcher/trunk/panel-plugin/triggerlauncher.c 2007-07-08
11:36:11 UTC (rev 25900)
+++ xfce4-trigger-launcher/trunk/panel-plugin/triggerlauncher.c 2007-07-08
13:35:58 UTC (rev 25901)
@@ -124,37 +124,26 @@
}
}
+static GdkPixbuf* my_pixbuf_new_from_file_at_size(const char* path, int width,
int height)
+{
+GdkPixbuf* result;
+
+return (path != NULL) ? gdk_pixbuf_new_from_file_at_size(path, width,
height, NULL) : NULL;
+
+}
+
static void load_pixbufs(TriggerLauncherData* data1)
{
free_pixbufs (data1);
data1->fallback_pixbuf = xfce_themed_icon_load ("xfce-unknown",
data1->pixbuf_size);
-data1->enabled_pixbuf = gdk_pixbuf_new_from_file_at_size
(data1->enabled_icon,
-
data1->pixbuf_size,
-
data1->pixbuf_size,
- NULL);
-
-data1->disabled_pixbuf = gdk_pixbuf_new_from_file_at_size
(data1->disabled_icon,
-
data1->pixbuf_size,
-
data1->pixbuf_size,
- NULL);
-
-data1->undefined_pixbuf = gdk_pixbuf_new_from_file_at_size
(data1->undefined_icon,
-
data1->pixbuf_size,
-
data1->pixbuf_size,
-NULL);
-
-data1->checking_pixbuf = gdk_pixbuf_new_from_file_at_size
(data1->checking_icon,
-
data1->pixbuf_size,
-
data1->pixbuf_size,
- NULL);
-
-data1->overtime_pixbuf = gdk_pixbuf_new_from_file_at_size
(data1->dodgy_icon,
-
data1->pixbuf_size,
-
data1->pixbuf_size,
- NULL);
-
+
+data1->enabled_pixbuf = my_pixbuf_new_from_file_at_size
(data1->enabled_icon, data1->pixbuf_size, data1->pixbuf_size);
+data1->disabled_pixbuf = my_pixbuf_new_from_file_at_size
(data1->disabled_icon, data1->pixbuf_size, data1->pixbuf_size);
+data1->undefined_pixbuf = my_pixbuf_new_from_file_at_size
(data1->undefined_icon, data1->pixbuf_size, data1->pixbuf_size);
+data1->checking_pixbuf = my_pixbuf_new_from_file_at_size
(data1->checking_icon, data1->pixbuf_size, data1->pixbuf_size);
+data1->overtime_pixbuf = my_pixbuf_new_from_file_at_size
(data1->dodgy_icon, data1->pixbuf_size, data1->pixbuf_size);
}
static void kill_child(TriggerLauncherData* data1)
@@ -513,11 +502,11 @@
xfce_rc_write_entry (rc, "disable_command", data1->disable_command);
xfce_rc_write_entry (rc, "poke_command", data1->poke_command);
xfce_rc_write_entry (rc, "check_status_command",
data1->check_status_command);
-xfce_rc_write_entry (rc, "enabled_icon", data1->enabled_icon);
-xfce_rc_write_entry (rc, "disabled_icon", data1->disabled_icon);
-xfce_rc_write_entry (rc, "undefined_icon", data1->undefined_icon);
-xfce_rc_write_entry (rc, "checking_icon", data1->checking_icon);
-xfce_rc_write_entry (rc, "dodgy_icon", data1->dodgy_icon);
+xfce_rc_write_entry (rc, "enabled_icon", data1->enabled_icon ?
data1->enabled_icon : "");
+xfce_rc_write_entry (rc, "disabled_icon", data1->disabled_icon ?
data1->disabled_icon : "");
+xfce_rc_write_entry (rc, "undefined_icon", data1->undefined_icon ?
data1->undefined_icon : "");
+xfce_rc_write_entry (rc, "checking_icon", data1->checking_icon ?
data1->checking_icon : "");
+xfce_rc_write_entry (rc, "dodgy_icon", data1->dodgy_icon ?
[Xfce4-commits] r25637 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym
Date: 2007-04-24 21:54:38 + (Tue, 24 Apr 2007)
New Revision: 25637
Modified:
xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c
Log:
remove magic Master selection, an artifact from the past (since everywhere, the
master control can be chosen now)
Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c 2007-04-24 21:53:24 UTC (rev
25636)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c 2007-04-24 21:54:38 UTC (rev
25637)
@@ -83,7 +83,6 @@
static int mixer_handle = -1;
static int devmask = 0;/* Bitmask for supported mixer devices
*/
static int avail_recmask = 0; /* available recording devices */
-static int master_i = -1;
static int has_recselector = 0;
static char *label[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
@@ -103,7 +102,6 @@
g_return_if_fail(mixer_handle != -1);
devmask = 0;
- master_i = -1;
avail_recmask = 0;
has_recselector = 0;
@@ -126,13 +124,7 @@
for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
if (devmask & (1 << i)) {
- /* if in doubt, choose the first */
- if (master_i == -1)
- master_i = i;
-
- if ((!strcasecmp(label[i], "Master"))
-|| (!strncasecmp(label[i], "Vol", 3)))
- master_i = i;
+ /* label[i] */
}
}
}
@@ -154,11 +146,6 @@
{
find_master();
- if (master_i == -1) {
- g_warning(_("oss: No master volume"));
- return -1;
- }
-
return 0;
}
@@ -208,11 +195,7 @@
g_return_if_fail(mixer_handle != -1);
- if (!which) {
- i = master_i;
- } else {
- i = find_control (which);
- }
+ i = (which != NULL) ? find_control (which) : (-1);
g_return_if_fail(i != -1);
vol = (percent * MAX_AMP) / 100;
@@ -236,11 +219,7 @@
g_return_val_if_fail(mixer_handle != -1, 0);
- if (!which) {
- i = master_i;
- } else {
- i = find_control (which);
- }
+ i = (which != NULL) ? find_control (which) : (-1);
g_return_val_if_fail(i != -1, 0);
@@ -335,7 +314,6 @@
static void vc_close_device()
{
- master_i = -1;
if (mixer_handle != -1) {
close (mixer_handle);
mixer_handle = -1;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25634 - xfce4-mixer/trunk/lib
Author: dannym
Date: 2007-04-24 21:51:59 + (Tue, 24 Apr 2007)
New Revision: 25634
Modified:
xfce4-mixer/trunk/lib/vc_oss.c
Log:
remove magic Master selection, an artifact from the past (since everywhere, the
master control can be chosen now)
Modified: xfce4-mixer/trunk/lib/vc_oss.c
===
--- xfce4-mixer/trunk/lib/vc_oss.c 2007-04-24 21:36:42 UTC (rev 25633)
+++ xfce4-mixer/trunk/lib/vc_oss.c 2007-04-24 21:51:59 UTC (rev 25634)
@@ -83,7 +83,6 @@
static int mixer_handle = -1;
static int devmask = 0;/* Bitmask for supported mixer devices
*/
static int avail_recmask = 0; /* available recording devices */
-static int master_i = -1;
static int has_recselector = 0;
static char *label[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
@@ -103,7 +102,6 @@
g_return_if_fail(mixer_handle != -1);
devmask = 0;
- master_i = -1;
avail_recmask = 0;
has_recselector = 0;
@@ -126,13 +124,7 @@
for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
if (devmask & (1 << i)) {
- /* if in doubt, choose the first */
- if (master_i == -1)
- master_i = i;
-
- if ((!strcasecmp(label[i], "Master"))
-|| (!strncasecmp(label[i], "Vol", 3)))
- master_i = i;
+ /* label[i] */
}
}
}
@@ -154,11 +146,6 @@
{
find_master();
- if (master_i == -1) {
- g_warning(_("oss: No master volume"));
- return -1;
- }
-
return 0;
}
@@ -208,11 +195,7 @@
g_return_if_fail(mixer_handle != -1);
- if (!which) {
- i = master_i;
- } else {
- i = find_control (which);
- }
+ i = (which != NULL) ? find_control (which) : (-1);
g_return_if_fail(i != -1);
vol = (percent * MAX_AMP) / 100;
@@ -236,11 +219,7 @@
g_return_val_if_fail(mixer_handle != -1, 0);
- if (!which) {
- i = master_i;
- } else {
- i = find_control (which);
- }
+ i = (which != NULL) ? find_control (which) : (-1);
g_return_val_if_fail(i != -1, 0);
@@ -335,7 +314,6 @@
static void vc_close_device()
{
- master_i = -1;
if (mixer_handle != -1) {
close (mixer_handle);
mixer_handle = -1;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25633 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym
Date: 2007-04-24 21:36:42 + (Tue, 24 Apr 2007)
New Revision: 25633
Modified:
xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
Log:
remove magic Master selection, an artifact from the past (since everywhere, the
master control can be chosen now)
Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2007-04-24 21:36:07 UTC (rev
25632)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2007-04-24 21:36:42 UTC (rev
25633)
@@ -65,7 +65,6 @@
#endif
static snd_mixer_t *handle = NULL;
-static snd_mixer_elem_t *elem = NULL;
static char card[64] = "default";
#define MAX_MASTERS 10
@@ -125,14 +124,12 @@
snd_mixer_selem_id_t* master_selectors[MAX_MASTERS] = { NULL };
- elem = NULL;
-
if (handle != NULL) {
snd_mixer_close(handle);
handle = NULL;
}
- if ((err = snd_mixer_open(&handle, 0)) < 0 || !handle) {
+ if ((err = snd_mixer_open(&handle, 0)) < 0 || handle == NULL) {
error(_("alsa: Mixer %s open error: %s\n"), card,
snd_strerror(err));
return;
}
@@ -141,7 +138,6 @@
error(_("alsa: Mixer attach %s error: %s\n"), card,
snd_strerror(err));
snd_mixer_close(handle); /* <-- alsa 0.9.3a fails assert(hctl)
if I do that... wird... */
handle = NULL;
- elem = NULL; /* just to be sure */
return;
}
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) {
@@ -161,38 +157,6 @@
handle = NULL;
return;
}
-
-
- for (i = 0; elem == NULL && i < MAX_MASTERS && master_ids[i] != NULL;
i++) {
- snd_mixer_selem_id_alloca(&master_selectors[i]);
- snd_mixer_selem_id_set_index(master_selectors[i], 0);
- snd_mixer_selem_id_set_name(master_selectors[i], master_ids[i]);
-
- elem = snd_mixer_find_selem(handle, master_selectors[i]);
-
- if (elem != NULL) {
- if (!snd_mixer_selem_has_common_volume(elem)
- && !snd_mixer_selem_has_playback_volume(elem)
- ) { /* no playback device */
- elem = NULL;
- }
- }
-
-
-
-#ifdef TRACE
- error(_("alsa: Unable to find simple control '%s',%i\n"),
- snd_mixer_selem_id_get_name(master_selectors[i]),
snd_mixer_selem_id_get_index(master_selectors[i]));
-#endif
- }
-
- if (elem == NULL) {
- show_developer_hint ();
-
- snd_mixer_close(handle);
- handle = NULL;
- return;
- }
}
static void vc_set_device(char const *name)
@@ -214,7 +178,9 @@
static int vc_reinit_device(void)
{
find_master();
- if (!elem) return -1;
+ if (handle == NULL) {
+ return -1;
+ }
return 0;
}
@@ -284,11 +250,7 @@
return 0;
}
- if (which != NULL) {
- xelem = find_control (which);
- } else {
- xelem = elem;
- }
+ xelem = (which != NULL) ? find_control (which) : NULL;
if (xelem == NULL) {
return 0;
@@ -365,11 +327,7 @@
return;
}
- if (which != NULL) {
- xelem = find_control (which);
- } else {
- xelem = elem;
- }
+ xelem = (which != NULL) ? find_control (which) : NULL;
if (xelem == NULL) {
return;
@@ -466,7 +424,7 @@
if (!g) return NULL;
#endif
- if (!handle) {
+ if (handle == NULL) {
return NULL;
}
@@ -539,7 +497,9 @@
{
/* supports 1 (ONE) callback */
- if (!handle) return;
+ if (handle == NULL) {
+ return;
+ }
mycb = cb;
mydata = data;
@@ -550,12 +510,12 @@
static void vc_close_device()
{
- if (!handle) return;
+ if (handle == NULL) {
+ return;
+ }
snd_mixer_close (handle); /* FIXME does this close all related stuff? */
handle = NULL;
-
- elem = NULL;
}
static GList *vc_get_device_list()
@@ -630,15 +590,16 @@
gint i;
gchar *s;
snd_mixer_elem_t *xelem = NULL;
- if (!handle) return;
- if (which) {
- xelem = find_control (which);
- } else {
- xelem = elem;
+
+ if (handle == NULL) {
+ return;
}
- if (!xelem) return;
+ xelem = (which != NULL) ? find_control (which) : NULL;
+ if (xelem == NULL) {
+ return;
+ }
g = vc_get_choices (xelem);
if (!g || !v)
@@ -663,14 +624,15 @@
GList *g;
g
[Xfce4-commits] r25632 - xfce4-mixer/trunk/lib
Author: dannym
Date: 2007-04-24 21:36:07 + (Tue, 24 Apr 2007)
New Revision: 25632
Modified:
xfce4-mixer/trunk/lib/vc_alsa.c
Log:
remove magic Master selection, an artifact from the past (since everywhere, the
master control can be chosen now, might as well leave the user guessing which
it is)
Modified: xfce4-mixer/trunk/lib/vc_alsa.c
===
--- xfce4-mixer/trunk/lib/vc_alsa.c 2007-04-24 10:38:25 UTC (rev 25631)
+++ xfce4-mixer/trunk/lib/vc_alsa.c 2007-04-24 21:36:07 UTC (rev 25632)
@@ -65,7 +65,6 @@
#endif
static snd_mixer_t *handle = NULL;
-static snd_mixer_elem_t *elem = NULL;
static char card[64] = "default";
#define MAX_MASTERS 10
@@ -125,14 +124,12 @@
snd_mixer_selem_id_t* master_selectors[MAX_MASTERS] = { NULL };
- elem = NULL;
-
if (handle != NULL) {
snd_mixer_close(handle);
handle = NULL;
}
- if ((err = snd_mixer_open(&handle, 0)) < 0 || !handle) {
+ if ((err = snd_mixer_open(&handle, 0)) < 0 || handle == NULL) {
error(_("alsa: Mixer %s open error: %s\n"), card,
snd_strerror(err));
return;
}
@@ -141,7 +138,6 @@
error(_("alsa: Mixer attach %s error: %s\n"), card,
snd_strerror(err));
snd_mixer_close(handle); /* <-- alsa 0.9.3a fails assert(hctl)
if I do that... wird... */
handle = NULL;
- elem = NULL; /* just to be sure */
return;
}
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) {
@@ -161,38 +157,6 @@
handle = NULL;
return;
}
-
-
- for (i = 0; elem == NULL && i < MAX_MASTERS && master_ids[i] != NULL;
i++) {
- snd_mixer_selem_id_alloca(&master_selectors[i]);
- snd_mixer_selem_id_set_index(master_selectors[i], 0);
- snd_mixer_selem_id_set_name(master_selectors[i], master_ids[i]);
-
- elem = snd_mixer_find_selem(handle, master_selectors[i]);
-
- if (elem != NULL) {
- if (!snd_mixer_selem_has_common_volume(elem)
- && !snd_mixer_selem_has_playback_volume(elem)
- ) { /* no playback device */
- elem = NULL;
- }
- }
-
-
-
-#ifdef TRACE
- error(_("alsa: Unable to find simple control '%s',%i\n"),
- snd_mixer_selem_id_get_name(master_selectors[i]),
snd_mixer_selem_id_get_index(master_selectors[i]));
-#endif
- }
-
- if (elem == NULL) {
- show_developer_hint ();
-
- snd_mixer_close(handle);
- handle = NULL;
- return;
- }
}
static void vc_set_device(char const *name)
@@ -214,7 +178,9 @@
static int vc_reinit_device(void)
{
find_master();
- if (!elem) return -1;
+ if (handle == NULL) {
+ return -1;
+ }
return 0;
}
@@ -284,11 +250,7 @@
return 0;
}
- if (which != NULL) {
- xelem = find_control (which);
- } else {
- xelem = elem;
- }
+ xelem = (which != NULL) ? find_control (which) : NULL;
if (xelem == NULL) {
return 0;
@@ -365,11 +327,7 @@
return;
}
- if (which != NULL) {
- xelem = find_control (which);
- } else {
- xelem = elem;
- }
+ xelem = (which != NULL) ? find_control (which) : NULL;
if (xelem == NULL) {
return;
@@ -466,7 +424,7 @@
if (!g) return NULL;
#endif
- if (!handle) {
+ if (handle == NULL) {
return NULL;
}
@@ -539,7 +497,9 @@
{
/* supports 1 (ONE) callback */
- if (!handle) return;
+ if (handle == NULL) {
+ return;
+ }
mycb = cb;
mydata = data;
@@ -550,12 +510,12 @@
static void vc_close_device()
{
- if (!handle) return;
+ if (handle == NULL) {
+ return;
+ }
snd_mixer_close (handle); /* FIXME does this close all related stuff? */
handle = NULL;
-
- elem = NULL;
}
static GList *vc_get_device_list()
@@ -630,15 +590,16 @@
gint i;
gchar *s;
snd_mixer_elem_t *xelem = NULL;
- if (!handle) return;
- if (which) {
- xelem = find_control (which);
- } else {
- xelem = elem;
+
+ if (handle == NULL) {
+ return;
}
- if (!xelem) return;
+ xelem = (which != NULL) ? find_control (which) : NULL;
+ if (xelem == NULL) {
+ return;
+ }
g = vc_get_choices (xelem);
if (!g || !v)
@@ -663,14 +624,15 @@
GList *g;
[Xfce4-commits] r25580 - xfce4-mixer/trunk/panel-plugin
Author: dannym Date: 2007-04-15 20:14:14 + (Sun, 15 Apr 2007) New Revision: 25580 Modified: xfce4-mixer/trunk/panel-plugin/Makefile.am Log: fix bug # 2892 some more: parallel make Modified: xfce4-mixer/trunk/panel-plugin/Makefile.am === --- xfce4-mixer/trunk/panel-plugin/Makefile.am 2007-04-15 20:13:55 UTC (rev 25579) +++ xfce4-mixer/trunk/panel-plugin/Makefile.am 2007-04-15 20:14:14 UTC (rev 25580) @@ -13,6 +13,7 @@ @MIGHTY_MOUSE_LIBS@ \ $(top_builddir)/lib/libxfce4mixer.la +xfce4_mixer_plugin_DEPENDENCIES = $(top_builddir)/lib/libxfce4mixer.la xfce4_mixer_plugin_SOURCES = \ delayer.inc \ @@ -47,9 +48,6 @@ @XFCE4_GUI_CFLAGS@ @GTK_CFLAGS@ @XML_CFLAGS@ \ @MIGHTY_MOUSE_CFLAGS@ -# libmixer_la_DEPENDENCIES = $(top_builddir)/lib/libxfce4mixer.la - - # .desktop file # # Some automake trickery here. Because we cannot use $(libexecdir) in the ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25579 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2007-04-15 20:13:55 + (Sun, 15 Apr 2007) New Revision: 25579 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/Makefile.am Log: fix bug # 2892 some more: parallel make Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/Makefile.am === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/Makefile.am 2007-04-15 18:44:16 UTC (rev 25578) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/Makefile.am 2007-04-15 20:13:55 UTC (rev 25579) @@ -13,6 +13,7 @@ @MIGHTY_MOUSE_LIBS@ \ $(top_builddir)/lib/libxfce4mixer.la +xfce4_mixer_plugin_DEPENDENCIES = $(top_builddir)/lib/libxfce4mixer.la xfce4_mixer_plugin_SOURCES = \ delayer.inc \ @@ -47,9 +48,6 @@ @XFCE4_GUI_CFLAGS@ @GTK_CFLAGS@ @XML_CFLAGS@ \ @MIGHTY_MOUSE_CFLAGS@ -# libmixer_la_DEPENDENCIES = $(top_builddir)/lib/libxfce4mixer.la - - # .desktop file # # Some automake trickery here. Because we cannot use $(libexecdir) in the ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25562 - xfce4-mixer/trunk/panel-plugin
Author: dannym Date: 2007-04-15 01:22:02 + (Sun, 15 Apr 2007) New Revision: 25562 Modified: xfce4-mixer/trunk/panel-plugin/Makefile.am Log: fix bug #2892 Modified: xfce4-mixer/trunk/panel-plugin/Makefile.am === --- xfce4-mixer/trunk/panel-plugin/Makefile.am 2007-04-15 01:22:00 UTC (rev 25561) +++ xfce4-mixer/trunk/panel-plugin/Makefile.am 2007-04-15 01:22:02 UTC (rev 25562) @@ -6,9 +6,6 @@ # @PANEL_EXTERNALPLUGINDIR@ -desktopdatadir = $(datadir)/xfce4/panel-plugins -desktopdata_DATA = xfce4-mixer.desktop - xfce4_mixer_plugin_LDFLAGS = \ @MIGHTY_MOUSE_LIBS@ \ @XFCE_MCS_CLIENT_LIBS@ \ ___ Xfce4-commits mailing list [EMAIL PROTECTED] http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25561 - xfce4-mixer/branches/xfce_4_4/panel-plugin
Author: dannym Date: 2007-04-15 01:22:00 + (Sun, 15 Apr 2007) New Revision: 25561 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/Makefile.am Log: fix bug #2892 Modified: xfce4-mixer/branches/xfce_4_4/panel-plugin/Makefile.am === --- xfce4-mixer/branches/xfce_4_4/panel-plugin/Makefile.am 2007-04-14 23:06:08 UTC (rev 25560) +++ xfce4-mixer/branches/xfce_4_4/panel-plugin/Makefile.am 2007-04-15 01:22:00 UTC (rev 25561) @@ -6,9 +6,6 @@ # @PANEL_EXTERNALPLUGINDIR@ -desktopdatadir = $(datadir)/xfce4/panel-plugins -desktopdata_DATA = xfce4-mixer.desktop - xfce4_mixer_plugin_LDFLAGS = \ @MIGHTY_MOUSE_LIBS@ \ @XFCE_MCS_CLIENT_LIBS@ \ ___ Xfce4-commits mailing list [EMAIL PROTECTED] http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25278 - libxfcegui4/trunk/libxfcegui4
Author: dannym
Date: 2007-03-24 19:47:32 + (Sat, 24 Mar 2007)
New Revision: 25278
Modified:
libxfcegui4/trunk/libxfcegui4/session-client.c
libxfcegui4/trunk/libxfcegui4/session-client.h
Log:
remove client_session_copy: doesn't work since the lowlevel session is not
copied and I don't see a practical use either
Modified: libxfcegui4/trunk/libxfcegui4/session-client.c
===
--- libxfcegui4/trunk/libxfcegui4/session-client.c 2007-03-24 17:10:17 UTC
(rev 25277)
+++ libxfcegui4/trunk/libxfcegui4/session-client.c 2007-03-24 19:47:32 UTC
(rev 25278)
@@ -863,12 +863,16 @@
}
}
-gchar** safe_strvdup(gchar** const source)
+gchar** safe_strvdup(const gchar * const * source)
{
int count;
int i;
gchar** result;
+if (source == NULL) {
+return NULL;
+}
+
count = g_strv_length(source);
result = g_new0(gchar*, count + 1);
@@ -880,36 +884,6 @@
return result;
}
-/* messes with session_connection:
-SessionClient *client_session_copy(SessionClient * session_client)
-{
-SessionClient* result;
-result = g_new0(SessionClient, 1);
-
-result->data = session_client->data;
-result->session_connection = session_client->session_connection;
-
-result->current_state = session_client->current_state;
-result->restart_style = session_client->restart_style;
-result->interact_style = session_client->interact_style;
-
-result->priority = session_client->priority;
-
-result->client_id = safe_strdup(session_client->client_id);
-result->given_client_id = safe_strdup(session_client->given_client_id);
-
-result->current_directory = safe_strdup(session_client->current_directory);
-result->program = safe_strdup(session_client->program);
-result->clone_command = safe_strvdup(session_client->clone_command);
-result->resign_command = safe_strvdup(session_client->resign_command);
-result->restart_command = safe_strvdup(session_client->restart_command);
-result->discard_command = safe_strvdup(session_client->discard_command);
-result->shutdown_command = safe_strvdup(session_client->shutdown_command);
-
-result->shutdown = session_client->shutdown;
-}
-*/
-
void client_session_set_save_phase_2_callback(SessionClient * session_client,
save_phase_2_callback value)
{
session_client->save_phase_2 = value;
Modified: libxfcegui4/trunk/libxfcegui4/session-client.h
===
--- libxfcegui4/trunk/libxfcegui4/session-client.h 2007-03-24 17:10:17 UTC
(rev 25277)
+++ libxfcegui4/trunk/libxfcegui4/session-client.h 2007-03-24 19:47:32 UTC
(rev 25278)
@@ -119,7 +119,6 @@
gchar priority);
void client_session_free(SessionClient * session_client);
-/* SessionClient *client_session_copy(SessionClient * session_client); */
gboolean session_init (SessionClient * session_client);
void session_shutdown (SessionClient * session_client);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24865 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: dannym
Date: 2007-02-06 00:32:59 + (Tue, 06 Feb 2007)
New Revision: 24865
Modified:
libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.c
libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.h
Log:
back out most of the getters of netk-tasklist
Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.c
===
--- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.c 2007-02-06
00:30:58 UTC (rev 24864)
+++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.c 2007-02-06
00:32:59 UTC (rev 24865)
@@ -2575,60 +2575,3 @@
return task;
}
-
-NetkScreen*
-netk_tasklist_get_screen(NetkTasklist * tasklist)
-{
-g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), NULL);
-
-return tasklist->priv->screen;
-}
-
-NetkTasklistGroupingType
-netk_tasklist_get_grouping(NetkTasklist * tasklist)
-{
-g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE);
-
-return tasklist->priv->grouping;
-}
-
-gboolean
-netk_tasklist_get_switch_workspace_on_unminimize(NetkTasklist * tasklist)
-{
-g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE);
-
-return tasklist->priv->switch_workspace_on_unminimize;
-}
-
-gint
-netk_tasklist_get_grouping_limit(NetkTasklist * tasklist)
-{
-g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE);
-
-return tasklist->priv->grouping_limit;
-}
-
-gboolean
-netk_tasklist_get_include_all_workspaces(NetkTasklist * tasklist)
-{
-g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE);
-
-return tasklist->priv->include_all_workspaces;
-}
-
-gboolean
-netk_tasklist_get_show_label(NetkTasklist * tasklist)
-{
-g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), FALSE);
-
-return tasklist->priv->show_label;
-}
-
-GtkReliefStyle
-netk_tasklist_get_button_relief(NetkTasklist * tasklist)
-{
-g_return_val_if_fail (NETK_IS_TASKLIST (tasklist), GTK_RELIEF_NONE);
-
-return tasklist->priv->relief;
-}
-
Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.h
===
--- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.h 2007-02-06
00:30:58 UTC (rev 24864)
+++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-tasklist.h 2007-02-06
00:32:59 UTC (rev 24865)
@@ -98,14 +98,5 @@
void netk_tasklist_set_button_relief (NetkTasklist * tasklist,
GtkReliefStyle relief);
-
- NetkScreen* netk_tasklist_get_screen(NetkTasklist * tasklist);
- NetkTasklistGroupingType netk_tasklist_get_grouping(NetkTasklist *
tasklist);
- gboolean netk_tasklist_get_switch_workspace_on_unminimize(NetkTasklist *
tasklist);
- gint netk_tasklist_get_grouping_limit(NetkTasklist * tasklist);
- gboolean netk_tasklist_get_include_all_workspaces(NetkTasklist *
tasklist);
- gboolean netk_tasklist_get_show_label(NetkTasklist * tasklist);
- GtkReliefStyle netk_tasklist_get_button_relief(NetkTasklist * tasklist);
-
G_END_DECLS
#endif /* NETK_TASKLIST_H */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
