from:"Jannis Pohlmann"

[Xfce4-commits] r22410 - in installit/trunk: . components i18n/po tools

2006-07-11 Thread Jannis Pohlmann

Author: jannis
Date: 2006-07-11 22:07:24 + (Tue, 11 Jul 2006)
New Revision: 22410

Modified:
   installit/trunk/ChangeLog
   installit/trunk/components/packages.py
   installit/trunk/i18n/po/de.po
   installit/trunk/i18n/po/i2t.pot
   installit/trunk/tools/env.py
Log:
* i18n/po/de.po, i18n/po/i2t.po: New strings merged.
* tools/env.py: Add link() and hasLibrary() methods.
* components/packages.py: Use Environment.hasLibrary method to detect
  libraries using libtool. First tests look promising.

Modified: installit/trunk/ChangeLog
===
--- installit/trunk/ChangeLog   2006-07-11 22:00:10 UTC (rev 22409)
+++ installit/trunk/ChangeLog   2006-07-11 22:07:24 UTC (rev 22410)
@@ -1,3 +1,10 @@
+2006-07-12 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * i18n/po/de.po, i18n/po/i2t.po: New strings merged.
+   * tools/env.py: Add link() and hasLibrary() methods.
+   * components/packages.py: Use Environment.hasLibrary method to detect
+ libraries using libtool. First tests look promising.
+
 2006-07-11 Jannis Pohlmann [EMAIL PROTECTED]
 
* i18n/po/i2t.pot, i18n/po/de.po, i18n/po/POTFILES.in: New strings

Modified: installit/trunk/components/packages.py
===
--- installit/trunk/components/packages.py  2006-07-11 22:00:10 UTC (rev 
22409)
+++ installit/trunk/components/packages.py  2006-07-11 22:07:24 UTC (rev 
22410)
@@ -151,6 +151,13 @@
 self.path = path
 
 
+class Library:
+
+def __init__(self, name, path):
+self.name = name
+self.path = path
+
+
 class ProgramNotFoundError(Exception):
 pass
 
@@ -538,9 +545,13 @@
 pkg = PkgConfig.resolve(dep[name], dep[version])
 except PkgConfigModuleNotFound:
 if Config.get(UseLibrarySearch):
-# TODO: Replace the line below with a call of the
-# Library lookup class
-pkg = UnresolvedPackage(dep[name], dep[version])
+## TODO: Replace the line below with a call of the
+## Library lookup class
+if Environment.hasLibrary(dep[name], dep[version]):
+return Library(dep[name], dep[version])
+else:
+return UnresolvedPackage(dep[name],
+dep[version])
 else:
 # Mark this dependency as unresolved and try resolving
 # it manually during installation.

Modified: installit/trunk/i18n/po/de.po
===
--- installit/trunk/i18n/po/de.po   2006-07-11 22:00:10 UTC (rev 22409)
+++ installit/trunk/i18n/po/de.po   2006-07-11 22:07:24 UTC (rev 22410)
@@ -7,8 +7,8 @@
 msgstr 
 Project-Id-Version: InstallIt 0.1beta1\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2006-07-11 23:25+0200\n
-PO-Revision-Date: 2006-07-11 23:27+0100\n
+POT-Creation-Date: 2006-07-12 00:04+0200\n
+PO-Revision-Date: 2006-07-12 00:07+0100\n
 Last-Translator: Jannis Pohlmann [EMAIL PROTECTED]\n
 Language-Team: German [EMAIL PROTECTED]\n
 MIME-Version: 1.0\n
@@ -114,7 +114,7 @@
 msgid Installing %(name)s %(version)s ...
 msgstr Installiere %(name)s %(version)s ...
 
-#: ../..//components/packages.py:343
+#: ../..//components/packages.py:350
 #, python-format
 msgid Could not parse package description %s: %s
 msgstr Konnte Paketbeschreibung %s nicht lesen: %s
@@ -441,6 +441,16 @@
 msgid Failed to compile %s.
 msgstr Konnte %s nicht übersetzen.
 
+#: ../..//tools/env.py:105
+#, python-format
+msgid Linking %s with %s
+msgstr Verlinke %s mit %s
+
+#: ../..//tools/env.py:111
+#, python-format
+msgid Failed to link %s.
+msgstr Konnte %s nicht verlinken.
+
 #: ../..//tools/pkgconfig.py:37
 #, python-format
 msgid pkg-config module missing: %(name)s (%(version)s).

Modified: installit/trunk/i18n/po/i2t.pot
===
--- installit/trunk/i18n/po/i2t.pot 2006-07-11 22:00:10 UTC (rev 22409)
+++ installit/trunk/i18n/po/i2t.pot 2006-07-11 22:07:24 UTC (rev 22410)
@@ -8,7 +8,7 @@
 msgstr 
 Project-Id-Version: PACKAGE VERSION\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2006-07-11 23:25+0200\n
+POT-Creation-Date: 2006-07-12 00:04+0200\n
 PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n
 Last-Translator: FULL NAME [EMAIL PROTECTED]\n
 Language-Team: LANGUAGE [EMAIL PROTECTED]\n
@@ -112,7 +112,7 @@
 msgid Installing %(name)s %(version)s ...
 msgstr 
 
-#: ../..//components/packages.py:343
+#: ../..//components/packages.py:350
 #, python-format
 msgid Could not parse package description %s: %s
 msgstr 
@@ -438,6 +438,16 @@
 msgid Failed to compile %s.
 msgstr 
 
+#: ../..//tools/env.py:105
+#, python-format
+msgid

[Xfce4-commits] r22486 - in installit/trunk: . backends components i18n/po tools ui

2006-07-19 Thread Jannis Pohlmann

Author: jannis
Date: 2006-07-19 20:26:19 + (Wed, 19 Jul 2006)
New Revision: 22486

Modified:
   installit/trunk/ChangeLog
   installit/trunk/backends/Source.py
   installit/trunk/components/packages.py
   installit/trunk/i18n/po/de.po
   installit/trunk/tools/shell.py
   installit/trunk/ui/installation.py
Log:
* components/packages.py: Added methods to return sets of 
  unresolved libraries/programs and their paths. Added a new wrapper
  class for unresolved Programs. Renamed UnresolvedPackage into
  UnresolvedLibrary.
* tools/shell.py: Added another constructor parameter for additional
  paths. If this parameter is defined, it will later be appended to
  $PATH. 
* ui/installation.py: Remove subtitles from installation wizard.
  Looks better without (less text - users understand better).
* backend/Source.py: Pass paths of dependencies (programs only) to
  all shell commands executed during the build process. This will
  help ./configure-scripts to find required programs.
  Added a requirements (dependencies) page, which now allows to
  resolve programs which were not found. Manual library resolving
  will follow.
* ui/installation.py: Properly display installation/deinstallation
  wizards on the center of the screen. Avoid duplicate header title 
  content.

Modified: installit/trunk/ChangeLog
===
--- installit/trunk/ChangeLog   2006-07-19 20:06:26 UTC (rev 22485)
+++ installit/trunk/ChangeLog   2006-07-19 20:26:19 UTC (rev 22486)
@@ -1,5 +1,29 @@
+2006-07-19 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * components/packages.py: Added methods to return sets of 
+ unresolved libraries/programs and their paths. Added a new wrapper
+ class for unresolved Programs. Renamed UnresolvedPackage into
+ UnresolvedLibrary.
+   * tools/shell.py: Added another constructor parameter for additional
+ paths. If this parameter is defined, it will later be appended to
+ $PATH. 
+   * ui/installation.py: Remove subtitles from installation wizard.
+ Looks better without (less text - users understand better).
+   * backend/Source.py: Pass paths of dependencies (programs only) to
+ all shell commands executed during the build process. This will
+ help ./configure-scripts to find required programs.
+ Added a requirements (dependencies) page, which now allows to
+ resolve programs which were not found. Manual library resolving
+ will follow.
+
 2006-07-12 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * ui/installation.py: Properly display installation/deinstallation
+ wizards on the center of the screen. Avoid duplicate header title 
+ content.
+
+2006-07-12 Jannis Pohlmann [EMAIL PROTECTED]
+
* i18n/po/de.po, i18n/po/i2t.po: New strings merged.
* tools/env.py: Add link() and hasLibrary() methods.
* components/packages.py: Use Environment.hasLibrary method to detect

Modified: installit/trunk/backends/Source.py
===
--- installit/trunk/backends/Source.py  2006-07-19 20:06:26 UTC (rev 22485)
+++ installit/trunk/backends/Source.py  2006-07-19 20:26:19 UTC (rev 22486)
@@ -29,6 +29,7 @@
 from tools.shell import Command
 from components.mirrors import MirrorList
 from components.config import Config
+from components.packages import Program, Library
 from ui.installation import BackendInstallationWizard, \
 BackendDeinstallationWizard
 from ui.extensions import showMessage, forceRefresh
@@ -79,16 +80,18 @@
 
 # Determine working directory
 directory = path.join(Config.get(TempDir), package.unpackDir)
-
+
 # Build configure command
-return Command(./configure %s %  .join(options), directory)
+return Command(./configure %s %  .join(options), directory,
+   :.join(package.getProgramPaths()))
 
 def getBuildCommand(self, package):
 # Determine working directory
 directory = path.join(Config.get(TempDir), package.unpackDir)
 
 # Generate build command
-return Command(make, directory)
+return Command(make, directory,
+   :.join(package.getProgramPaths()))
 
 def getTestInstallCommand(self, package):
 # Determine working directory
@@ -96,14 +99,16 @@
 
 # Generate temporary installation command
 return Command(make DESTDIR=%s install 
-% package.getTempInstallPrefix(), directory)
+% package.getTempInstallPrefix(), directory,
+:.join(package.getProgramPaths()))
 
 def getInstallCommand(self, package):
 # Determine working directory
 directory = path.join(Config.get(TempDir

[Xfce4-commits] r22617 - in libfrap/trunk: . libfrap libfrap/appfinder libfrap/menu

2006-08-01 Thread Jannis Pohlmann

Author: jannis
Date: 2006-08-01 22:21:26 + (Tue, 01 Aug 2006)
New Revision: 22617

Added:
   libfrap/trunk/libfrap/appfinder/
   libfrap/trunk/libfrap/appfinder/ChangeLog
   libfrap/trunk/libfrap/appfinder/Makefile.am
   libfrap/trunk/libfrap/appfinder/README
   libfrap/trunk/libfrap/appfinder/appfinder.c
   libfrap/trunk/libfrap/menu/STATUS
Modified:
   libfrap/trunk/ChangeLog
   libfrap/trunk/configure.in.in
   libfrap/trunk/libfrap/Makefile.am
   libfrap/trunk/libfrap/menu/Makefile.am
   libfrap/trunk/libfrap/menu/README
   libfrap/trunk/libfrap/menu/frap-menu.c
Log:
* configure.in.in: Added libxfcegui4 to the dependencies.
* configure.in.in, libfrap/Makefile.am, libfrap/appfinder/: Import
  FrapAppfinder program (just an almost empty program at the moment)
  which is intended to be a replacement for the current appfinder one
  day. It depends on libfrap/menu/.
* libfrap/menu/STATUS, libfrap/menu/Makefile.am: Implementation status
  file (STATUS) added to libfrap/menu/.

Modified: libfrap/trunk/ChangeLog
===
--- libfrap/trunk/ChangeLog 2006-08-01 21:36:48 UTC (rev 22616)
+++ libfrap/trunk/ChangeLog 2006-08-01 22:21:26 UTC (rev 22617)
@@ -1,3 +1,13 @@
+2006-08-02 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * configure.in.in: Added libxfcegui4 to the dependencies.
+   * configure.in.in, libfrap/Makefile.am, libfrap/appfinder/: Import
+ FrapAppfinder program (just an almost empty program at the moment)
+ which is intended to be a replacement for the current appfinder one
+ day. It depends on libfrap/menu/.
+   * libfrap/menu/STATUS, libfrap/menu/Makefile.am: Implementation status
+ file (STATUS) added to libfrap/menu/.
+
 2006-08-01 Benedikt Meurer [EMAIL PROTECTED]
 
* AUTHORS, COPYING, INSTALL, Makefile.am, autogen.sh, configure.in.in:

Modified: libfrap/trunk/configure.in.in
===
--- libfrap/trunk/configure.in.in   2006-08-01 21:36:48 UTC (rev 22616)
+++ libfrap/trunk/configure.in.in   2006-08-01 22:21:26 UTC (rev 22617)
@@ -72,6 +72,7 @@
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
 
 dnl ***
 dnl *** Check for debugging support ***
@@ -119,4 +120,5 @@
 libfrap/Makefile
 libfrap/icon-entry/Makefile
 libfrap/menu/Makefile
+libfrap/appfinder/Makefile
 ])

Modified: libfrap/trunk/libfrap/Makefile.am
===
--- libfrap/trunk/libfrap/Makefile.am   2006-08-01 21:36:48 UTC (rev 22616)
+++ libfrap/trunk/libfrap/Makefile.am   2006-08-01 22:21:26 UTC (rev 22617)
@@ -2,6 +2,7 @@
 
 SUBDIRS =  \
icon-entry  \
-   menu
+   menu\
+   appfinder   
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Added: libfrap/trunk/libfrap/appfinder/ChangeLog
===
--- libfrap/trunk/libfrap/appfinder/ChangeLog   (rev 0)
+++ libfrap/trunk/libfrap/appfinder/ChangeLog   2006-08-01 22:21:26 UTC (rev 
22617)
@@ -0,0 +1,5 @@
+2006-08-02 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * Initial import into libfrap.
+
+# vi:set ts=8 sw=8 noet ai nocindent:


Property changes on: libfrap/trunk/libfrap/appfinder/ChangeLog
___
Name: svn:keywords
   + Id Author Date Revision

Added: libfrap/trunk/libfrap/appfinder/Makefile.am
===
--- libfrap/trunk/libfrap/appfinder/Makefile.am (rev 0)
+++ libfrap/trunk/libfrap/appfinder/Makefile.am 2006-08-01 22:21:26 UTC (rev 
22617)
@@ -0,0 +1,30 @@
+# $Id$
+
+INCLUDES = \
+   -DG_LOG_DOMAIN=\FrapAppfinder\\
+   -I$(top_builddir)/libfrap/menu/ 
+
+
+noinst_PROGRAMS =  \
+   appfinder
+
+appfinder_CFLAGS = \
+   $(GTK_CFLAGS)   \
+   $(LIBXFCEGUI4_CFLAGS)
+
+appfinder_SOURCES =\
+   appfinder.c 
+
+appfinder_LDFLAGS =\
+   $(top_builddir)/libfrap

[Xfce4-commits] r23077 - in installit/trunk: . backends components tools

2006-09-04 Thread Jannis Pohlmann

Author: jannis
Date: 2006-09-04 19:13:35 + (Mon, 04 Sep 2006)
New Revision: 23077

Modified:
   installit/trunk/ChangeLog
   installit/trunk/backends/Source.py
   installit/trunk/components/packages.py
   installit/trunk/tools/shell.py
Log:
* components/packages.py, backends/Source.py: Use PkgConfigModule class
  properly. Fixes several errors.

Modified: installit/trunk/ChangeLog
===
--- installit/trunk/ChangeLog   2006-09-04 19:11:27 UTC (rev 23076)
+++ installit/trunk/ChangeLog   2006-09-04 19:13:35 UTC (rev 23077)
@@ -1,5 +1,10 @@
 2006-09-04 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * components/packages.py, backends/Source.py: Use PkgConfigModule class
+ properly. Fixes several errors.
+
+2006-09-04 Jannis Pohlmann [EMAIL PROTECTED]
+
* components/packages.py, tools/pkgconfig.py: Add support for pkg-config
  --cflags and --libs arguments. 
* backends/Source.py: Fix requirements page, which only worked properly

Modified: installit/trunk/backends/Source.py
===
--- installit/trunk/backends/Source.py  2006-09-04 19:11:27 UTC (rev 23076)
+++ installit/trunk/backends/Source.py  2006-09-04 19:13:35 UTC (rev 23077)
@@ -28,6 +28,7 @@
 
 from tools.shell import Command
 from tools.env import Environment
+from tools.pkgconfig import PkgConfigModule
 from components.mirrors import MirrorList
 from components.config import Config
 from components.packages import Program, Library, Package
@@ -770,7 +771,9 @@
 status.connect(clicked, lambda button:
 self._locateLibrary(library))
 status.set_relief(gtk.RELIEF_NONE)
-if isinstance(library, Package) or library.isResolved():
+if isinstance(library, Package) or \
+   isinstance(library, PkgConfigModule) or \
+   library.isResolved():
 status.set_image(gtk.image_new_from_stock(gtk.STOCK_YES,
 gtk.ICON_SIZE_BUTTON))
 else:
@@ -789,7 +792,9 @@
 label.show()
 
 # Locate manually via file chooser
-if not isinstance(library, Package) and not 
library.isResolved():
+if not isinstance(library, Package) and \
+   not isinstance(library, PkgConfigModule) and \
+   not library.isResolved():
 button = gtk.Button(_(Locate manually...))
 button.connect(clicked, lambda button:
 self._locateLibrary(library))

Modified: installit/trunk/components/packages.py
===
--- installit/trunk/components/packages.py  2006-09-04 19:11:27 UTC (rev 
23076)
+++ installit/trunk/components/packages.py  2006-09-04 19:13:35 UTC (rev 
23077)
@@ -165,6 +165,8 @@
 if isinstance(library, PkgConfigModule):
 flags.add(library.getCompilerFlags())
 
+print flags
+
 return   +  .join(flags)
 
 def getEnvironmentVars(self):
@@ -605,11 +607,11 @@
 pkg = self.getPackage(dep[name], dep[version], 
 package.backend, True)
 except PackageNotFoundError, e:
-pkg = Library(dep[name], dep[version])
 try:
-PkgConfig.resolve(dep[name], dep[version])
+pkg = PkgConfig.resolve(dep[name], dep[version])
 pkg.resolved = True
 except PkgConfigModuleNotFound:
+pkg = Library(dep[name], dep[version])
 if Config.get(UseLibrarySearch):
 if Environment.hasLibrary(library):
 pkg.resolved = True

Modified: installit/trunk/tools/shell.py
===
--- installit/trunk/tools/shell.py  2006-09-04 19:11:27 UTC (rev 23076)
+++ installit/trunk/tools/shell.py  2006-09-04 19:13:35 UTC (rev 23077)
@@ -81,6 +81,8 @@
 #print CPPFLAGS=%s % env[CPPFLAGS]
 #print
 
+print env[LDFLAGS]
+
 # Start subprocess
 process = subprocess.Popen(self.command, bufsize=1, shell=True, 
 stdout=subprocess.PIPE, stderr=subprocess.STDOUT, 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23094 - in installit/trunk: . backends tools

2006-09-06 Thread Jannis Pohlmann

Author: jannis
Date: 2006-09-06 17:03:51 + (Wed, 06 Sep 2006)
New Revision: 23094

Modified:
   installit/trunk/ChangeLog
   installit/trunk/backends/Source.py
   installit/trunk/tools/env.py
   installit/trunk/tools/shell.py
Log:
* tools/env.py: Log linking errors to i2t.log. Use reversed prefix
  history for all path expansions (so that the latest used prefix is
  first in all environment variables).
* tools/shell.py: Prepend, not append custom environment variables to
  the command environment.
* backends/Source.py: Fix manual program and library resolving (lambda's
  caused some problems with wrong variables being passed). Append
  installation prefix of a package to the prefix history when
  installation was successful. 

Modified: installit/trunk/ChangeLog
===
--- installit/trunk/ChangeLog   2006-09-06 16:57:10 UTC (rev 23093)
+++ installit/trunk/ChangeLog   2006-09-06 17:03:51 UTC (rev 23094)
@@ -1,3 +1,15 @@
+2006-09-06 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * tools/env.py: Log linking errors to i2t.log. Use reversed prefix
+ history for all path expansions (so that the latest used prefix is
+ first in all environment variables).
+   * tools/shell.py: Prepend, not append custom environment variables to
+ the command environment.
+   * backends/Source.py: Fix manual program and library resolving (lambda's
+ caused some problems with wrong variables being passed). Append
+ installation prefix of a package to the prefix history when
+ installation was successful. 
+
 2006-09-04 Jannis Pohlmann [EMAIL PROTECTED]
 
* tools/pkgconfig.py: Move getCompilerFlags and getLinkerFlags methods 

Modified: installit/trunk/backends/Source.py
===
--- installit/trunk/backends/Source.py  2006-09-06 16:57:10 UTC (rev 23093)
+++ installit/trunk/backends/Source.py  2006-09-06 17:03:51 UTC (rev 23094)
@@ -663,9 +663,6 @@
 # Sets of unresolved programs/libraries
 self.programs = set()
 self.libraries = set()
-
-self.locations = dict()
-self.statusButtons = dict()
 
 def activate(self, wizard):
 SourceWizardPage.activate(self, wizard)
@@ -680,9 +677,6 @@
 self.box.add(container)
 container.show()
 
-self.locations.clear()
-self.statusButtons.clear()
-
 # Determine programs this package depends on
 self.programs = self.package.dependencies.programs
 
@@ -709,8 +703,9 @@
 
 # Status button
 status = gtk.Button()
-status.connect(clicked, lambda button:
-self._locateProgram(program))
+status.connect(clicked, self._locateProgram)
+status.program = program
+status.status = status
 status.set_relief(gtk.RELIEF_NONE)
 if program.isResolved():
 status.set_image(gtk.image_new_from_stock(gtk.STOCK_YES,
@@ -721,8 +716,6 @@
 hbox.pack_start(status, False, True, 0)
 status.show()
 
-self.statusButtons[program] = status
-
 # Program label
 label = gtk.Label()
 label.set_markup(b%s/b % program.name)
@@ -733,8 +726,9 @@
 # Locate manually via file chooser
 if not program.isResolved():
 button = gtk.Button(_(Locate manually...))
-button.connect(clicked, lambda button:
-self._locateProgram(program))
+button.connect(clicked, self._locateProgram)
+button.program = program
+button.status = status
 button.set_image(gtk.image_new_from_stock(gtk.STOCK_FIND,
 gtk.ICON_SIZE_BUTTON))
 table.attach(button, 1, 2, i, i+1, gtk.SHRINK)
@@ -768,8 +762,9 @@
 
 # Status button
 status = gtk.Button()
-status.connect(clicked, lambda button:
-self._locateLibrary(library))
+status.connect(clicked, self._locateLibrary)
+status.library = library
+status.status = status
 status.set_relief(gtk.RELIEF_NONE)
 if isinstance(library, Package) or \
isinstance(library, PkgConfigModule) or \
@@ -782,8 +777,6 @@
 hbox.pack_start(status, False, True, 0)
 status.show()
 
-self.statusButtons[library] = status
-
 # Library label
 label = gtk.Label()
 label.set_markup(b%s/b % library.name)
@@ -796,8 +789,9

[Xfce4-commits] r23213 - libfrap/trunk/libfrap/menu

2006-09-26 Thread Jannis Pohlmann

Author: jannis
Date: 2006-09-26 15:28:07 + (Tue, 26 Sep 2006)
New Revision: 23213

Added:
   libfrap/trunk/libfrap/menu/frap-menu-or-rules.c
   libfrap/trunk/libfrap/menu/frap-menu-or-rules.h
   libfrap/trunk/libfrap/menu/frap-menu-rules.c
   libfrap/trunk/libfrap/menu/frap-menu-rules.h
   libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c
   libfrap/trunk/libfrap/menu/frap-menu-standard-rules.h
Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/Makefile.am
   libfrap/trunk/libfrap/menu/frap-menu.c
Log:
* Makefile.am, frap-menu-rules.{c.h}: FrapMenuRulesIface interface 
added.
  This interface will be used for the And, Or and Not elements.
  It provides virtual methods to add filename and category rules as
  well as FrapMenuRules objects (as the mentioned elements may be
  nested). It also provides a virtual method for matching menu items
  (essentially, desktop entries) against these rules.
* Makefile.am, frap-menu-standard-rules.{c,h}: Implemented a base
  class for all rule sets (And, Or, Not). It implements the add
  methods of FrapMenuRulesIface. The responsibility of implementing the
  match method is forwarded to subclasses of FrapMenuStandardRules.
* Makefile.am, frap-menu-or-rules.{c,h}: This first implementation of
  the FrapMenuRulesIface will be used for matching items against Or,
  Include and Exclude elements. The match method is not implemented
  yet, though.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-09-26 12:46:32 UTC (rev 
23212)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-09-26 15:28:07 UTC (rev 
23213)
@@ -1,3 +1,20 @@
+2006-09-26 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * Makefile.am, frap-menu-rules.{c.h}: FrapMenuRulesIface interface 
added.
+ This interface will be used for the And, Or and Not elements.
+ It provides virtual methods to add filename and category rules as
+ well as FrapMenuRules objects (as the mentioned elements may be
+ nested). It also provides a virtual method for matching menu items
+ (essentially, desktop entries) against these rules.
+   * Makefile.am, frap-menu-standard-rules.{c,h}: Implemented a base
+ class for all rule sets (And, Or, Not). It implements the add
+ methods of FrapMenuRulesIface. The responsibility of implementing the
+ match method is forwarded to subclasses of FrapMenuStandardRules.
+   * Makefile.am, frap-menu-or-rules.{c,h}: This first implementation of
+ the FrapMenuRulesIface will be used for matching items against Or,
+ Include and Exclude elements. The match method is not implemented
+ yet, though.
+
 2006-07-28 Jannis Pohlmann [EMAIL PROTECTED]
 
* Import as libfrapmenu into the newly created libfrap development

Modified: libfrap/trunk/libfrap/menu/Makefile.am
===
--- libfrap/trunk/libfrap/menu/Makefile.am  2006-09-26 12:46:32 UTC (rev 
23212)
+++ libfrap/trunk/libfrap/menu/Makefile.am  2006-09-26 15:28:07 UTC (rev 
23213)
@@ -4,12 +4,18 @@
 
 libfrapmenu_la_SOURCES =   \
frap-menu.c \
-   frap-menu-directory.c
+   frap-menu-directory.c   \
+   frap-menu-rules.c   \
+   frap-menu-standard-rules.c  \
+   frap-menu-or-rules.c
 
 noinst_HEADERS =   \
libfrapmenu.h   \
frap-menu.h \
-   frap-menu-directory.h   
+   frap-menu-directory.h   \
+   frap-menu-rules.h   \
+   frap-menu-standard-rules.h  \
+   frap-menu-or-rules.h
 
 INCLUDES = \
$(GLIB_CFLAGS)  \

Added: libfrap/trunk/libfrap/menu/frap-menu-or-rules.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-or-rules.c 
(rev 0)
+++ libfrap/trunk/libfrap/menu/frap-menu-or-rules.c 2006-09-26 15:28:07 UTC 
(rev 23213)
@@ -0,0 +1,124 @@
+/* $Id$ */
+/* vi:set expandtab sw=2 sts=2: */
+/*-
+ * Copyright (c) 2006 Jannis Pohlmann [EMAIL PROTECTED

[Xfce4-commits] r23219 - libfrap/trunk

2006-09-27 Thread Jannis Pohlmann

Author: jannis
Date: 2006-09-27 22:06:24 + (Wed, 27 Sep 2006)
New Revision: 23219

Modified:
   libfrap/trunk/ChangeLog
   libfrap/trunk/configure.in.in
Log:
* configure.in.in: Menu test directories added to the Makefile 
  generation.

Modified: libfrap/trunk/ChangeLog
===
--- libfrap/trunk/ChangeLog 2006-09-27 22:05:16 UTC (rev 23218)
+++ libfrap/trunk/ChangeLog 2006-09-27 22:06:24 UTC (rev 23219)
@@ -1,3 +1,8 @@
+2006-09-27 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * configure.in.in: Menu test directories added to the Makefile 
+ generation.
+
 2006-08-02 Jannis Pohlmann [EMAIL PROTECTED]
 
* configure.in.in: Added libxfcegui4 to the dependencies.

Modified: libfrap/trunk/configure.in.in
===
--- libfrap/trunk/configure.in.in   2006-09-27 22:05:16 UTC (rev 23218)
+++ libfrap/trunk/configure.in.in   2006-09-27 22:06:24 UTC (rev 23219)
@@ -120,5 +120,7 @@
 libfrap/Makefile
 libfrap/icon-entry/Makefile
 libfrap/menu/Makefile
+libfrap/menu/tests/Makefile
+libfrap/menu/tests/data/Makefile
 libfrap/appfinder/Makefile
 ])

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23226 - in libfrap/trunk/libfrap/menu: . tests

2006-09-28 Thread Jannis Pohlmann

Author: jannis
Date: 2006-09-28 11:50:37 + (Thu, 28 Sep 2006)
New Revision: 23226

Added:
   libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
   libfrap/trunk/libfrap/menu/tests/test-or-rules.c
Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/frap-menu-item.c
   libfrap/trunk/libfrap/menu/frap-menu-or-rules.c
   libfrap/trunk/libfrap/menu/frap-menu-or-rules.h
   libfrap/trunk/libfrap/menu/frap-menu-rules.c
   libfrap/trunk/libfrap/menu/frap-menu-rules.h
   libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c
   libfrap/trunk/libfrap/menu/frap-menu-standard-rules.h
   libfrap/trunk/libfrap/menu/frap-menu.c
   libfrap/trunk/libfrap/menu/tests/Makefile.am
Log:
* tests/Makefile.am, tests/test-or-rules.c,
  tests/test-display-root-menu.c: Added two additional test programs,
  one for testing Or rules and one for displaying the root menu.
* frap-menu-rules.{c,h}: Make methods for adding rules to a
  FrapMenuRules object public. Add G_TYPE_OBJECT prerequisite to the 
  FrapMenuRules interface.
* frap-menu-standard-rules.{c,h}: Add include property. This will
  probably be moved to the FrapMenuRules interface later. Fix abstract
  -match method.
* frap-menu-or-rules.{c,h}: Add frap_menu_or_rules_new method. Make
  FrapMenuOrRules a FRAP_TYPE_MENU_STANDARD_RULES type. Implement match
  method (does not yet check the desktop file id, because it's not clear
  how that is going to be handled).
* frap-menu-item.c: Implement frap_menu_item_add_categories method.
* frap-menu.c: Implement parsing of Include, Exclude, Or,
  Filename and Category elements. And and Not are still missing.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-09-28 11:26:25 UTC (rev 
23225)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-09-28 11:50:37 UTC (rev 
23226)
@@ -1,5 +1,24 @@
 2006-09-28 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * tests/Makefile.am, tests/test-or-rules.c,
+ tests/test-display-root-menu.c: Added two additional test programs,
+ one for testing Or rules and one for displaying the root menu.
+   * frap-menu-rules.{c,h}: Make methods for adding rules to a
+ FrapMenuRules object public. Add G_TYPE_OBJECT prerequisite to the 
+ FrapMenuRules interface.
+   * frap-menu-standard-rules.{c,h}: Add include property. This will
+ probably be moved to the FrapMenuRules interface later. Fix abstract
+ -match method.
+   * frap-menu-or-rules.{c,h}: Add frap_menu_or_rules_new method. Make
+ FrapMenuOrRules a FRAP_TYPE_MENU_STANDARD_RULES type. Implement match
+ method (does not yet check the desktop file id, because it's not clear
+ how that is going to be handled).
+   * frap-menu-item.c: Implement frap_menu_item_add_categories method.
+   * frap-menu.c: Implement parsing of Include, Exclude, Or,
+ Filename and Category elements. And and Not are still missing.
+
+2006-09-28 Jannis Pohlmann [EMAIL PROTECTED]
+
* tests/data/Makefile.am: Update desktop entry filename. I'm using 
  xfmedia.desktop as it provides everything I need to test (positively).
 

Modified: libfrap/trunk/libfrap/menu/frap-menu-item.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item.c 2006-09-28 11:26:25 UTC (rev 
23225)
+++ libfrap/trunk/libfrap/menu/frap-menu-item.c 2006-09-28 11:50:37 UTC (rev 
23226)
@@ -438,7 +438,7 @@
   for (mt = str_list; *mt != NULL; ++mt)
 {
   if (**mt != '\0')
-categories = g_list_append (categories, g_strdup (*mt));
+categories = g_list_prepend (categories, g_strdup (*mt));
 }
 
   /* Free list */  
@@ -528,6 +528,21 @@
 frap_menu_item_set_categories (FrapMenuItem *item,
GList*categories)
 {
+  g_return_if_fail (FRAP_IS_MENU_ITEM (item));
+
+  if (G_UNLIKELY (item-priv-categories != NULL))
+{
+  /* Abort if lists are equal */
+  if (G_UNLIKELY (item-priv-categories == categories))
+return;
+
+  /* Free old list */
+  g_list_foreach (item-priv-categories, (GFunc) g_free, NULL);
+  g_list_free (item-priv-categories);
+}
+
+  /* Assign new list */
+  item-priv-categories = categories;
 }
 
 

Modified: libfrap/trunk/libfrap/menu/frap-menu-or-rules.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-or-rules.c 2006-09-28 11:26:25 UTC 
(rev 23225)
+++ libfrap/trunk/libfrap/menu/frap-menu-or-rules.c 2006-09-28 11:50:37 UTC 
(rev 23226)
@@ -23,8 +23,10 @@
 #include config.h
 #endif
 
+#include frap-menu-rules.h
 #include frap-menu

[Xfce4-commits] r23234 - libfrap/trunk/libfrap/menu

2006-09-28 Thread Jannis Pohlmann

Author: jannis
Date: 2006-09-28 18:58:16 + (Thu, 28 Sep 2006)
New Revision: 23234

Modified:
   libfrap/trunk/libfrap/menu/frap-menu-not-rules.c
Log:
Indentation cleanup

Modified: libfrap/trunk/libfrap/menu/frap-menu-not-rules.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-not-rules.c2006-09-28 18:56:19 UTC 
(rev 23233)
+++ libfrap/trunk/libfrap/menu/frap-menu-not-rules.c2006-09-28 18:58:16 UTC 
(rev 23234)
@@ -34,7 +34,7 @@
 static void frap_menu_not_rules_init   (FrapMenuNotRules   
*rules);
 static void frap_menu_not_rules_finalize   (GObject   
*object);
 static gboolean frap_menu_not_rules_match  (FrapMenuStandardRules 
*rules,
-   const gchar   
*item);
+const gchar   
*item);
 
 
 
@@ -128,7 +128,7 @@
 
 static gboolean
 frap_menu_not_rules_match (FrapMenuStandardRules *rules,
-  const gchar   *item)
+   const gchar   *item)
 {
   GList*category;
   GList*rule;

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23244 - libfrap/trunk/libfrap/menu

2006-09-30 Thread Jannis Pohlmann

Author: jannis
Date: 2006-09-30 07:40:04 + (Sat, 30 Sep 2006)
New Revision: 23244

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/STATUS
Log:
* STATUS: Status updated.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-09-30 07:32:33 UTC (rev 
23243)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-09-30 07:40:04 UTC (rev 
23244)
@@ -1,5 +1,9 @@
 2006-09-30 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * STATUS: Status updated.
+
+2006-09-30 Jannis Pohlmann [EMAIL PROTECTED]
+
* frap-menu.h, frap-menu.c: Make get_rules and add_rule static methods 
  in frap-menu.c. Implemented parsing of all include/exclude rule
  elements. get_app_dirs returns all application directories from the

Modified: libfrap/trunk/libfrap/menu/STATUS
===
--- libfrap/trunk/libfrap/menu/STATUS   2006-09-30 07:32:33 UTC (rev 23243)
+++ libfrap/trunk/libfrap/menu/STATUS   2006-09-30 07:40:04 UTC (rev 23244)
@@ -31,7 +31,7 @@
   
   [x] Deleted and NotDeleted
 
-  [ ] Include 
+  [x] Include 
 
 TODO: Recursively load elements (using a stack).
 
@@ -44,19 +44,22 @@
  category|filename
category|filename
 
-  [ ] Exclude
+  [x] Exclude
 
-  [ ] Filename
+  [-] Filename
 
-  [ ] Category
+TODO: Implement desktop-file id comparison in the match methods 
+of all rules.
 
+  [x] Category
+
   [ ] All
 
-  [ ] And
+  [x] And
 
-  [ ] Or
+  [x] Or
 
-  [ ] Not
+  [x] Not
 
   [ ] MergeFile
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23245 - libfrap/trunk/libfrap/menu

2006-09-30 Thread Jannis Pohlmann

Author: jannis
Date: 2006-09-30 07:40:39 + (Sat, 30 Sep 2006)
New Revision: 23245

Modified:
   libfrap/trunk/libfrap/menu/frap-menu-not-rules.c
   libfrap/trunk/libfrap/menu/frap-menu-not-rules.h
Log:
SVN keywords added

Modified: libfrap/trunk/libfrap/menu/frap-menu-not-rules.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-not-rules.c2006-09-30 07:40:04 UTC 
(rev 23244)
+++ libfrap/trunk/libfrap/menu/frap-menu-not-rules.c2006-09-30 07:40:39 UTC 
(rev 23245)
@@ -1,4 +1,4 @@
-/* $Id: frap-menu-and-rules.c 23232 2006-09-28 18:39:42Z jannis $ */
+/* $Id$ */
 /* vi:set expandtab sw=2 sts=2: */
 /*-
  * Copyright (c) 2006 Jannis Pohlmann [EMAIL PROTECTED]


Property changes on: libfrap/trunk/libfrap/menu/frap-menu-not-rules.c
___
Name: svn:keywords
   + Id Author Date Revision

Modified: libfrap/trunk/libfrap/menu/frap-menu-not-rules.h
===
--- libfrap/trunk/libfrap/menu/frap-menu-not-rules.h2006-09-30 07:40:04 UTC 
(rev 23244)
+++ libfrap/trunk/libfrap/menu/frap-menu-not-rules.h2006-09-30 07:40:39 UTC 
(rev 23245)
@@ -1,4 +1,4 @@
-/* $Id: frap-menu-and-rules.h 23232 2006-09-28 18:39:42Z jannis $ */
+/* $Id$ */
 /* vi:set expandtab sw=2 sts=2: */
 /*-
  * Copyright (c) 2006 Jannis Pohlmann [EMAIL PROTECTED]


Property changes on: libfrap/trunk/libfrap/menu/frap-menu-not-rules.h
___
Name: svn:keywords
   + Id Author Date Revision

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23256 - in libfrap/trunk/libfrap/menu: . tests

2006-10-01 Thread Jannis Pohlmann

Author: jannis
Date: 2006-10-01 19:54:23 + (Sun, 01 Oct 2006)
New Revision: 23256

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/STATUS
   libfrap/trunk/libfrap/menu/frap-menu-and-rules.c
   libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
   libfrap/trunk/libfrap/menu/frap-menu-not-rules.c
   libfrap/trunk/libfrap/menu/frap-menu-or-rules.c
   libfrap/trunk/libfrap/menu/tests/test-and-rules.c
   libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
   libfrap/trunk/libfrap/menu/tests/test-not-rules.c
   libfrap/trunk/libfrap/menu/tests/test-or-rules.c
Log:
* frap-menu-or-rules.c, frap-menu-and-rules.c, frap-menu-not-rules.c:
  Improve match functions and implement desktop file id matching.
* Fix several compiler warnings in some of the files.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-10-01 13:49:56 UTC (rev 
23255)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-10-01 19:54:23 UTC (rev 
23256)
@@ -1,3 +1,9 @@
+2006-10-01 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * frap-menu-or-rules.c, frap-menu-and-rules.c, frap-menu-not-rules.c:
+ Improve match functions and implement desktop file id matching.
+   * Fix several compiler warnings in some of the files.
+
 2006-09-30 Jannis Pohlmann [EMAIL PROTECTED]
 
* STATUS: Status updated.

Modified: libfrap/trunk/libfrap/menu/STATUS
===
--- libfrap/trunk/libfrap/menu/STATUS   2006-10-01 13:49:56 UTC (rev 23255)
+++ libfrap/trunk/libfrap/menu/STATUS   2006-10-01 19:54:23 UTC (rev 23256)
@@ -46,11 +46,8 @@
 
   [x] Exclude
 
-  [-] Filename
+  [x] Filename
 
-TODO: Implement desktop-file id comparison in the match methods 
-of all rules.
-
   [x] Category
 
   [ ] All

Modified: libfrap/trunk/libfrap/menu/frap-menu-and-rules.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-and-rules.c2006-10-01 13:49:56 UTC 
(rev 23255)
+++ libfrap/trunk/libfrap/menu/frap-menu-and-rules.c2006-10-01 19:54:23 UTC 
(rev 23256)
@@ -130,23 +130,22 @@
 frap_menu_and_rules_match (FrapMenuStandardRules *rules,
FrapMenuItem  *item)
 {
-  GList *category;
   GList *iter;
 
   g_return_val_if_fail (FRAP_IS_MENU_STANDARD_RULES (rules), FALSE);
   g_return_val_if_fail (FRAP_IS_MENU_ITEM (item), FALSE);
 
-  /* Compare item filename against filename rules */
-  /* TODO This should be a match against the Desktop-File Id. It's not yet sure
-   * how this will be modelled in FrapMenu! */
+  /* Compare desktop id's */
+  for (iter = rules-filenames; iter != NULL; iter = g_list_next (iter))
+{
+  if (g_utf8_collate (frap_menu_item_get_desktop_id (item), iter-data) != 
0)
+return FALSE;
+}
 
-  category = rules-categories;
-  while (category != NULL)
+  for (iter = rules-categories; iter != NULL; iter = g_list_next (iter))
 {
-  if (!g_list_find_custom (frap_menu_item_get_categories (item), 
category-data, g_utf8_collate))
+  if (!g_list_find_custom (frap_menu_item_get_categories (item), 
iter-data, (GCompareFunc) g_utf8_collate))
 return FALSE;
-  
-  category = g_list_next (category);
 }
 
   /* Match item against nested rules */
@@ -154,8 +153,6 @@
 {
   if (!frap_menu_rules_match (FRAP_MENU_RULES (iter-data), item))
 return FALSE;
-
-  category = g_list_next (category);
 }
 
   return TRUE;

Modified: libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-10-01 13:49:56 UTC 
(rev 23255)
+++ libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-10-01 19:54:23 UTC 
(rev 23256)
@@ -191,7 +191,7 @@
   g_return_if_fail (FRAP_IS_MENU_ITEM_POOL (pool));
 
   /* If rules are empty, remove all items */
-  if (G_UNLIKELY (g_list_length (rules) == 0))
+  if (G_UNLIKELY (g_slist_length (rules) == 0))
 g_hash_table_remove_all (pool-priv-items);
   else 
{

Modified: libfrap/trunk/libfrap/menu/frap-menu-not-rules.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-not-rules.c2006-10-01 13:49:56 UTC 
(rev 23255)
+++ libfrap/trunk/libfrap/menu/frap-menu-not-rules.c2006-10-01 19:54:23 UTC 
(rev 23256)
@@ -130,24 +130,23 @@
 frap_menu_not_rules_match (FrapMenuStandardRules *rules,
FrapMenuItem  *item)
 {
-  GList*category;
   GList*iter;
   gboolean  matches = TRUE;
 
   g_return_val_if_fail (FRAP_IS_MENU_STANDARD_RULES (rules), FALSE);
   g_return_val_if_fail (FRAP_IS_MENU_ITEM (item), FALSE);
 
-  /* Compare item filename against filename rules */
-  /* TODO

[Xfce4-commits] r23275 - in libfrap/trunk/libfrap/menu: . tests

2006-10-03 Thread Jannis Pohlmann

Author: jannis
Date: 2006-10-03 19:26:37 + (Tue, 03 Oct 2006)
New Revision: 23275

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/STATUS
   libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
Log:
* STATUS: Updated the implementation status.
* tests/test-display-root-menu.c: Improved loading / displaying of
  application icons. It's still not perfect, but much better than
  before.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-10-03 16:34:36 UTC (rev 
23274)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-10-03 19:26:37 UTC (rev 
23275)
@@ -1,3 +1,10 @@
+2006-10-03 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * STATUS: Updated the implementation status.
+   * tests/test-display-root-menu.c: Improved loading / displaying of
+ application icons. It's still not perfect, but much better than
+ before.
+
 2006-10-01 Jannis Pohlmann [EMAIL PROTECTED]
 
* frap-menu-or-rules.c, frap-menu-and-rules.c, frap-menu-not-rules.c:

Modified: libfrap/trunk/libfrap/menu/STATUS
===
--- libfrap/trunk/libfrap/menu/STATUS   2006-10-03 16:34:36 UTC (rev 23274)
+++ libfrap/trunk/libfrap/menu/STATUS   2006-10-03 19:26:37 UTC (rev 23275)
@@ -20,10 +20,7 @@
 
   [x] DefaultDirectoryDirs
 
-  [-] Name
-The Name is parsed and implemented as a property of XfceMenu
-but there are no functions yet to parse menu paths, such as
-/Applications/Graphics.
+  [x] Name
 
   [x] Directory
 

Modified: libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
===
--- libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c   2006-10-03 
16:34:36 UTC (rev 23274)
+++ libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c   2006-10-03 
19:26:37 UTC (rev 23275)
@@ -32,6 +32,10 @@
 
 
 
+#define ICON_SIZE 22
+
+
+
 static FrapMenu  *root = NULL;
 static GtkWidget *window = NULL;
 
@@ -59,6 +63,76 @@
 
 
 
+GdkPixbuf*
+create_icon_for_item (FrapMenuItem *item)
+{
+  GdkPixbuf   *pixbuf = NULL;
+  const gchar *icon_name = frap_menu_item_get_icon_name (item);
+  const gchar *item_name = frap_menu_item_get_name (item);
+
+  if (icon_name == NULL)
+return NULL;
+
+  /* Check if we have an absolute filename */
+  if (g_path_is_absolute (icon_name))
+{
+  pixbuf = gdk_pixbuf_new_from_file_at_scale (icon_name, ICON_SIZE, 
ICON_SIZE, TRUE, NULL);
+}
+  else
+{
+  /* Try to directly load the icon name first */
+  pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), 
icon_name, ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+
+  /* Afterwards try removing the filename extension if there is one */
+  if (!pixbuf)
+{
+  /* Get basename (just to be sure) */
+  gchar *basename = g_path_get_basename (icon_name);
+
+  /* Determine position of the extension */
+  gchar *extension = g_utf8_strrchr (basename, -1, '.');
+
+  /* Make sure we (probably) found an extension */
+  if (extension != NULL)
+{
+  /* Remove extension */
+  gchar *new_icon_name = g_utf8_strncpy (icon_name, basename, 
g_utf8_strlen (basename, -1) - g_utf8_strlen (extension, -1));
+
+  /* Try to load the pixbuf using the new icon name */
+  pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default 
(), new_icon_name, ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+
+  /* Free new icon name */
+  g_free (new_icon_name);
+}
+
+  /* Free basename */
+  g_free (basename);
+}
+
+  /* Finally, we try to load the icon by lowercase item name */
+  if (!pixbuf  item_name != NULL)
+{
+  gchar *new_item_name = g_utf8_strdown (item_name, -1);
+
+  pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), 
new_item_name, ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+
+  g_free (new_item_name);
+}
+}
+
+  /* Scale pixbuf (if needed) */
+  if (pixbuf)
+{
+  GdkPixbuf *old = pixbuf;
+  pixbuf = gdk_pixbuf_scale_simple (old, ICON_SIZE, ICON_SIZE, 
GDK_INTERP_BILINEAR);
+  gdk_pixbuf_unref (old);
+}
+
+  return pixbuf;
+}
+
+
+
 void
 create_item_widgets_for_menu (const gchar  *desktop_id,
   FrapMenuItem *item,
@@ -66,9 +140,16 @@
 {
   GtkWidget *menu_item;
   GtkWidget *image;
+  GdkPixbuf *pixbuf;
 
-  image = gtk_image_new_from_icon_name (frap_menu_item_get_icon_name (item), 
GTK_ICON_SIZE_MENU);
+  /* Try to load the image */
+  pixbuf = create_icon_for_item (item);
 
+  if (pixbuf)
+image = gtk_image_new_from_pixbuf (pixbuf);
+  else
+image = gtk_image_new_from_icon_name (applications

[Xfce4-commits] r23280 - in libfrap/trunk/libfrap/menu: . tests

2006-10-04 Thread Jannis Pohlmann

Author: jannis
Date: 2006-10-04 16:33:23 + (Wed, 04 Oct 2006)
New Revision: 23280

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
   libfrap/trunk/libfrap/menu/frap-menu-item-pool.h
   libfrap/trunk/libfrap/menu/frap-menu-item.c
   libfrap/trunk/libfrap/menu/frap-menu.c
   libfrap/trunk/libfrap/menu/tests/Makefile.am
   libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
Log:
* frap-menu-item-pool.c: Add frap_menu_item_pool_get_empty function.
* tests/Makefile.am, tests/test-display-root-menu.c: Link against
  libxfcegui4. Do not display empty menus. Improve icon loading again
  and execute item command when menu items are clicked.
* frap-menu-item.c: Leave Exec/TryExec command as is (do not modify the
  url(s)/file(s) parameter. 
* frap-menu.c: Respect OnlyAllocated / item when resolve menu items.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 10:25:00 UTC (rev 
23279)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 16:33:23 UTC (rev 
23280)
@@ -1,3 +1,13 @@
+2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * frap-menu-item-pool.c: Add frap_menu_item_pool_get_empty function.
+   * tests/Makefile.am, tests/test-display-root-menu.c: Link against
+ libxfcegui4. Do not display empty menus. Improve icon loading again
+ and execute item command when menu items are clicked.
+   * frap-menu-item.c: Leave Exec/TryExec command as is (do not modify the
+ url(s)/file(s) parameter. 
+   * frap-menu.c: Respect OnlyAllocated / item when resolve menu items.
+
 2006-10-03 Jannis Pohlmann [EMAIL PROTECTED]
 
* STATUS: Updated the implementation status.

Modified: libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-10-04 10:25:00 UTC 
(rev 23279)
+++ libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-10-04 16:33:23 UTC 
(rev 23280)
@@ -152,6 +152,9 @@
   /* Insert into the hash table and remove old item (if any) */
   g_hash_table_replace (pool-priv-items, g_strdup 
(frap_menu_item_get_desktop_id (item)), item);
 
+  /* Set allocation state of the item */
+  frap_menu_item_set_allocated (item, TRUE);
+
   /* Grab a reference on the item */
   g_object_ref (G_OBJECT (item));
 }
@@ -226,3 +229,12 @@
   else
 return frap_menu_rules_match (rules, item);
 }
+
+
+
+gboolean
+frap_menu_item_pool_get_empty (FrapMenuItemPool *pool)
+{
+  g_return_val_if_fail (FRAP_IS_MENU_ITEM_POOL (pool), TRUE);
+  return (g_hash_table_size (pool-priv-items) == 0);
+}

Modified: libfrap/trunk/libfrap/menu/frap-menu-item-pool.h
===
--- libfrap/trunk/libfrap/menu/frap-menu-item-pool.h2006-10-04 10:25:00 UTC 
(rev 23279)
+++ libfrap/trunk/libfrap/menu/frap-menu-item-pool.h2006-10-04 16:33:23 UTC 
(rev 23280)
@@ -54,6 +54,7 @@
gpointer  
user_data);
 void  frap_menu_item_pool_apply_rules (FrapMenuItemPool *pool,
GSList   *rules);
+gboolean  frap_menu_item_pool_get_empty   (FrapMenuItemPool *pool);
 
 G_END_DECLS;
 

Modified: libfrap/trunk/libfrap/menu/frap-menu-item.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item.c 2006-10-04 10:25:00 UTC (rev 
23279)
+++ libfrap/trunk/libfrap/menu/frap-menu-item.c 2006-10-04 16:33:23 UTC (rev 
23280)
@@ -473,11 +473,14 @@
   /* Validate Name and Exec fields */
   if (G_LIKELY (exec != NULL  name != NULL  g_utf8_validate (name, -1, 
NULL)))
 {
+#if 0
   /* Append %f to the exec command if the application hasn't set anything 
else */
   if (strstr (exec, %f) == NULL  strstr (exec, %F) == NULL  strstr 
(exec, %u) == NULL  strstr (exec, %U) == NULL)
-command = g_strconcat (exec, %f, NULL);
+command = g_strconcat (exec,  %f, NULL);
   else
 command = g_strdup (exec);
+#endif
+  command = g_strdup (exec);
 
   /* Determine other application properties */
   terminal = xfce_rc_read_bool_entry (rc, Terminal, FALSE);

Modified: libfrap/trunk/libfrap/menu/frap-menu.c
===
--- libfrap/trunk/libfrap/menu/frap-menu.c  2006-10-04 10:25:00 UTC (rev 
23279)
+++ libfrap/trunk/libfrap/menu/frap-menu.c  2006-10-04 16:33:23 UTC (rev 
23280)
@@ -1750,11 +1750,16 @@
 
   if (G_LIKELY (item != NULL))
 {
-  /* Assign the desktop id to the item */
-  frap_menu_item_set_desktop_id (item, desktop_id);
+  /* Only include item if menu not only

[Xfce4-commits] r23281 - libfrap/trunk/libfrap/menu

2006-10-04 Thread Jannis Pohlmann

Author: jannis
Date: 2006-10-04 16:49:36 + (Wed, 04 Oct 2006)
New Revision: 23281

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/frap-menu.c
Log:
* frap-menu.c: Err, this fixes the OnlyUnallocated / check when
  resolving items.
* frap-menu.c: Respect OnlyUnallocated / item when resolve menu items.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 16:33:23 UTC (rev 
23280)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 16:49:36 UTC (rev 
23281)
@@ -1,12 +1,17 @@
 2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * frap-menu.c: Err, this fixes the OnlyUnallocated / check when
+ resolving items.
+
+2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]
+
* frap-menu-item-pool.c: Add frap_menu_item_pool_get_empty function.
* tests/Makefile.am, tests/test-display-root-menu.c: Link against
  libxfcegui4. Do not display empty menus. Improve icon loading again
  and execute item command when menu items are clicked.
* frap-menu-item.c: Leave Exec/TryExec command as is (do not modify the
  url(s)/file(s) parameter. 
-   * frap-menu.c: Respect OnlyAllocated / item when resolve menu items.
+   * frap-menu.c: Respect OnlyUnallocated / item when resolve menu items.
 
 2006-10-03 Jannis Pohlmann [EMAIL PROTECTED]
 

Modified: libfrap/trunk/libfrap/menu/frap-menu.c
===
--- libfrap/trunk/libfrap/menu/frap-menu.c  2006-10-04 16:33:23 UTC (rev 
23280)
+++ libfrap/trunk/libfrap/menu/frap-menu.c  2006-10-04 16:49:36 UTC (rev 
23281)
@@ -1752,7 +1752,7 @@
 {
   /* Only include item if menu not only includes unallocated items
* or if the item is not allocated yet */
-  if (!menu-priv-only_unallocated || 
frap_menu_item_get_allocated (item))
+  if (!menu-priv-only_unallocated || 
!frap_menu_item_get_allocated (item))
 {
   /* Assign the desktop id to the item */
   frap_menu_item_set_desktop_id (item, desktop_id);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23282 - libfrap/trunk/libfrap/menu

2006-10-04 Thread Jannis Pohlmann

Author: jannis
Date: 2006-10-04 17:05:57 + (Wed, 04 Oct 2006)
New Revision: 23282

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/frap-menu-item.c
Log:
* frap-menu-item.c: Make property assignment more clean.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 16:49:36 UTC (rev 
23281)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 17:05:57 UTC (rev 
23282)
@@ -1,5 +1,9 @@
 2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * frap-menu-item.c: Make property assignment more clean.
+
+2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]
+
* frap-menu.c: Err, this fixes the OnlyUnallocated / check when
  resolving items.
 

Modified: libfrap/trunk/libfrap/menu/frap-menu-item.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item.c 2006-10-04 16:49:36 UTC (rev 
23281)
+++ libfrap/trunk/libfrap/menu/frap-menu-item.c 2006-10-04 17:05:57 UTC (rev 
23282)
@@ -288,6 +288,12 @@
 frap_menu_item_init (FrapMenuItem *item)
 {
   item-priv = FRAP_MENU_ITEM_GET_PRIVATE (item);
+  item-priv-icon_name = NULL;
+  item-priv-name = NULL;
+  item-priv-command = NULL;
+  item-priv-desktop_id = NULL;
+  item-priv-filename = NULL;
+  item-priv-categories = NULL;
 }
 
 
@@ -552,7 +558,8 @@
 }
 
   /* Assign the new desktop_id */
-  item-priv-desktop_id = g_strdup (desktop_id);
+  if (G_LIKELY (desktop_id != NULL))
+item-priv-desktop_id = g_strdup (desktop_id);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), desktop_id);
@@ -589,7 +596,8 @@
 }
 
   /* Assign the new filename */
-  item-priv-filename = g_strdup (filename);
+  if (G_LIKELY (filename != NULL))
+item-priv-filename = g_strdup (filename);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), filename);
@@ -657,7 +665,8 @@
 }
 
   /* Assign new command */
-  item-priv-command = g_strdup (command);
+  if (G_LIKELY (command != NULL))
+item-priv-command = g_strdup (command);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), command);
@@ -691,7 +700,8 @@
 }
 
   /* Assign new name */
-  item-priv-name = g_strdup (name);
+  if (G_LIKELY (name != NULL))
+item-priv-name = g_strdup (name);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), name);
@@ -725,7 +735,8 @@
 }
 
   /* Assign new icon name */
-  item-priv-icon_name = g_strdup (icon_name);
+  if (G_LIKELY (icon_name != NULL))
+item-priv-icon_name = g_strdup (icon_name);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), icon_name);
@@ -820,7 +831,6 @@
 void
 frap_menu_item_unref (FrapMenuItem *item)
 {
-  /* g_message (g_object_unref (%s), frap_menu_item_get_filename (item)); */
   g_object_unref (G_OBJECT (item));
 }
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23283 - in libfrap/trunk/libfrap/menu: . tests

2006-10-04 Thread Jannis Pohlmann

Author: jannis
Date: 2006-10-04 17:35:30 + (Wed, 04 Oct 2006)
New Revision: 23283

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/frap-menu-item.c
   libfrap/trunk/libfrap/menu/frap-menu.c
   libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
Log:
* frap-menu-item.c: Revert parts of the previous commit because of 
  useless checks.
* frap-menu.c: Remove Deleted / menus and add notes for other 

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 17:05:57 UTC (rev 
23282)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 17:35:30 UTC (rev 
23283)
@@ -1,5 +1,12 @@
 2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * frap-menu-item.c: Revert parts of the previous commit because of 
+ useless checks.
+   * frap-menu.c: Remove Deleted / menus and add notes for other 
+  merge actions to be implemented.
+
+2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]
+
* frap-menu-item.c: Make property assignment more clean.
 
 2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]

Modified: libfrap/trunk/libfrap/menu/frap-menu-item.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item.c 2006-10-04 17:05:57 UTC (rev 
23282)
+++ libfrap/trunk/libfrap/menu/frap-menu-item.c 2006-10-04 17:35:30 UTC (rev 
23283)
@@ -288,11 +288,11 @@
 frap_menu_item_init (FrapMenuItem *item)
 {
   item-priv = FRAP_MENU_ITEM_GET_PRIVATE (item);
-  item-priv-icon_name = NULL;
-  item-priv-name = NULL;
-  item-priv-command = NULL;
   item-priv-desktop_id = NULL;
+  item-priv-name = NULL;
   item-priv-filename = NULL;
+  item-priv-command = NULL;
+  item-priv-icon_name = NULL;
   item-priv-categories = NULL;
 }
 
@@ -558,8 +558,7 @@
 }
 
   /* Assign the new desktop_id */
-  if (G_LIKELY (desktop_id != NULL))
-item-priv-desktop_id = g_strdup (desktop_id);
+  item-priv-desktop_id = g_strdup (desktop_id);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), desktop_id);
@@ -596,8 +595,7 @@
 }
 
   /* Assign the new filename */
-  if (G_LIKELY (filename != NULL))
-item-priv-filename = g_strdup (filename);
+  item-priv-filename = g_strdup (filename);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), filename);
@@ -665,8 +663,7 @@
 }
 
   /* Assign new command */
-  if (G_LIKELY (command != NULL))
-item-priv-command = g_strdup (command);
+  item-priv-command = g_strdup (command);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), command);
@@ -700,8 +697,7 @@
 }
 
   /* Assign new name */
-  if (G_LIKELY (name != NULL))
-item-priv-name = g_strdup (name);
+  item-priv-name = g_strdup (name);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), name);
@@ -735,8 +731,7 @@
 }
 
   /* Assign new icon name */
-  if (G_LIKELY (icon_name != NULL))
-item-priv-icon_name = g_strdup (icon_name);
+  item-priv-icon_name = g_strdup (icon_name);
 
   /* Notify listeners */
   g_object_notify (G_OBJECT (item), icon_name);

Modified: libfrap/trunk/libfrap/menu/frap-menu.c
===
--- libfrap/trunk/libfrap/menu/frap-menu.c  2006-10-04 17:05:57 UTC (rev 
23282)
+++ libfrap/trunk/libfrap/menu/frap-menu.c  2006-10-04 17:35:30 UTC (rev 
23283)
@@ -206,6 +206,7 @@
 static void   frap_menu_resolve_items_from_path   (FrapMenu
  *menu,
const gchar 
  *path,
const gchar 
  *id_prefix);
+static void   frap_menu_resolve_deleted   (FrapMenu
  *menu);
 
 
 
@@ -902,8 +903,17 @@
   g_list_free (menu_context.menu_stack);
   g_list_free (menu_context.rule_stack);
 
-  /* Resolve internals, merge menus (TODO) and determine included/excluded 
menu items */
+#if 0 
+  /* TODO (wrapping all this into another method might make sense, especially 
+   * because stuff needs to be re-run after merging. */
+  frap_menu_consolidate_child_menus (menu);
+#endif
   frap_menu_resolve_directory (menu);
+#if 0
+  /* TODO */
+  frap_menu_resolve_move (menu);
+#endif
+  frap_menu_resolve_deleted (menu);
   frap_menu_resolve_items (menu);
 }
 
@@ -1776,6 +1786,36 @@
 
 
 
+static void
+frap_menu_resolve_deleted (FrapMenu *menu)
+{
+  GSList *iter;
+
+  g_return_if_fail (FRAP_IS_MENU (menu));
+
+  /* Note: There's a limitation here. If the root menu has a Deleted / we
+   * can't just free the pointer here. Therefor we just check child menus. */
+
+  for (iter = menu-priv-submenus; iter != NULL; iter = g_slist_next (iter))
+{
+  FrapMenu *submenu = iter-data;
+
+  /* Remove submenu if it is deleted, otherwise check submenus

[Xfce4-commits] r23284 - libfrap/trunk/libfrap/menu/tests

2006-10-04 Thread Jannis Pohlmann

Author: jannis
Date: 2006-10-04 17:46:07 + (Wed, 04 Oct 2006)
New Revision: 23284

Modified:
   libfrap/trunk/libfrap/menu/tests/Makefile.am
Log:
Remove whitespace.

Modified: libfrap/trunk/libfrap/menu/tests/Makefile.am
===
--- libfrap/trunk/libfrap/menu/tests/Makefile.am2006-10-04 17:35:30 UTC 
(rev 23283)
+++ libfrap/trunk/libfrap/menu/tests/Makefile.am2006-10-04 17:46:07 UTC 
(rev 23284)
@@ -29,7 +29,7 @@
test-display-root-menu  
 
 check_PROGRAMS =   \
-   test-menu-item  \   

+   test-menu-item  \
test-or-rules   \
test-and-rules  \
test-not-rules  \

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23285 - in libfrap/trunk/libfrap/menu: . tests

2006-10-04 Thread Jannis Pohlmann

Author: jannis
Date: 2006-10-04 18:00:08 + (Wed, 04 Oct 2006)
New Revision: 23285

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
Log:
* tests/test-display-root-menu.c: Add option to load a different menu 
  than the default applications menu.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 17:46:07 UTC (rev 
23284)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-10-04 18:00:08 UTC (rev 
23285)
@@ -1,5 +1,10 @@
 2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * tests/test-display-root-menu.c: Add option to load a different menu 
+ than the default applications menu.
+
+2006-10-04 Jannis Pohlmann [EMAIL PROTECTED]
+
* frap-menu-item.c: Revert parts of the previous commit because of 
  useless checks.
* frap-menu.c: Remove Deleted / menus and add notes for other 

Modified: libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
===
--- libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c   2006-10-04 
17:46:07 UTC (rev 23284)
+++ libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c   2006-10-04 
18:00:08 UTC (rev 23285)
@@ -326,8 +326,16 @@
   /* Initialize the menu library */
   frap_menu_init ();
 
-  /* Get a reference to the root menu */
-  root = frap_menu_get_root ();
+  if (g_strv_length (argv)  1)
+{
+  /* Load menu from special filename */
+  root = frap_menu_new (argv[1]);
+}
+  else
+{
+  /* Get a reference to the root menu */
+  root = frap_menu_get_root ();
+}
 
   /* Create the main window */
   create_main_window ();

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23576 - libfrap/trunk

2006-10-31 Thread Jannis Pohlmann

Author: jannis
Date: 2006-10-31 16:59:57 + (Tue, 31 Oct 2006)
New Revision: 23576

Modified:
   libfrap/trunk/AUTHORS
   libfrap/trunk/ChangeLog
   libfrap/trunk/configure.in.in
Log:
* configure.in.in, AUTHORS: tdb added.

Modified: libfrap/trunk/AUTHORS
===
--- libfrap/trunk/AUTHORS   2006-10-31 16:59:44 UTC (rev 23575)
+++ libfrap/trunk/AUTHORS   2006-10-31 16:59:57 UTC (rev 23576)
@@ -1,2 +1,9 @@
 Benedikt Meurer [EMAIL PROTECTED]
 Jannis Pohlmann [EMAIL PROTECTED]
+
+The tdb library, which is included with the libfrap distribution, was 
originally
+written as part of the Samba suite. Our understanding is that the majority of
+the code was written by Andrew Trigell [EMAIL PROTECTED] with the help of
+Paul Rusty Russell [EMAIL PROTECTED]. Luke Kenneth Casson Leighton
+[EMAIL PROTECTED] also contributed a few patches. Sorted freelist merge code
+added by Jeremy Allison [EMAIL PROTECTED].

Modified: libfrap/trunk/ChangeLog
===
--- libfrap/trunk/ChangeLog 2006-10-31 16:59:44 UTC (rev 23575)
+++ libfrap/trunk/ChangeLog 2006-10-31 16:59:57 UTC (rev 23576)
@@ -1,3 +1,6 @@
+2006-10-31 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * configure.in.in, AUTHORS: tdb added.
 2006-09-27 Jannis Pohlmann [EMAIL PROTECTED]
 
* configure.in.in: Menu test directories added to the Makefile 

Modified: libfrap/trunk/configure.in.in
===
--- libfrap/trunk/configure.in.in   2006-10-31 16:59:44 UTC (rev 23575)
+++ libfrap/trunk/configure.in.in   2006-10-31 16:59:57 UTC (rev 23576)
@@ -74,6 +74,28 @@
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
 
+dnl ***
+dnl *** Determine the u32 type required for tdb ***
+dnl ***
+AC_CHECK_SIZEOF([int])
+AC_CHECK_SIZEOF([long])
+AC_CHECK_SIZEOF([short])
+AC_MSG_CHECKING([for 32bit unsigned integer])
+case 4 in
+$ac_cv_sizeof_int)   TDB_U32_TYPE=unsigned int ;;
+$ac_cv_sizeof_long)  TDB_U32_TYPE=unsigned long ;;
+$ac_cv_sizeof_short) TDB_U32_TYPE=unsigned short ;;
+esac
+AC_SUBST([TDB_U32_TYPE])
+AC_MSG_RESULT([$TDB_U32_TYPE])
+
+dnl **
+dnl *** Check for standard headers ***
+dnl **
+AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/stat.h sys/uio.h errno.h fcntl.h \
+  memory.h stdlib.h stdio.h string.h unistd.h sched.h time.h \
+  sys/wait.h stdarg.h])
+
 dnl ***
 dnl *** Check for debugging support ***
 dnl ***
@@ -120,6 +142,8 @@
 libfrap/Makefile
 libfrap/icon-entry/Makefile
 libfrap/menu/Makefile
+libfrap/menu/tdb/Makefile
+libfrap/menu/tdb/tdbconfig.h
 libfrap/menu/tests/Makefile
 libfrap/menu/tests/data/Makefile
 libfrap/appfinder/Makefile

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r23620 - libfrap/trunk/libfrap/menu

2006-11-03 Thread Jannis Pohlmann

Author: jannis
Date: 2006-11-03 21:41:41 + (Fri, 03 Nov 2006)
New Revision: 23620

Added:
   libfrap/trunk/libfrap/menu/frap-menu-move.c
   libfrap/trunk/libfrap/menu/frap-menu-move.h
Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/Makefile.am
   libfrap/trunk/libfrap/menu/STATUS
   libfrap/trunk/libfrap/menu/frap-menu.c
   libfrap/trunk/libfrap/menu/frap-menu.h
Log:
* frap-menu.{c,h}, frap-menu-move.{c,h}, Makefile.am, STATUS: 
  frap_menu_get_menu_with_name() added. Implemented Move, New 
  and Old elements (also added error handling for incomplete move 
  instructions). A move instruction is a FrapMenuMove with properties 
  old and new, which refers to the source and target menu names. 
  

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-11-03 20:37:26 UTC (rev 
23619)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-11-03 21:41:41 UTC (rev 
23620)
@@ -1,3 +1,11 @@
+2006-11-03 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * frap-menu.{c,h}, frap-menu-move.{c,h}, Makefile.am, STATUS: 
+ frap_menu_get_menu_with_name() added. Implemented Move, New 
+ and Old elements (also added error handling for incomplete move 
+ instructions). A move instruction is a FrapMenuMove with properties 
+ old and new, which refers to the source and target menu names. 
+ 
 2006-10-31 Jannis Pohlmann [EMAIL PROTECTED]
 
* Makefile.am, tdb/: tdb added.

Modified: libfrap/trunk/libfrap/menu/Makefile.am
===
--- libfrap/trunk/libfrap/menu/Makefile.am  2006-11-03 20:37:26 UTC (rev 
23619)
+++ libfrap/trunk/libfrap/menu/Makefile.am  2006-11-03 21:41:41 UTC (rev 
23620)
@@ -16,6 +16,7 @@
frap-menu-not-rules.c   \
frap-menu-item-pool.c   \
frap-menu-item-cache.c  \
+   frap-menu-move.c\
frap-menu-item.c
 
 libfrapmenu_la_DEPENDENCIES =  \
@@ -32,6 +33,7 @@
frap-menu-not-rules.h   \
frap-menu-item-pool.h   \
frap-menu-item-cache.h  \
+   frap-menu-move.h\
frap-menu-item.h
 
 INCLUDES = \

Modified: libfrap/trunk/libfrap/menu/STATUS
===
--- libfrap/trunk/libfrap/menu/STATUS   2006-11-03 20:37:26 UTC (rev 23619)
+++ libfrap/trunk/libfrap/menu/STATUS   2006-11-03 21:41:41 UTC (rev 23620)
@@ -30,8 +30,6 @@
 
   [x] Include 
 
-TODO: Recursively load elements (using a stack).
-
 Recursion scheme (only recurse on and/or/not elements):
 
and|or|not
@@ -74,11 +72,11 @@
 
 See LegacyDir
 
-  [ ] Move
+  [x] Move
 
-  [ ] Old
+  [x] Old
 
-  [ ] New
+  [x] New
 
   [ ] Layout
 

Added: libfrap/trunk/libfrap/menu/frap-menu-move.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-move.c (rev 0)
+++ libfrap/trunk/libfrap/menu/frap-menu-move.c 2006-11-03 21:41:41 UTC (rev 
23620)
@@ -0,0 +1,292 @@
+/* $Id$ */
+/* vi:set expandtab sw=2 sts=2: */
+/*-
+ * Copyright (c) 2006 Jannis Pohlmann [EMAIL PROTECTED]
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
+#include libxfce4util/libxfce4util.h
+
+#include frap-menu-move.h
+
+
+
+/* Property identifiers */
+enum
+{
+  PROP_0,
+  PROP_OLD,
+  PROP_NEW,
+};
+
+
+
+static void frap_menu_move_class_init   (FrapMenuMoveClass *klass);
+static void frap_menu_move_init (FrapMenuMove  *move);
+static void frap_menu_move_finalize (GObject

[Xfce4-commits] r23764 - libfrap/trunk/libfrap/menu

2006-11-06 Thread Jannis Pohlmann

Author: jannis
Date: 2006-11-06 21:19:40 + (Mon, 06 Nov 2006)
New Revision: 23764

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/frap-menu-item-cache.c
   libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
   libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c
   libfrap/trunk/libfrap/menu/frap-menu.c
Log:
* frap-menu.c, frap-menu-standard-rules.c, frap-menu-item-pool.c, 
  frap-menu-item-cache.c: Apply patch by Jannis Pohlmann which makes
  FrapMenu compatible with GLib  2.12.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-11-06 19:10:39 UTC (rev 
23763)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-11-06 21:19:40 UTC (rev 
23764)
@@ -1,3 +1,9 @@
+2006-11-06 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * frap-menu.c, frap-menu-standard-rules.c, frap-menu-item-pool.c, 
+ frap-menu-item-cache.c: Apply patch by Jannis Pohlmann which makes
+ FrapMenu compatible with GLib  2.12.
+
 2006-11-03 Jannis Pohlmann [EMAIL PROTECTED]
 
* frap-menu.{c,h}, frap-menu-move.{c,h}, Makefile.am, STATUS: 

Modified: libfrap/trunk/libfrap/menu/frap-menu-item-cache.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item-cache.c   2006-11-06 19:10:39 UTC 
(rev 23763)
+++ libfrap/trunk/libfrap/menu/frap-menu-item-cache.c   2006-11-06 21:19:40 UTC 
(rev 23764)
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* vi:set expandtab sw=2 sts=2: */
+/* vi:set expandtab sw=2 sts=2 et: */
 /*-
  * Copyright (c) 2006 Jannis Pohlmann [EMAIL PROTECTED]
  *
@@ -39,10 +39,10 @@
 #include string.h
 #endif
 
+#include libxfce4util/libxfce4util.h
+
 #include tdb/tdb.h
 
-#include libxfce4util/libxfce4util.h
-
 #include frap-menu-item.h
 #include frap-menu-item-cache.h
 
@@ -214,7 +214,11 @@
   FrapMenuItemCache *cache = FRAP_MENU_ITEM_CACHE (object);
 
   /* Free hash table */
+#if GLIB_CHECK_VERSION(2,10,0)
   g_hash_table_unref (cache-priv-items);
+#else
+  g_hash_table_destroy (cache-priv-items);
+#endif
 
   /* Close TDB database */
   if (G_LIKELY (cache-priv-context != NULL))

Modified: libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-11-06 19:10:39 UTC 
(rev 23763)
+++ libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-11-06 21:19:40 UTC 
(rev 23764)
@@ -127,7 +127,11 @@
 {
   FrapMenuItemPool *pool = FRAP_MENU_ITEM_POOL (object);
 
+#if GLIB_CHECK_VERSION(2,10,0)
   g_hash_table_unref (pool-priv-items);
+#else
+  g_hash_table_destroy (pool-priv-items);
+#endif
 
   (*G_OBJECT_CLASS (frap_menu_item_pool_parent_class)-finalize) (object);
 }
@@ -195,7 +199,11 @@
 
   /* If rules are empty, remove all items */
   if (G_UNLIKELY (g_slist_length (rules) == 0))
+#if GLIB_CHECK_VERSION(2,12,0)
 g_hash_table_remove_all (pool-priv-items);
+#else
+g_hash_table_foreach_remove (pool-priv-items, (GHRFunc) g_object_unref, 
NULL);
+#endif
   else 
g_hash_table_foreach_remove (pool-priv-items, (GHRFunc) 
frap_menu_item_pool_filter_item, rules);
 }

Modified: libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c   2006-11-06 
19:10:39 UTC (rev 23763)
+++ libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c   2006-11-06 
21:19:40 UTC (rev 23764)
@@ -235,7 +235,11 @@
   g_return_if_fail (FRAP_IS_MENU_RULES (additional_rules));
 
   /* Remove floating reference (if any) and request a normal one */
+#if GLIB_CHECK_VERSION(2,10,0)
   g_object_ref_sink (G_OBJECT (additional_rules));
+#else
+  g_object_ref (G_OBJECT (additional_rules));
+#endif
 
   /* Append rules to the list */
   std_rules-rules = g_list_append (std_rules-rules, additional_rules);

Modified: libfrap/trunk/libfrap/menu/frap-menu.c
===
--- libfrap/trunk/libfrap/menu/frap-menu.c  2006-11-06 19:10:39 UTC (rev 
23763)
+++ libfrap/trunk/libfrap/menu/frap-menu.c  2006-11-06 21:19:40 UTC (rev 
23764)
@@ -1,5 +1,5 @@
 /* $Id$ */
-/* vi:set expandtab sw=2 sts=2: */
+/* vi:set expandtab sw=2 sts=2 et: */
 /*-
  * Copyright (c) 2006 Jannis Pohlmann [EMAIL PROTECTED]
  *
@@ -750,7 +750,11 @@
 g_object_unref (menu-priv-directory);
 
   /* Remove the floating reference and acquire a normal one */
+#if GLIB_CHECK_VERSION(2,10,0)
   g_object_ref_sink (G_OBJECT (directory));
+#else
+  g_object_ref (G_OBJECT (directory));
+#endif
 
   /* Set the new directory */
   menu-priv-directory = directory;
@@ -1602,7 +1606,11 @@
   g_return_if_fail (FRAP_IS_MENU (submenu));
 
   /* Remove floating reference and acquire a 'real' one */
+#if GLIB_CHECK_VERSION (2,10,0)
   g_object_ref_sink (G_OBJECT (submenu

[Xfce4-commits] r23773 - libfrap/trunk/libfrap/menu

2006-11-07 Thread Jannis Pohlmann

Author: jannis
Date: 2006-11-07 16:58:49 + (Tue, 07 Nov 2006)
New Revision: 23773

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
   libfrap/trunk/libfrap/menu/frap-menu.c
Log:
* frap-menu-item-pool.c: Fix backwards compatibility by passing 
  frap_menu_item_pool_remove to the hash table remove loop function 
  instead of g_object_unref (we need a function returning TRUE here).
* frap-menu.c: Initial import of legacy menu support by adding
  frap_menu_resolve_menu, frap_menu_resolve_menus methods. It's not
  complete yet (only FrapMenu's and FrapMenuDirectory's are created and
  added to the menu structure; desktop entries are not parsed yet). In
  addition to this, I added a workaround for distributions not
  installing KDE properly, by adding $KDEDIR/share/desktop-directories/
  to DefaultDirectoryDirs.
  Also fixed some segfaults and warnings. 

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-11-07 14:15:56 UTC (rev 
23772)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-11-07 16:58:49 UTC (rev 
23773)
@@ -1,3 +1,17 @@
+2006-11-07 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * frap-menu-item-pool.c: Fix backwards compatibility by passing 
+ frap_menu_item_pool_remove to the hash table remove loop function 
+ instead of g_object_unref (we need a function returning TRUE here).
+   * frap-menu.c: Initial import of legacy menu support by adding
+ frap_menu_resolve_menu, frap_menu_resolve_menus methods. It's not
+ complete yet (only FrapMenu's and FrapMenuDirectory's are created and
+ added to the menu structure; desktop entries are not parsed yet). In
+ addition to this, I added a workaround for distributions not
+ installing KDE properly, by adding $KDEDIR/share/desktop-directories/
+ to DefaultDirectoryDirs.
+ Also fixed some segfaults and warnings. 
+
 2006-11-06 Jannis Pohlmann [EMAIL PROTECTED]
 
* frap-menu.c, frap-menu-standard-rules.c, frap-menu-item-pool.c, 

Modified: libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-11-07 14:15:56 UTC 
(rev 23772)
+++ libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-11-07 16:58:49 UTC 
(rev 23773)
@@ -40,6 +40,8 @@
 static gboolean frap_menu_item_pool_filter_item (const gchar   
*desktop_id,
  FrapMenuItem  *item,
  GSList*rules);
+static gboolean frap_menu_item_pool_remove  (const gchar   
*desktop_id,
+ FrapMenuItem  *item);
 
 
 
@@ -199,11 +201,13 @@
 
   /* If rules are empty, remove all items */
   if (G_UNLIKELY (g_slist_length (rules) == 0))
+{
 #if GLIB_CHECK_VERSION(2,12,0)
-g_hash_table_remove_all (pool-priv-items);
+  g_hash_table_remove_all (pool-priv-items);
 #else
-g_hash_table_foreach_remove (pool-priv-items, (GHRFunc) g_object_unref, 
NULL);
+  g_hash_table_foreach_remove (pool-priv-items, (GHRFunc) 
frap_menu_item_pool_remove, NULL);
 #endif
+}
   else 
g_hash_table_foreach_remove (pool-priv-items, (GHRFunc) 
frap_menu_item_pool_filter_item, rules);
 }
@@ -243,3 +247,12 @@
   g_return_val_if_fail (FRAP_IS_MENU_ITEM_POOL (pool), TRUE);
   return (g_hash_table_size (pool-priv-items) == 0);
 }
+
+
+
+static gboolean
+frap_menu_item_pool_remove (const gchar  *desktop_id,
+FrapMenuItem *item)
+{
+  return TRUE;
+}

Modified: libfrap/trunk/libfrap/menu/frap-menu.c
===
--- libfrap/trunk/libfrap/menu/frap-menu.c  2006-11-07 14:15:56 UTC (rev 
23772)
+++ libfrap/trunk/libfrap/menu/frap-menu.c  2006-11-07 16:58:49 UTC (rev 
23773)
@@ -214,6 +214,9 @@
 static void   frap_menu_add_kde_legacy_dirs
(FrapMenu  *menu);
 static void   frap_menu_add_default_app_dirs   
(FrapMenu  *menu);
 
+static void   frap_menu_resolve_legacy_menus   
(FrapMenu  *menu);
+static void   frap_menu_resolve_legacy_menu
(FrapMenu  *menu,
+
const gchar   *path);
 static void   frap_menu_remove_duplicates  
(FrapMenu  *menu);
 static void   frap_menu_consolidate_child_menus
(FrapMenu  *menu);
 static void

[Xfce4-commits] r26500 - in libxfce4menu/trunk: . libxfce4menu

2007-12-22 Thread Jannis Pohlmann

Author: jannis
Date: 2007-12-22 23:38:52 + (Sat, 22 Dec 2007)
New Revision: 26500

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/libxfce4menu/xfce-menu-item-cache.c
   libxfce4menu/trunk/libxfce4menu/xfce-menu-item-cache.h
   libxfce4menu/trunk/libxfce4menu/xfce-menu-item.c
   libxfce4menu/trunk/libxfce4menu/xfce-menu-item.h
   libxfce4menu/trunk/libxfce4menu/xfce-menu.c
Log:
* libxfce4menu/xfce-menu-item.{c,h}: Add support for GenericName as
  requested by Brian. Also add a convenience function 
xfce_menu_item_has_category (XfceMenuItem *, const char *).
* libxfce4menu/xfce-menu-item-cache.c: Re-add caching features, but now
  also allow the cache to be invalidated using _item_cache_invalidate().
This can be used in combination with file monitoring: Once 
something
has changed a) destroy the current menu, b) invalidate the 
cache and
c) create the menu again.

Modified: libxfce4menu/trunk/ChangeLog
===
--- libxfce4menu/trunk/ChangeLog2007-12-21 13:31:41 UTC (rev 26499)
+++ libxfce4menu/trunk/ChangeLog2007-12-22 23:38:52 UTC (rev 26500)
@@ -1,3 +1,14 @@
+2007-12-23 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * libxfce4menu/xfce-menu-item.{c,h}: Add support for GenericName as
+ requested by Brian. Also add a convenience function 
+   xfce_menu_item_has_category (XfceMenuItem *, const char *).
+   * libxfce4menu/xfce-menu-item-cache.c: Re-add caching features, but now
+ also allow the cache to be invalidated using _item_cache_invalidate().
+   This can be used in combination with file monitoring: Once 
something
+   has changed a) destroy the current menu, b) invalidate the 
cache and
+   c) create the menu again.
+
 2007-10-21 Jannis Pohlmann [EMAIL PROTECTED]
 
* libxfce4menu/xfce-menu-item.{c,h}: Add support for the Path 

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu-item-cache.c
===
--- libxfce4menu/trunk/libxfce4menu/xfce-menu-item-cache.c  2007-12-21 
13:31:41 UTC (rev 26499)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu-item-cache.c  2007-12-22 
23:38:52 UTC (rev 26500)
@@ -61,7 +61,7 @@
 static void  xfce_menu_item_cache_class_init (XfceMenuItemCacheClass 
*klass);
 static void  xfce_menu_item_cache_init   (XfceMenuItemCache  
*cache);
 static void  xfce_menu_item_cache_finalize   (GObject
*object);
-#if 0 /* ITEM CACHE DEACTIVATED FOR NOW */
+#if 1 /* ITEM CACHE DEACTIVATED FOR NOW */
 static XfceMenuItem *xfce_menu_item_cache_fetch_item (XfceMenuItemCache  
*cache,
   const gchar
*filename);
 static void  xfce_menu_item_cache_store_item (XfceMenuItemCache  
*cache,
@@ -257,7 +257,7 @@
* item cache */
   g_mutex_lock (cache-priv-lock);
 
-#if 0
+#if 1
   /* Search filename in the hash table */
   item = g_hash_table_lookup (cache-priv-items, filename);
 
@@ -299,7 +299,7 @@
 
   /* Grab a reference on the item, but don't increase the allocation
* counter */
-#if 0
+#if 1
   g_object_ref (G_OBJECT (item));
 #endif
 
@@ -319,7 +319,7 @@
   /* Update desktop id */
   xfce_menu_item_set_desktop_id (item, desktop_id);
 
-#if 0 /* ITEM CACHE DEACTIVATED FOR NOW */
+#if 1 /* ITEM CACHE DEACTIVATED FOR NOW */
   /* Store updated item in cache */
   xfce_menu_item_cache_store_item (cache, filename, item);
 
@@ -328,7 +328,7 @@
 #endif
 
   /* Grab a reference on it but don't increase the allocation counter */
-#if 0
+#if 1
   g_object_ref (G_OBJECT (item)); 
 #endif
 }
@@ -359,7 +359,7 @@
 
 
 
-#if 0 /* ITEM CACHE DEACTIVATED FOR NOW */
+#if 1 /* ITEM CACHE DEACTIVATED FOR NOW */
 static XfceMenuItem*
 xfce_menu_item_cache_fetch_item (XfceMenuItemCache *cache,
  const gchar   *filename)
@@ -422,3 +422,21 @@
*/
 }
 #endif
+
+
+
+void
+xfce_menu_item_cache_invalidate (XfceMenuItemCache *cache)
+{
+  g_return_if_fail (XFCE_IS_MENU_ITEM_CACHE (cache));
+
+  /* Destroy the hash table */
+#if GLIB_CHECK_VERSION(2,10,0)
+  g_hash_table_unref (cache-priv-items);
+#else
+  g_hash_table_destroy (cache-priv-items);
+#endif
+  
+  /* Create a new, empty hash table */
+  cache-priv-items = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, 
(GDestroyNotify) xfce_menu_item_unref);
+}

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu-item-cache.h
===
--- libxfce4menu/trunk/libxfce4menu/xfce-menu-item-cache.h  2007-12-21 
13:31:41 UTC (rev 26499)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu-item-cache.h  2007-12-22 
23:38:52 UTC (rev 26500)
@@ -51,6 +51,7 @@
 void

[Xfce4-commits] r26507 - in libxfce4menu/trunk: . libxfce4menu

2007-12-26 Thread Jannis Pohlmann

Author: jannis
Date: 2007-12-27 00:13:05 + (Thu, 27 Dec 2007)
New Revision: 26507

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.c
Log:
* libxfce4menu/xfce-menu-monitor.c: Use the KEY, not the VALUE pointer
  to remove items from the shared handle hash table. In this case, use
  the directory string instead of the shared handle. This should fix
  the issue we've had with monitoring directories only.
  xfce_menu_item_has_category (XfceMenuItem *, const char *).
  This can be used in combination with file monitoring: Once something
  has changed a) destroy the current menu, b) invalidate the cache and
  c) create the menu again.


Modified: libxfce4menu/trunk/ChangeLog
===
--- libxfce4menu/trunk/ChangeLog2007-12-26 22:54:08 UTC (rev 26506)
+++ libxfce4menu/trunk/ChangeLog2007-12-27 00:13:05 UTC (rev 26507)
@@ -1,3 +1,9 @@
+2007-12-27 Jannis Pohlmann [EMAIL PROTECTED]
+   * libxfce4menu/xfce-menu-monitor.c: Use the KEY, not the VALUE pointer
+ to remove items from the shared handle hash table. In this case, use
+ the directory string instead of the shared handle. This should fix
+ the issue we've had with monitoring directories only.
+
 2007-12-23 Jannis Pohlmann [EMAIL PROTECTED]
 
* libxfce4menu/xfce-menu-item.{c,h}: Add support for GenericName as
@@ -2,8 +8,8 @@
  requested by Brian. Also add a convenience function 
-   xfce_menu_item_has_category (XfceMenuItem *, const char *).
+ xfce_menu_item_has_category (XfceMenuItem *, const char *).
* libxfce4menu/xfce-menu-item-cache.c: Re-add caching features, but now
  also allow the cache to be invalidated using _item_cache_invalidate().
-   This can be used in combination with file monitoring: Once 
something
-   has changed a) destroy the current menu, b) invalidate the 
cache and
-   c) create the menu again.
+ This can be used in combination with file monitoring: Once something
+ has changed a) destroy the current menu, b) invalidate the cache and
+ c) create the menu again.
 
@@ -724,3 +730,5 @@
  Abort setting properties if new values are equal to the old ones.
* tests/load-root-menu-test.c: Display only_unallocated, delete and
  directory_dirs information.
+   
+vim:set sw=8 sts=8 ts=8 noexpandtab:

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.c
===
--- libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.c 2007-12-26 22:54:08 UTC 
(rev 26506)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.c 2007-12-27 00:13:05 UTC 
(rev 26507)
@@ -243,7 +243,7 @@
   xfce_menu_monitor_vtable.remove_monitor (menu, 
shared_handle-monitor_handle);
 
   /* Remove directory handle from the hash table and destroy it */
-  g_hash_table_remove (xfce_menu_monitor_shared_handles, 
shared_handle);
+  g_hash_table_remove (xfce_menu_monitor_shared_handles, directory);
 }
 }
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r26527 - in libxfce4menu/trunk: . libxfce4menu tests

2008-01-02 Thread Jannis Pohlmann

Author: jannis
Date: 2008-01-02 15:50:33 + (Wed, 02 Jan 2008)
New Revision: 26527

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/libxfce4menu/xfce-menu-item.c
   libxfce4menu/trunk/libxfce4menu/xfce-menu-item.h
   libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.c
   libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.h
   libxfce4menu/trunk/libxfce4menu/xfce-menu.c
   libxfce4menu/trunk/tests/test-display-menu.c
Log:
* libxfce4menu/xfce-menu-item.{c,h}: Add support for the Comment field
  via xfce_menu_item_get_comment().
* libxfce4menu/xfce-menu-monitor.{c,h}: Add support for defining what
  kind of files/directories are monitored (XfceMenuMonitorFlags,
  xfce_menu_monitor_set_flags(), xfce_menu_monitor_get_flags(),
  xfce_menu_monitor_has_flags()).
* libxfce4menu/xfce-menu.c: Check monitor flags before adding
  files/directories to the monitoring system.
* tests/test-display-menu.c: Center window on screen.

Modified: libxfce4menu/trunk/ChangeLog
===
--- libxfce4menu/trunk/ChangeLog2008-01-02 15:41:28 UTC (rev 26526)
+++ libxfce4menu/trunk/ChangeLog2008-01-02 15:50:33 UTC (rev 26527)
@@ -1,4 +1,20 @@
+2008-01-02 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * libxfce4menu/xfce-menu-item.{c,h}: Add support for the Comment field
+ via xfce_menu_item_get_comment().
+
+2007-12-29 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * libxfce4menu/xfce-menu-monitor.{c,h}: Add support for defining what
+ kind of files/directories are monitored (XfceMenuMonitorFlags,
+ xfce_menu_monitor_set_flags(), xfce_menu_monitor_get_flags(),
+ xfce_menu_monitor_has_flags()).
+   * libxfce4menu/xfce-menu.c: Check monitor flags before adding
+ files/directories to the monitoring system.
+   * tests/test-display-menu.c: Center window on screen.
+
 2007-12-27 Jannis Pohlmann [EMAIL PROTECTED]
+
* libxfce4menu/xfce-menu-monitor.c: Use the KEY, not the VALUE pointer
  to remove items from the shared handle hash table. In this case, use
  the directory string instead of the shared handle. This should fix

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu-item.c
===
--- libxfce4menu/trunk/libxfce4menu/xfce-menu-item.c2008-01-02 15:41:28 UTC 
(rev 26526)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu-item.c2008-01-02 15:50:33 UTC 
(rev 26527)
@@ -47,6 +47,7 @@
   PROP_STARTUP_NOTIFICATION,
   PROP_NAME,
   PROP_GENERIC_NAME,
+  PROP_COMMENT,
   PROP_ICON_NAME,
   PROP_COMMAND,
   PROP_TRY_EXEC,
@@ -103,6 +104,9 @@
   /* Generic name of the menu item */
   gchar*generic_name;
 
+  /* Comment/description of the item */
+  gchar*comment;
+
   /* Command to be executed when the menu item is clicked */
   gchar*command;
 
@@ -286,6 +290,20 @@
 G_PARAM_READWRITE));
 
   /**
+   * XfceMenuItem:comment:
+   *
+   * Comment/description for the application. To be displayed e.g. in tooltips 
of
+   * GtkMenuItems.
+   **/
+  g_object_class_install_property (gobject_class,
+   PROP_COMMENT,
+   g_param_spec_string (comment,
+Comment,
+Comment/description 
for the application,
+NULL,
+G_PARAM_READWRITE));
+
+  /**
* XfceMenuItem:command:
*
* Command to be executed when the menu item is clicked.
@@ -356,6 +374,7 @@
   item-priv-desktop_id = NULL;
   item-priv-name = NULL;
   item-priv-generic_name = NULL;
+  item-priv-comment = NULL;
   item-priv-filename = NULL;
   item-priv-command = NULL;
   item-priv-try_exec = NULL;
@@ -377,6 +396,7 @@
   g_free (item-priv-desktop_id);
   g_free (item-priv-name);
   g_free (item-priv-generic_name);
+  g_free (item-priv-comment);
   g_free (item-priv-filename);
   g_free (item-priv-command);
   g_free (item-priv-try_exec);
@@ -413,6 +433,10 @@
   g_value_set_string (value, xfce_menu_item_get_filename (item));
   break;
 
+case PROP_COMMENT:
+  g_value_set_string (value, xfce_menu_item_get_comment (item));
+  break;
+
 case PROP_REQUIRES_TERMINAL:
 case PROP_NO_DISPLAY:
 case PROP_STARTUP_NOTIFICATION:
@@ -473,6 +497,10 @@
   xfce_menu_item_set_generic_name (item, g_value_get_string (value));
   break;
 
+case PROP_COMMENT:
+  xfce_menu_item_set_comment (item, g_value_get_string (value));
+  break;
+
 case PROP_COMMAND:
   xfce_menu_item_set_command (item, g_value_get_string (value));
   break;
@@ -505,6 +533,7 @@
   const gchar  *path;
   const gchar  *name;
   const

[Xfce4-commits] r26561 - xfce4-mixer/branches

2008-01-13 Thread Jannis Pohlmann

Author: jannis
Date: 2008-01-13 16:26:02 + (Sun, 13 Jan 2008)
New Revision: 26561

Added:
   xfce4-mixer/branches/trunk_before_gstreamer_mixer/
Log:
Make a backup of current trunk (as a branch).



Copied: xfce4-mixer/branches/trunk_before_gstreamer_mixer (from rev 26560, 
xfce4-mixer/trunk)

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r26563 - xfce4-mixer/trunk

2008-01-13 Thread Jannis Pohlmann

Author: jannis
Date: 2008-01-13 16:37:35 + (Sun, 13 Jan 2008)
New Revision: 26563

Removed:
   xfce4-mixer/trunk/po/
Log:
Temporarily remove the po directory

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r26564 - in xfce4-mixer/trunk: . po

2008-01-13 Thread Jannis Pohlmann

Author: jannis
Date: 2008-01-13 16:37:58 + (Sun, 13 Jan 2008)
New Revision: 26564

Added:
   xfce4-mixer/trunk/po/
   xfce4-mixer/trunk/po/ChangeLog
   xfce4-mixer/trunk/po/LINGUAS
   xfce4-mixer/trunk/po/POTFILES.in
   xfce4-mixer/trunk/po/de.po
Log:
Here it is again.

Added: xfce4-mixer/trunk/po/ChangeLog
===

Added: xfce4-mixer/trunk/po/LINGUAS
===
--- xfce4-mixer/trunk/po/LINGUAS(rev 0)
+++ xfce4-mixer/trunk/po/LINGUAS2008-01-13 16:37:58 UTC (rev 26564)
@@ -0,0 +1 @@
+de

Added: xfce4-mixer/trunk/po/POTFILES.in
===
--- xfce4-mixer/trunk/po/POTFILES.in(rev 0)
+++ xfce4-mixer/trunk/po/POTFILES.in2008-01-13 16:37:58 UTC (rev 26564)
@@ -0,0 +1,7 @@
+xfce4-mixer/main.c
+xfce4-mixer/xfce-mixer.c
+xfce4-mixer/xfce-mixer-track.c
+xfce4-mixer/xfce-mixer-track-type.c
+xfce4-mixer/xfce-mixer-window.c
+xfce4-mixer/xfce4-mixer.desktop.in.in
+xfce4-mixer/xfce-mixer-controls-dialog.c

Added: xfce4-mixer/trunk/po/de.po
===
--- xfce4-mixer/trunk/po/de.po  (rev 0)
+++ xfce4-mixer/trunk/po/de.po  2008-01-13 16:37:58 UTC (rev 26564)
@@ -0,0 +1,89 @@
+# German translations for xfce4-mixer.
+# Copyright (C) 2008 Jannis Pohlmann [EMAIL PROTECTED].
+# This file is distributed under the same license as the xfce4-mixer package.
+# Jannis Pohlmann [EMAIL PROTECTED], 2008.
+#
+msgid 
+msgstr 
+Project-Id-Version: xfce4-mixer SVN\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2008-01-08 05:46+0100\n
+PO-Revision-Date: 2008-01-06 04:59+0100\n
+Last-Translator: Jannis Pohlmann [EMAIL PROTECTED]\n
+Language-Team: German [EMAIL PROTECTED]\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=utf-8\n
+Content-Transfer-Encoding: 8bit\n
+
+#. Set application name
+#: ../xfce4-mixer/main.c:75 ../xfce4-mixer/xfce-mixer-window.c:181
+#: ../xfce4-mixer/xfce-mixer-window.c:199
+#: ../xfce4-mixer/xfce-mixer-window.c:362
+#: ../xfce4-mixer/xfce-mixer-window.c:367
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
+msgid Xfce Mixer
+msgstr Xfce-Lautstärkeregelung
+
+#: ../xfce4-mixer/xfce-mixer.c:168
+msgid Playback
+msgstr Wiedergabe
+
+#: ../xfce4-mixer/xfce-mixer.c:168
+msgid Capture
+msgstr Aufnahme
+
+#: ../xfce4-mixer/xfce-mixer.c:168
+msgid Switches
+msgstr Schalter
+
+#: ../xfce4-mixer/xfce-mixer.c:168
+msgid Options
+msgstr Optionen
+
+#: ../xfce4-mixer/xfce-mixer.c:300
+msgid No Controls Visible
+msgstr Keine Bedienelemente sichtbar
+
+#: ../xfce4-mixer/xfce-mixer.c:304
+msgid 
+No controls are marked as visible. Please open the span 
+size='large'bSelect Controls/b/span dialog to select some.
+msgstr 
+Es sind keine Bedienelemente als sichtbar vermerkt. Bitte benutze den Dialog 
+span size='large'bElemente auswählen/b/span, damit etwas angezeigt 
+wird.
+
+#: ../xfce4-mixer/xfce-mixer-window.c:94
+msgid _Quit
+msgstr B_eenden
+
+#: ../xfce4-mixer/xfce-mixer-window.c:94
+msgid Exit Xfce Mixer
+msgstr Beende die Xfce Lautstärkeregelung
+
+#: ../xfce4-mixer/xfce-mixer-window.c:96
+msgid _Select Controls...
+msgstr Elemente au_swählen...
+
+#: ../xfce4-mixer/xfce-mixer-window.c:96
+msgid Select which controls are displayed
+msgstr Auswählen, welche Bedienelemente angezeigt werden
+
+#: ../xfce4-mixer/xfce-mixer-window.c:200
+msgid A reliable and comfortable mixer for your soundcard, finally!
+msgstr 
+Endlich! Eine zuverlässige und komfortable Lautstärkeregelung für deine 
+Soundkarte!
+
+#: ../xfce4-mixer/xfce-mixer-window.c:215
+msgid Sound card:
+msgstr Soundkarte:
+
+#: ../xfce4-mixer/xfce-mixer-window.c:437
+#, c-format
+msgid Unknown Volume Control %d
+msgstr Unbekanntes Element %d
+
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
+msgid Audio mixer for the Xfce Desktop Environment
+msgstr Lautstärkeregelung für Xfce

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r26565 - in xfce4-mixer/trunk: . xfce4-mixer

2008-01-13 Thread Jannis Pohlmann

Author: jannis
Date: 2008-01-13 16:43:37 + (Sun, 13 Jan 2008)
New Revision: 26565

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c
Log:
* xfce4-mixer/xfce-mixer-controls-dialog.c: Don't set the default
  response of the dialog.

Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-01-13 16:37:58 UTC (rev 26564)
+++ xfce4-mixer/trunk/ChangeLog 2008-01-13 16:43:37 UTC (rev 26565)
@@ -1,5 +1,10 @@
 2008-01-13 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * xfce4-mixer/xfce-mixer-controls-dialog.c: Don't set the default
+ response of the dialog.
+
+2008-01-13 Jannis Pohlmann [EMAIL PROTECTED]
+
* Initial import of the new GStreamer-based mixer into trunk.
 
 vim:set sw=8 sts=8 ts=8 noexpandtab:

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c  2008-01-13 
16:37:58 UTC (rev 26564)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c  2008-01-13 
16:43:37 UTC (rev 26565)
@@ -135,8 +135,6 @@
   button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, 
GTK_RESPONSE_CLOSE);
   gtk_widget_show (button);
-
-  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
 }
 
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r26567 - in xfce4-mixer/trunk: . xfce4-mixer

2008-01-13 Thread Jannis Pohlmann

Author: jannis
Date: 2008-01-14 00:47:17 + (Mon, 14 Jan 2008)
New Revision: 26567

Added:
   xfce4-mixer/trunk/.gitignore
Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/TODO
   xfce4-mixer/trunk/autogen.sh
   xfce4-mixer/trunk/configure.in.in
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-card.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-card.h
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* configure.in.in, xfce4-mixer/xfce-mixer-card.{c,h},
  xfce4-mixer/xfce-mixer.c: Add optional support for the GstMixer
  notification API. It uses GstBus and GstMixerMessages. The latter
  are only available with GStreamer = 0.10.14. Not all work is done
  yet, but it will be worked on this week.
* autogen.sh: Tweak autogen.sh so that it works with both, SVN and
  git-svn.


Added: xfce4-mixer/trunk/.gitignore
===
--- xfce4-mixer/trunk/.gitignore(rev 0)
+++ xfce4-mixer/trunk/.gitignore2008-01-14 00:47:17 UTC (rev 26567)
@@ -0,0 +1,27 @@
+*.o
+ltmain.sh
+mkinstalldirs
+depcomp
+*.gmo
+Makefile.in.in
+.intltool-merge-cache
+configure.in
+libtool
+configure
+Makefile
+Makefile.in
+xfce4-mixer.desktop
+intltool-*
+config.*
+stamp-it
+stamp-h1
+POTFILES
+*.m4
+*.swp
+.deps
+.libs
+xfce4-mixer
+missing
+install-sh
+compile
+autom4te*

Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-01-13 19:27:18 UTC (rev 26566)
+++ xfce4-mixer/trunk/ChangeLog 2008-01-14 00:47:17 UTC (rev 26567)
@@ -1,3 +1,13 @@
+2008-01-14 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * configure.in.in, xfce4-mixer/xfce-mixer-card.{c,h},
+ xfce4-mixer/xfce-mixer.c: Add optional support for the GstMixer
+ notification API. It uses GstBus and GstMixerMessages. The latter
+ are only available with GStreamer = 0.10.14. Not all work is done
+ yet, but it will be worked on this week.
+   * autogen.sh: Tweak autogen.sh so that it works with both, SVN and
+ git-svn. 
+
 2008-01-13 Jannis Pohlmann [EMAIL PROTECTED]
 
* xfce4-mixer-card.{c,h}: Add XfceMixerCard class as a wrapper for

Modified: xfce4-mixer/trunk/TODO
===
--- xfce4-mixer/trunk/TODO  2008-01-13 19:27:18 UTC (rev 26566)
+++ xfce4-mixer/trunk/TODO  2008-01-14 00:47:17 UTC (rev 26567)
@@ -1,5 +1,11 @@
-* Monitor for changes and update the controls according to them
+* Monitor for changes and update the controls according to them:
+   1) Add GHashTable for (track name = mixer widget) lookup
+   2) Extend xfce_mixer_bus_message() to handle all types of messages
+  by updating the corresponding mixer widgets
+
 * Write panel plugin
+
 * Write MCS plugin (or go the xfconf way)
+
 * Allow changing controls from the console, probably via something like:
   --change-control=SOUNDCARD NAME:TRACK NAME:NEW VALUE

Modified: xfce4-mixer/trunk/autogen.sh
===
--- xfce4-mixer/trunk/autogen.sh2008-01-13 19:27:18 UTC (rev 26566)
+++ xfce4-mixer/trunk/autogen.sh2008-01-14 00:47:17 UTC (rev 26567)
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $Id$
-
+#
 # vi:set ts=2 sw=2 et ai:
 #
 # Copyright (c) 2008 Jannis Pohlmann [EMAIL PROTECTED]
@@ -29,6 +29,20 @@
 
 # Substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-sed -e s/@LINGUAS@/${linguas}/g  configure.in.in  configure.in
+if test -d .git/svn; then
+  revision=`LC_ALL=C git-svn find-rev HEAD`
+elif test -f .svn; then
+  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
+else
+  revision=
+fi
+sed -e s/@LINGUAS@/${linguas}/g \
+-e s/@REVISION@/${revision}/g \
+ configure.in.in  configure.in
 
 exec xdt-autogen $@
+
+# xdt-autogen clean does not remove all generated files
+(test xclean = x$1)  {
+  rm -rf configure.in
+} || true

Modified: xfce4-mixer/trunk/configure.in.in
===
--- xfce4-mixer/trunk/configure.in.in   2008-01-13 19:27:18 UTC (rev 26566)
+++ xfce4-mixer/trunk/configure.in.in   2008-01-14 00:47:17 UTC (rev 26567)
@@ -60,6 +60,19 @@
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
 
+dnl **
+dnl *** Check for GstMixer bus support ***
+dnl **
+HAVE_GST_MIXER_NOTIFICATION=no
+PKG_CHECK_MODULES(GST_MIXER_NOTIFICATION_API, 
+  gstreamer-plugins-base-0.10 = 0.10.14,
+  HAVE_GST_MIXER_NOTIFICATION=yes, 
+  HAVE_GST_MIXER_NOTIFICATION=no)
+if test x$HAVE_GST_MIXER_NOTIFICATION = xyes; then
+  AC_DEFINE(HAVE_GST_MIXER_NOTIFICATION, 1, 
+[Have GStreamer mixer notification API])
+fi

[Xfce4-commits] r26568 - xfce4-panel/trunk

2008-01-13 Thread Jannis Pohlmann

Author: jannis
Date: 2008-01-14 01:09:43 + (Mon, 14 Jan 2008)
New Revision: 26568

Modified:
   xfce4-panel/trunk/ChangeLog
   xfce4-panel/trunk/configure.in.in
Log:
* configure.in.in: Fix debugging support for SVN snapshots. Until now
  the default setting never was applied.
* libxfce4panel/xfce-panel-plugin-iface.c,
  panel/panel-properties.c: To prevent panel items from increasing the
  panel size, set the height of the XfceItembar instead of setting the
  size specifically for all items.
* libxfce4panel/xfce-panel-plugin-iface.c: Allow attach_widget to be
  NULL in call to xfce_panel_plugin_position_widget() and fix up the
  API documentation. Patch by Diego Ongaro and a few bits from me.
* plugins/windowlist/windowlist.c: fix for popup menu at pointer
  position. Another patch by Diego.
* libxfce4panel/*, docs/API/*: Remove the html and xml directories,
  those are generated by gtk-doc, 100% symbol coverage and improve
  the layout of the chapters.
* plugins/clock/clock-digital.c: Allow markup and center the string.
* plugins/clock/*: Move the localtime functions into 1 util and allow
  usage without locatime_r.
* plugins/clock/clock-lcd.c: Typo, the 8 was test code.
* plugins/clock/*: Import code.
* NEWS: update.
* Configure.in.in: Bump GTK dependency to 2.8.0 and add cairo as
  new dependency.
* po/*: Merge new strings.
* libxfce4panel/xfce-panel-macros.h: Add macros to disable debugging for
  release builds. 
 

Modified: xfce4-panel/trunk/ChangeLog
===
--- xfce4-panel/trunk/ChangeLog 2008-01-14 00:47:17 UTC (rev 26567)
+++ xfce4-panel/trunk/ChangeLog 2008-01-14 01:09:43 UTC (rev 26568)
@@ -1,14 +1,19 @@
+2008-01-14 02:08 jannis
+
+   * configure.in.in: Fix debugging support for SVN snapshots. Until now
+ the default setting never was applied.
+
 2007-10-01 21:21 jasper
 
-* libxfce4panel/xfce-panel-plugin-iface.c,
-  panel/panel-properties.c: To prevent panel items from increasing the
-  panel size, set the height of the XfceItembar instead of setting the
-  size specifically for all items.
-* libxfce4panel/xfce-panel-plugin-iface.c: Allow attach_widget to be
-  NULL in call to xfce_panel_plugin_position_widget() and fix up the
-  API documentation. Patch by Diego Ongaro and a few bits from me.
-* plugins/windowlist/windowlist.c: fix for popup menu at pointer
-  position. Another patch by Diego.
+   * libxfce4panel/xfce-panel-plugin-iface.c,
+ panel/panel-properties.c: To prevent panel items from increasing the
+ panel size, set the height of the XfceItembar instead of setting the
+ size specifically for all items.
+   * libxfce4panel/xfce-panel-plugin-iface.c: Allow attach_widget to be
+ NULL in call to xfce_panel_plugin_position_widget() and fix up the
+ API documentation. Patch by Diego Ongaro and a few bits from me.
+   * plugins/windowlist/windowlist.c: fix for popup menu at pointer
+ position. Another patch by Diego.
 
 2007-09-30 20:14 jasper
 
@@ -38,27 +43,27 @@
 
 2007-07-09 22:45 nick
 
-   * libxfce4panel/*, docs/API/*: Remove the html and xml directories,
- those are generated by gtk-doc, 100% symbol coverage and improve
- the layout of the chapters.
+   * libxfce4panel/*, docs/API/*: Remove the html and xml directories,
+ those are generated by gtk-doc, 100% symbol coverage and improve
+ the layout of the chapters.
 
 2007-07-08 12:00 nick
 
-   * plugins/clock/clock-digital.c: Allow markup and center the string.
-   * plugins/clock/*: Move the localtime functions into 1 util and allow
- usage without locatime_r.
+   * plugins/clock/clock-digital.c: Allow markup and center the string.
+   * plugins/clock/*: Move the localtime functions into 1 util and allow
+ usage without locatime_r.
 
 2007-07-07 10:32 nick
 
-   * plugins/clock/clock-lcd.c: Typo, the 8 was test code.
+   * plugins/clock/clock-lcd.c: Typo, the 8 was test code.
 
 2007-07-06 10:50 nick
 
-   * plugins/clock/*: Import code.
-   * NEWS: update.
-   * Configure.in.in: Bump GTK dependency to 2.8.0 and add cairo as
- new dependency.
-   * po/*: Merge new strings.
+   * plugins/clock/*: Import code.
+   * NEWS: update.
+   * Configure.in.in: Bump GTK dependency to 2.8.0 and add cairo as
+ new dependency.
+   * po/*: Merge new strings.
 
 2007-05-27 10:50 nick
 
@@ -113,8 +118,8 @@
 2007-03-18 15:23 nick
 
* libxfce4panel: Add visibility support to reduce the library size a 
bit.
-* libxfce4panel/xfce-panel-macros.h: Add macros to disable debugging 
for
-  release

[Xfce4-commits] r26569 - xfce4-mixer/trunk

2008-01-13 Thread Jannis Pohlmann

Author: jannis
Date: 2008-01-14 01:14:09 + (Mon, 14 Jan 2008)
New Revision: 26569

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/configure.in.in
Log:
* configure.in.in: Add support for version information, just like all
  the other Xfce components have. Also add special debugging support
  for SVN snapshots. Enhance the AC_COPYRIGHT value. Print build
  configuration at the end of ./configure.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-01-14 01:09:43 UTC (rev 26568)
+++ xfce4-mixer/trunk/ChangeLog 2008-01-14 01:14:09 UTC (rev 26569)
@@ -1,5 +1,12 @@
 2008-01-14 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * configure.in.in: Add support for version information, just like all
+ the other Xfce components have. Also add special debugging support
+ for SVN snapshots. Enhance the AC_COPYRIGHT value. Print build
+ configuration at the end of ./configure.
+
+2008-01-14 Jannis Pohlmann [EMAIL PROTECTED]
+
* configure.in.in, xfce4-mixer/xfce-mixer-card.{c,h},
  xfce4-mixer/xfce-mixer.c: Add optional support for the GstMixer
  notification API. It uses GstBus and GstMixerMessages. The latter

Modified: xfce4-mixer/trunk/configure.in.in
===
--- xfce4-mixer/trunk/configure.in.in   2008-01-14 01:09:43 UTC (rev 26568)
+++ xfce4-mixer/trunk/configure.in.in   2008-01-14 01:14:09 UTC (rev 26569)
@@ -4,10 +4,29 @@
 dnl
 
 dnl ***
+dnl *** Version information ***
+dnl ***
+m4_define([xfce4_mixer_version_major], [4])
+m4_define([xfce4_mixer_version_minor], [5])
+m4_define([xfce4_mixer_version_micro], [0])
+m4_define([xfce4_mixer_version_nano],  []) dnl leave this empty to have no 
nano version
+m4_define([xfce4_mixer_version_build], [EMAIL PROTECTED]@])
+m4_define([xfce4_mixer_version_tag],   [svn])
+m4_define([xfce4_mixer_version], 
[xfce4_mixer_version_major().xfce4_mixer_version_minor().xfce4_mixer_version_micro()ifelse(xfce4_mixer_version_nano(),
 [], [], [.xfce4_mixer_version_nano()])ifelse(xfce4_mixer_version_tag(), [svn], 
[xfce4_mixer_version_tag()-xfce4_mixer_version_build()], 
[xfce4_mixer_version_tag()])])
+
+dnl ***
+dnl *** Debugging support for SVN snapshots ***
+dnl ***
+m4_define([mixer_debug_default], [ifelse(xfce4_mixer_version_tag(), [svn], 
[full], [minimum])])
+
+dnl ***
 dnl *** Initialize autoconf ***
 dnl ***
-AC_COPYRIGHT([Copyright (c) 2007 Jannis Pohlmann [EMAIL PROTECTED]])
-AC_INIT([xfce4-mixer], [4.5.0], [EMAIL PROTECTED], [xfce4-mixer])
+AC_COPYRIGHT([Copyright (c) 2008
+The Xfce development team. All rights reserved.
+
+Written for Xfce by Jannis Pohlmann [EMAIL PROTECTED].])
+AC_INIT([xfce4-mixer], [xfce4_mixer_version], [http://bugzilla.xfce.org/], 
[xfce4-mixer])
 AC_REVISION([$Id$])
 AC_PREREQ([2.50])
 
@@ -76,8 +95,61 @@
 dnl ***
 dnl *** Check for debugging support ***
 dnl ***
-BM_DEBUG_SUPPORT()
+AC_ARG_ENABLE([debug],
+AC_HELP_STRING([--enable-debug=@:@no/minimum/yes/full@:@], 
+   [Turn on debugging @:@default=mixer_debug_default@:@]),
+   [], [enable_debug=mixer_debug_default])
+AC_MSG_CHECKING([whether to enable debugging support])
+if test x$enable_debug = xfull -o x$enable_debug = xyes; then
+  dnl Print the result
+  AC_MSG_RESULT([$enable_debug])
 
+  dnl Make sure we detect possible errors (if supported)
+  save_CFLAGS=$CFLAGS
+  CFLAGS=$CFLAGS -Wall -Werror
+  AC_MSG_CHECKING([whether $CC accepts -Wall -Werror])
+  AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
+AC_MSG_RESULT([yes])
+PLATFORM_CFLAGS=$PLATFORM_CFLAGS -Wall -Werror
+  ], [
+AC_MSG_RESULT([no])
+  ])
+  CFLAGS=$save_CFLAGS
+
+  dnl Paranoia for --enable-debug=full
+  if test x$enable_debug = xfull; then
+dnl Enable extensive debugging
+PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG
+
+dnl Use -O0 -g3 if the compiler supports it
+save_CFLAGS=$CFLAGS
+CFLAGS=$CFLAGS -O0 -g3
+AC_MSG_CHECKING([whether $CC accepts -O0 -g3])
+AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
+  AC_MSG_RESULT([yes])
+  PLATFORM_CFLAGS=$PLATFORM_CFLAGS -O0 -g3
+], [
+  AC_MSG_RESULT([no])
+])
+CFLAGS=$save_CFLAGS
+  fi
+else
+  dnl Print the result
+  AC_MSG_RESULT([$enable_debug])
+
+  dnl Disable debugging (release build)
+  PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DNDEBUG
+
+  dnl Disable object cast checks
+  PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS
+
+  dnl Disable all checks for --enable-debug=no
+  if test x$enable_debug = xno; then
+PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT

[Xfce4-commits] r26596 - libxfce4menu/trunk

2008-02-06 Thread Jannis Pohlmann

Author: jannis
Date: 2008-02-06 09:34:11 + (Wed, 06 Feb 2008)
New Revision: 26596

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/STATUS
Log:
* STATUS: Status file updated, mainly to reflect the progress made
  with filesystem monitoring.


Modified: libxfce4menu/trunk/ChangeLog
===
--- libxfce4menu/trunk/ChangeLog2008-02-04 19:16:26 UTC (rev 26595)
+++ libxfce4menu/trunk/ChangeLog2008-02-06 09:34:11 UTC (rev 26596)
@@ -1,3 +1,8 @@
+2008-02-06 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * STATUS: Status file updated, mainly to reflect the progress made
+ with filesystem monitoring.
+
 2008-01-02 Jannis Pohlmann [EMAIL PROTECTED]
 
* libxfce4menu/xfce-menu-item.{c,h}: Add support for the Comment field

Modified: libxfce4menu/trunk/STATUS
===
--- libxfce4menu/trunk/STATUS   2008-02-04 19:16:26 UTC (rev 26595)
+++ libxfce4menu/trunk/STATUS   2008-02-06 09:34:11 UTC (rev 26596)
@@ -87,8 +87,12 @@
 
   [-] Old
 
+See Move
+
   [-] New
 
+See Move
+
   [x] Layout
 
   [ ] DefaultLayout
@@ -167,19 +171,14 @@
 III. Filesystem monitoring
 ==
 
-  With a proper GObject structure for all classes (XfceMenu, 
-  XfceMenuDirectory, XfceMenuItem etc.) reloading objects independently
-  of each other should be no problem.
+  Filesystem monitoring is done by moving the actual work into the 
+  client application. Using XfceMenuMonitorVTable applications can
+  register functions to be called when monitoring of a file or 
+  directory is needed. They then have to care about monitoring 
+  themselves (see xfce-menu-monitor.{c,h} for details.
 
-  The only question is how monitoring should be done. Perhaps we can 
-  copy parts of ThunarVFS for this (as using ThunarVFS would only be 
-  possible if Thunar wouldn't use libxfce4menu).
 
-  So, unless there is a better method, FAM/Gamin would be used for 
-  monitoring files and directories.
 
-
-
 IV. UI interaction
 ==
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r26597 - libxfce4menu/trunk/po

2008-02-06 Thread Jannis Pohlmann

Author: jannis
Date: 2008-02-06 09:34:15 + (Wed, 06 Feb 2008)
New Revision: 26597

Modified:
   libxfce4menu/trunk/po/ChangeLog
Log:
Indentation fixed.


Modified: libxfce4menu/trunk/po/ChangeLog
===
--- libxfce4menu/trunk/po/ChangeLog 2008-02-06 09:34:11 UTC (rev 26596)
+++ libxfce4menu/trunk/po/ChangeLog 2008-02-06 09:34:15 UTC (rev 26597)
@@ -5,13 +5,13 @@
 2007-11-15  Mike Massonnet [EMAIL PROTECTED]
 
* ur.po, LINGUAS: Add Urdu translation by ﻢﺤﻣﺩ ﻊﻠﻳ ﺎﻠﻤﻜﻳ
-   [EMAIL PROTECTED]
+ [EMAIL PROTECTED]
 
 2007-11-11  Og Maciel [EMAIL PROTECTED]
 
-* pt_BR.po: Added Brazilian Portuguese translation
-by Og Maciel [EMAIL PROTECTED]
-* LINGUAS: Added pt_BR
+   * pt_BR.po: Added Brazilian Portuguese translation
+ by Og Maciel [EMAIL PROTECTED]
+   * LINGUAS: Added pt_BR
 
 2007-11-11  Mike Massonnet [EMAIL PROTECTED]
 
@@ -20,12 +20,12 @@
 2007-11-04  Jean-François Wauthy [EMAIL PROTECTED]
 
* LINGUAS, sq.po: Add Albanian translation by Besnik Bleta
-   [EMAIL PROTECTED]
+ [EMAIL PROTECTED]
 
 2007-09-24  Mike Massonnet [EMAIL PROTECTED]
 
* LINGUAS, lv.po: Add Latvian translation by RPrieditis
-   [EMAIL PROTECTED]
+ [EMAIL PROTECTED]
 
 2007-07-14  Daichi Kawahata [EMAIL PROTECTED]
 
@@ -37,3 +37,5 @@
* POTFILES.in: Add source files.
* de.po, libxfce4menu-0.1.pot, LINGUAS: Add POT file and
  initial German translations.
+
+vim:set sw=8 sts=8 ts=8 noexpandtab:

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27089 - in xfce4-mixer/trunk: . panel-plugin

2008-06-19 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-19 18:20:26 + (Thu, 19 Jun 2008)
New Revision: 27089

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
   xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
Log:
* panel-plugin/xfce-mixer-plugin.c: Try to start xfce4-mixer
  when the plugin button is clicked.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-19 17:02:38 UTC (rev 27088)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-19 18:20:26 UTC (rev 27089)
@@ -1,5 +1,10 @@
 2008-06-19 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * panel-plugin/xfce-mixer-plugin.c: Try to start xfce4-mixer 
+ when the plugin button is clicked.
+
+2008-06-19 Jannis Pohlmann [EMAIL PROTECTED]
+
* Huge code reorganization: Split the mixer into three parts: 
  libxfce4mixer, xfce4-mixer and the panel plugin. libxfce4mixer
  contains everything that's needed by both, the mixer and the 

Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-19 17:02:38 UTC 
(rev 27088)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-19 18:20:26 UTC 
(rev 27089)
@@ -53,12 +53,12 @@
 static XfceMixerPlugin *xfce_mixer_plugin_new(XfcePanelPlugin  
*plugin);
 static void xfce_mixer_plugin_free   (XfcePanelPlugin  
*plugin,
   XfceMixerPlugin  
*mixer_plugin);
-static gboolean xfce_mixer_plugin_size_changed   (XfcePanelPlugin  
*plugin,
-  gint  
size,
-  XfceMixerPlugin  
*mixer_plugin);
-static void xfce_mixer_plugin_volume_changed (XfceVolumeButton 
*button,
-  gdouble   
volume,
-  XfceMixerPlugin  
*mixer_plugin);
+static gboolean xfce_mixer_plugin_size_changed   (XfceMixerPlugin  
*mixer_plugin,
+  gint  
size);
+static void xfce_mixer_plugin_volume_changed (XfceMixerPlugin  
*mixer_plugin,
+  gdouble   
volume);
+static void xfce_mixer_plugin_configure  (XfceMixerPlugin  
*mixer_plugin);
+static void xfce_mixer_plugin_clicked(XfceMixerPlugin  
*mixer_plugin);
 
 
 
@@ -79,19 +79,23 @@
   /* Store pointer to the panel plugin */
   mixer_plugin-plugin = plugin;
 
-  mixer_plugin-hvbox = xfce_hvbox_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
+  mixer_plugin-hvbox = GTK_WIDGET (xfce_hvbox_new 
(GTK_ORIENTATION_HORIZONTAL, FALSE, 0));
+  xfce_panel_plugin_add_action_widget (plugin, mixer_plugin-hvbox);
   gtk_container_add (GTK_CONTAINER (plugin), mixer_plugin-hvbox);
   gtk_widget_show (mixer_plugin-hvbox);
 
   mixer_plugin-button = xfce_volume_button_new ();
   g_signal_connect (G_OBJECT (mixer_plugin-button), volume-changed, 
G_CALLBACK (xfce_mixer_plugin_volume_changed), mixer_plugin);
+  g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), clicked, 
G_CALLBACK (xfce_mixer_plugin_clicked), mixer_plugin);
   gtk_container_add (GTK_CONTAINER (mixer_plugin-hvbox), 
mixer_plugin-button);
   gtk_widget_show (mixer_plugin-button);
 
+  xfce_panel_plugin_menu_show_configure (plugin);
+
   /* Connect to plugin signals */
-  g_signal_connect (G_OBJECT (plugin), free-data, G_CALLBACK 
(xfce_mixer_plugin_free), mixer_plugin);
-  g_signal_connect (G_OBJECT (plugin), size-changed, G_CALLBACK 
(xfce_mixer_plugin_size_changed), mixer_plugin);
-//  g_signal_connect (G_OBJECT (plugin), configure, G_CALLBACK 
(xfce_mixer_plugin_configure), mixer_plugin);
+  g_signal_connect_swapped (G_OBJECT (plugin), free-data, G_CALLBACK 
(xfce_mixer_plugin_free), mixer_plugin);
+  g_signal_connect_swapped (G_OBJECT (plugin), size-changed, G_CALLBACK 
(xfce_mixer_plugin_size_changed), mixer_plugin);
+  g_signal_connect_swapped (G_OBJECT (plugin), configure, G_CALLBACK 
(xfce_mixer_plugin_configure), mixer_plugin);
 
   return mixer_plugin;
 }
@@ -122,13 +126,11 @@
 
 
 static gboolean
-xfce_mixer_plugin_size_changed (XfcePanelPlugin *plugin,
-gint size,
-XfceMixerPlugin *mixer_plugin)
+xfce_mixer_plugin_size_changed (XfceMixerPlugin *mixer_plugin,
+gint size)
 {
   GtkOrientation orientation;
 
-  g_return_val_if_fail (plugin != NULL, FALSE);
   g_return_val_if_fail (mixer_plugin != NULL, FALSE);
 
   /* Determine the icon size for the volume button */
@@ -138,7 +140,7

[Xfce4-commits] r27093 - in xfce4-mixer/trunk: . panel-plugin

2008-06-20 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-21 00:17:03 + (Sat, 21 Jun 2008)
New Revision: 27093

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
Log:
* panel-plugin/xfce-volume-button.c: Add support for GDK_Home
  and GDK_End for changing the volume to the maximum/minimum
  level.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 00:10:07 UTC (rev 27092)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 00:17:03 UTC (rev 27093)
@@ -1,5 +1,11 @@
 2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * panel-plugin/xfce-volume-button.c: Add support for GDK_Home
+ and GDK_End for changing the volume to the maximum/minimum
+ level.
+
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* libxfce4mixer/Makefile.am, 
  libxfce4mixer/xfce-mixer-card-combo.{c,h},
  libxfce4mixer/xfce-mixer-track-combo.{c,h}, 

Modified: xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-21 00:10:07 UTC 
(rev 27092)
+++ xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-21 00:17:03 UTC 
(rev 27093)
@@ -211,10 +211,17 @@
   gdouble value;
   gdouble step_increment;
   gdouble page_size;
+  gdouble min_value;
+  gdouble max_value;
 
   g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button));
 
-  g_object_get (G_OBJECT (button-adjustment), value, value, 
step-increment, step_increment, page-size, page_size, NULL);
+  g_object_get (G_OBJECT (button-adjustment), 
+value, value, 
+step-increment, step_increment, 
+page-size, page_size, 
+lower, min_value,
+upper, max_value, NULL);
 
   switch (event-keyval)
 {
@@ -230,6 +237,12 @@
   case GDK_Page_Down:
 gtk_adjustment_set_value (GTK_ADJUSTMENT (button-adjustment), value - 
page_size);
 break;
+  case GDK_Home:
+gtk_adjustment_set_value (GTK_ADJUSTMENT (button-adjustment), 
max_value);
+break;
+  case GDK_End:
+gtk_adjustment_set_value (GTK_ADJUSTMENT (button-adjustment), 
min_value);
+break;
 }
 
   xfce_volume_button_update (button);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27094 - in xfce4-mixer/trunk: . panel-plugin

2008-06-20 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-21 00:47:45 + (Sat, 21 Jun 2008)
New Revision: 27094

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/TODO
   xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
Log:
* panel-plugin/xfce-volume-button.c: Add support for toggling
  between minimum and last known volume using the middle
  mouse button.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 00:17:03 UTC (rev 27093)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 00:47:45 UTC (rev 27094)
@@ -1,5 +1,11 @@
 2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * panel-plugin/xfce-volume-button.c: Add support for toggling
+ between minimum and last known volume using the middle 
+ mouse button.
+
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* panel-plugin/xfce-volume-button.c: Add support for GDK_Home
  and GDK_End for changing the volume to the maximum/minimum
  level.

Modified: xfce4-mixer/trunk/TODO
===
--- xfce4-mixer/trunk/TODO  2008-06-21 00:17:03 UTC (rev 27093)
+++ xfce4-mixer/trunk/TODO  2008-06-21 00:47:45 UTC (rev 27094)
@@ -4,8 +4,7 @@
   by updating the corresponding mixer widgets
 
 * Write panel plugin
+   1) Monitor GStreamer for changes
 
-* Implement Xfconf support
-
 * Allow changing controls from the console, probably via something like:
   --change-control=SOUNDCARD NAME:TRACK NAME:NEW VALUE

Modified: xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-21 00:17:03 UTC 
(rev 27093)
+++ xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-21 00:47:45 UTC 
(rev 27094)
@@ -58,6 +58,9 @@
 static void xfce_volume_button_key_pressed(GtkWidget *widget,
GdkEventKey   *event,
XfceVolumeButton  *button);
+static void xfce_volume_button_button_pressed (GtkWidget *widget,
+   GdkEventButton*event,
+   XfceVolumeButton  *button);
 static void xfce_volume_button_enter  (GtkWidget *widget,
GdkEventCrossing  *event);
 static void xfce_volume_button_leave  (GtkWidget *widget,
@@ -89,6 +92,8 @@
   GtkWidget *image;
 
   GtkObject *adjustment;
+
+  gdoubleprevious_value;
 };
 
 
@@ -168,6 +173,7 @@
   gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 
   g_signal_connect (G_OBJECT (button), key-press-event, G_CALLBACK 
(xfce_volume_button_key_pressed), button);
+  g_signal_connect (G_OBJECT (button), button-press-event, G_CALLBACK 
(xfce_volume_button_button_pressed), button);
   g_signal_connect (G_OBJECT (button), enter-notify-event, G_CALLBACK 
(xfce_volume_button_enter), NULL);
   g_signal_connect (G_OBJECT (button), leave-notify-event, G_CALLBACK 
(xfce_volume_button_leave), NULL);
   g_signal_connect (G_OBJECT (button), scroll-event, G_CALLBACK 
(xfce_volume_button_scrolled), button);
@@ -245,6 +251,8 @@
 break;
 }
 
+  button-previous_value = value;
+
   xfce_volume_button_update (button);
 
   g_signal_emit_by_name (button, volume-changed, gtk_adjustment_get_value 
(GTK_ADJUSTMENT (button-adjustment)));
@@ -253,6 +261,39 @@
 
 
 static void 
+xfce_volume_button_button_pressed (GtkWidget*widget,
+   GdkEventButton   *event,
+   XfceVolumeButton *button)
+{
+  gdouble value;
+  gdouble min_value;
+
+  g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button));
+
+  g_object_get (G_OBJECT (button-adjustment), value, value, lower, 
min_value, NULL);
+
+  if (event-button == 2)
+{
+  if (gtk_adjustment_get_value (GTK_ADJUSTMENT (button-adjustment)) == 
min_value)
+{
+  gtk_adjustment_set_value (GTK_ADJUSTMENT (button-adjustment), 
button-previous_value);
+  button-previous_value = value;
+}
+  else
+{
+  gtk_adjustment_set_value (GTK_ADJUSTMENT (button-adjustment), 
min_value);
+  button-previous_value = value;
+}
+}
+
+  xfce_volume_button_update (button);
+
+  g_signal_emit_by_name (button, volume-changed, gtk_adjustment_get_value 
(GTK_ADJUSTMENT (button-adjustment)));
+}
+
+
+
+static void 
 xfce_volume_button_enter (GtkWidget*widget,
   GdkEventCrossing *event)
 {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27095 - in xfce4-mixer/trunk: . panel-plugin

2008-06-20 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-21 00:52:15 + (Sat, 21 Jun 2008)
New Revision: 27095

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
Log:
* panel-plugin/xfce-volume-button.c: Fix the button press
  callback: Return TRUE when the middle button was pressed,
  return FALSE otherwise.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 00:47:45 UTC (rev 27094)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 00:52:15 UTC (rev 27095)
@@ -1,5 +1,11 @@
 2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * panel-plugin/xfce-volume-button.c: Fix the button press
+ callback: Return TRUE when the middle button was pressed, 
+ return FALSE otherwise.
+
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* panel-plugin/xfce-volume-button.c: Add support for toggling
  between minimum and last known volume using the middle 
  mouse button.

Modified: xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-21 00:47:45 UTC 
(rev 27094)
+++ xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-21 00:52:15 UTC 
(rev 27095)
@@ -51,26 +51,26 @@
 
 
 
-static void xfce_volume_button_class_init (XfceVolumeButtonClass *klass);
-static void xfce_volume_button_init   (XfceVolumeButton  *button);
-static void xfce_volume_button_dispose(GObject   *object);
-static void xfce_volume_button_finalize   (GObject   *object);
-static void xfce_volume_button_key_pressed(GtkWidget *widget,
-   GdkEventKey   *event,
-   XfceVolumeButton  *button);
-static void xfce_volume_button_button_pressed (GtkWidget *widget,
-   GdkEventButton*event,
-   XfceVolumeButton  *button);
-static void xfce_volume_button_enter  (GtkWidget *widget,
-   GdkEventCrossing  *event);
-static void xfce_volume_button_leave  (GtkWidget *widget,
-   GdkEventCrossing  *event);
-static void xfce_volume_button_update (XfceVolumeButton  *button);
-static void xfce_volume_button_scrolled   (GtkWidget *widget,
-   GdkEventScroll*event,
-   XfceVolumeButton  *button);
-static void xfce_volume_button_volume_changed (XfceVolumeButton  *button,
-   gdoublevolume);
+static void xfce_volume_button_class_init (XfceVolumeButtonClass 
*klass);
+static void xfce_volume_button_init   (XfceVolumeButton  
*button);
+static void xfce_volume_button_dispose(GObject   
*object);
+static void xfce_volume_button_finalize   (GObject   
*object);
+static void xfce_volume_button_key_pressed(GtkWidget 
*widget,
+   GdkEventKey   
*event,
+   XfceVolumeButton  
*button);
+static gboolean xfce_volume_button_button_pressed (GtkWidget 
*widget,
+   GdkEventButton
*event,
+   XfceVolumeButton  
*button);
+static void xfce_volume_button_enter  (GtkWidget 
*widget,
+   GdkEventCrossing  
*event);
+static void xfce_volume_button_leave  (GtkWidget 
*widget,
+   GdkEventCrossing  
*event);
+static void xfce_volume_button_update (XfceVolumeButton  
*button);
+static void xfce_volume_button_scrolled   (GtkWidget 
*widget,
+   GdkEventScroll
*event,
+   XfceVolumeButton  
*button);
+static void xfce_volume_button_volume_changed (XfceVolumeButton  
*button,
+   gdouble
volume);
 
 
 
@@ -260,11 +260,12 @@
 
 
 
-static void 
+static gboolean 
 xfce_volume_button_button_pressed (GtkWidget*widget,
GdkEventButton   *event,
XfceVolumeButton *button)
 {
+  gboolean handled = FALSE;
   gdouble value;
   gdouble min_value

[Xfce4-commits] r27096 - in xfce4-mixer/trunk: . libxfce4mixer

2008-06-20 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-21 01:07:11 + (Sat, 21 Jun 2008)
New Revision: 27096

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
Log:
* libxfce4mixer/xfce-mixer-track-combo.c: Fix a wrong
  if-statement in xfce_mixer_track_combo_set_track(). Now the
  current mixer track should be preselected correctly when
  opening the properties dialog of the plugin.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 00:52:15 UTC (rev 27095)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 01:07:11 UTC (rev 27096)
@@ -1,5 +1,12 @@
 2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * libxfce4mixer/xfce-mixer-track-combo.c: Fix a wrong 
+ if-statement in xfce_mixer_track_combo_set_track(). Now the
+ current mixer track should be preselected correctly when
+ opening the properties dialog of the plugin.
+
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* panel-plugin/xfce-volume-button.c: Fix the button press
  callback: Return TRUE when the middle button was pressed, 
  return FALSE otherwise.

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21 
00:52:15 UTC (rev 27095)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21 
01:07:11 UTC (rev 27096)
@@ -188,7 +188,7 @@
 
   combo = XFCE_MIXER_TRACK_COMBO (g_object_new (TYPE_XFCE_MIXER_TRACK_COMBO, 
NULL));
 
-  xfce_mixer_track_combo_set_track (combo,track_name);
+  xfce_mixer_track_combo_set_track (combo, track_name);
   xfce_mixer_track_combo_set_soundcard (combo, card);
 
   return GTK_WIDGET (combo);
@@ -256,7 +256,7 @@
 
   g_free (combo-track_name);
 
-  if (G_UNLIKELY (track_name == NULL))
+  if (G_UNLIKELY (track_name != NULL))
 {
   combo-track_name = g_strdup (track_name);
   

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27105 - in xfce4-mixer/trunk: . panel-plugin xfce4-mixer

2008-06-21 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-21 12:38:04 + (Sat, 21 Jun 2008)
New Revision: 27105

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* panel-plugin/xfce-mixer-plugin.c: Add support for
  xfce_mixer_card_connect() so that the volume button is updated
  whenever the volume of the current mixer track is changed by
  another program.
* panel-plugin/xfce-mixer.c: Parse GST_MESSAGE_VOLUME_CHANGED
  messages, but don't handle them yet. In the mixer it's much more
  complicated than in the plugin, gonna do that later.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 12:31:48 UTC (rev 27104)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 12:38:04 UTC (rev 27105)
@@ -1,5 +1,15 @@
 2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * panel-plugin/xfce-mixer-plugin.c: Add support for
+ xfce_mixer_card_connect() so that the volume button is updated
+ whenever the volume of the current mixer track is changed by
+ another program.
+   * panel-plugin/xfce-mixer.c: Parse GST_MESSAGE_VOLUME_CHANGED
+ messages, but don't handle them yet. In the mixer it's much more
+ complicated than in the plugin, gonna do that later.
+
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* icons/: Add volume level icons (1x muted, 5x different sound
  wave icons). I'm not exactly satisfied, but it's better than
  before.

Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-21 12:31:48 UTC 
(rev 27104)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-21 12:38:04 UTC 
(rev 27105)
@@ -77,6 +77,11 @@
 static void xfce_mixer_plugin_replace_values (XfceMixerPlugin  
*mixer_plugin, 
   const gchar  
*card_name,
   const gchar  
*track_name);
+#ifdef HAVE_GST_MIXER_NOTIFICATION
+static gboolean xfce_mixer_plugin_bus_message(GstBus   
*bus,
+  GstMessage   
*message,
+  XfceMixerPlugin  
*mixer_plugin);
+#endif
 
 
 
@@ -359,6 +364,10 @@
 g_object_unref (G_OBJECT (mixer_plugin-track));
 
   mixer_plugin-card = XFCE_MIXER_CARD (xfce_mixer_utilities_get_card_by_name 
(mixer_plugin-card_name));
+#ifdef HAVE_GST_MIXER_NOTIFICATION
+  xfce_mixer_card_connect (mixer_plugin-card, G_CALLBACK 
(xfce_mixer_plugin_bus_message), mixer_plugin);
+#endif
+
   mixer_plugin-track = xfce_mixer_card_get_track_by_name (mixer_plugin-card, 
mixer_plugin-track_name);
 
   volumes = g_new (gint, mixer_plugin-track-num_channels);
@@ -389,3 +398,34 @@
   mixer_plugin-card_name = g_strdup (card_name);
   mixer_plugin-track_name = g_strdup (track_name);
 }
+
+
+
+#ifdef HAVE_GST_MIXER_NOTIFICATION
+static gboolean
+xfce_mixer_plugin_bus_message (GstBus  *bus,
+   GstMessage  *message,
+   XfceMixerPlugin *mixer_plugin)
+{
+  GstMixerTrack  *track = NULL;
+  gdouble volume;
+  gint   *volumes;
+  gintnum_channels;
+
+  if (G_UNLIKELY (!xfce_mixer_card_get_message_owner (mixer_plugin-card, 
message)))
+return TRUE;
+
+  g_debug (Message from card received: %s, GST_MESSAGE_TYPE_NAME (message));
+
+  if (G_LIKELY (gst_mixer_message_get_type (message) == 
GST_MIXER_MESSAGE_VOLUME_CHANGED))
+{
+  gst_mixer_message_parse_volume_changed (message, track, volumes, 
num_channels);
+
+  if (G_UNLIKELY (g_utf8_collate (track-label, 
mixer_plugin-track-label) == 0))
+{
+  volume = ((gdouble) volumes[0]) / mixer_plugin-track-max_volume;
+  xfce_volume_button_set_volume (XFCE_VOLUME_BUTTON 
(mixer_plugin-button), volume);
+}
+}
+}
+#endif

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-06-21 12:31:48 UTC (rev 
27104)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-06-21 12:38:04 UTC (rev 
27105)
@@ -321,6 +321,8 @@
   gbooleanmuted;
   gbooleanrecord;
   const gchar*option;
+  gint   *volumes;
+  gintnum_channels;
 
   if (G_UNLIKELY (!xfce_mixer_card_get_message_owner (mixer-card, message)))
 return TRUE;
@@ -341,6 +343,8 @@
 }
   else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED)
 {
+  gst_mixer_message_parse_volume_changed (message, track, volumes, 
num_channels);
+  g_debug

[Xfce4-commits] r27106 - in xfce4-mixer/trunk: . panel-plugin

2008-06-21 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-21 12:57:24 + (Sat, 21 Jun 2008)
New Revision: 27106

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/TODO
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
   xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
   xfce4-mixer/trunk/panel-plugin/xfce-volume-button.h
Log:
* panel-plugin/xfce-volume-button.{c,h}: Add mute-toggled
  signal for when the middle mouse button is clicked. Add
  xfce_volume_button_set_muted() method for manually changing
  the mute state of the button (does not affect the actual sound
  settings).
* panel-plugin/xfce-mixer-plugin.c: Handle
  GST_MESSAGE_MUTE_TOGGLED messages by setting the muted state
  of the plugin button.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 12:38:04 UTC (rev 27105)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 12:57:24 UTC (rev 27106)
@@ -1,5 +1,16 @@
 2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * panel-plugin/xfce-volume-button.{c,h}: Add mute-toggled 
+ signal for when the middle mouse button is clicked. Add 
+ xfce_volume_button_set_muted() method for manually changing
+ the mute state of the button (does not affect the actual sound
+ settings).
+   * panel-plugin/xfce-mixer-plugin.c: Handle 
+ GST_MESSAGE_MUTE_TOGGLED messages by setting the muted state
+ of the plugin button.
+ 
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* panel-plugin/xfce-mixer-plugin.c: Add support for
  xfce_mixer_card_connect() so that the volume button is updated
  whenever the volume of the current mixer track is changed by

Modified: xfce4-mixer/trunk/TODO
===
--- xfce4-mixer/trunk/TODO  2008-06-21 12:38:04 UTC (rev 27105)
+++ xfce4-mixer/trunk/TODO  2008-06-21 12:57:24 UTC (rev 27106)
@@ -3,8 +3,5 @@
2) Extend xfce_mixer_bus_message() to handle all types of messages
   by updating the corresponding mixer widgets
 
-* Write panel plugin
-   1) Monitor GStreamer for changes
-
 * Allow changing controls from the console, probably via something like:
   --change-control=SOUNDCARD NAME:TRACK NAME:NEW VALUE

Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-21 12:38:04 UTC 
(rev 27105)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-21 12:57:24 UTC 
(rev 27106)
@@ -69,6 +69,8 @@
   gint  
size);
 static void xfce_mixer_plugin_volume_changed (XfceMixerPlugin  
*mixer_plugin,
   gdouble   
volume);
+static void xfce_mixer_plugin_mute_toggled   (XfceMixerPlugin  
*mixer_plugin,
+  gboolean  
mute);
 static void xfce_mixer_plugin_configure  (XfceMixerPlugin  
*mixer_plugin);
 static void xfce_mixer_plugin_clicked(XfceMixerPlugin  
*mixer_plugin);
 static void xfce_mixer_plugin_read_config(XfceMixerPlugin  
*mixer_plugin);
@@ -113,6 +115,7 @@
   mixer_plugin-button = xfce_volume_button_new ();
   xfce_panel_plugin_add_action_widget (plugin, mixer_plugin-button);
   g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), volume-changed, 
G_CALLBACK (xfce_mixer_plugin_volume_changed), mixer_plugin);
+  g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), mute-toggled, 
G_CALLBACK (xfce_mixer_plugin_mute_toggled), mixer_plugin);
   g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), clicked, 
G_CALLBACK (xfce_mixer_plugin_clicked), mixer_plugin);
   gtk_container_add (GTK_CONTAINER (mixer_plugin-hvbox), 
mixer_plugin-button);
   gtk_widget_show (mixer_plugin-button);
@@ -224,6 +227,19 @@
 
 
 static void
+xfce_mixer_plugin_mute_toggled (XfceMixerPlugin *mixer_plugin,
+gboolean mute)
+{
+  g_return_if_fail (mixer_plugin != NULL);
+  g_return_if_fail (IS_XFCE_MIXER_CARD (mixer_plugin-card));
+  g_return_if_fail (GST_IS_MIXER_TRACK (mixer_plugin-track));
+
+  xfce_mixer_card_set_track_muted (mixer_plugin-card, mixer_plugin-track, 
mute);
+}
+
+
+
+static void
 xfce_mixer_plugin_clicked (XfceMixerPlugin *mixer_plugin)
 {
   g_return_if_fail (mixer_plugin != NULL);
@@ -411,21 +427,30 @@
   gdouble volume;
   gint   *volumes;
   gintnum_channels;
+  gbooleanmute;
 
   if (G_UNLIKELY (!xfce_mixer_card_get_message_owner (mixer_plugin-card, 
message)))
 return TRUE;
 
   g_debug (Message from card received: %s, GST_MESSAGE_TYPE_NAME (message));
 
-  if (G_LIKELY

[Xfce4-commits] r27112 - in xfce4-mixer/trunk: libxfce4mixer panel-plugin

2008-06-21 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-21 15:47:44 + (Sat, 21 Jun 2008)
New Revision: 27112

Modified:
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
Log:
Add some debugging output for Moe.


Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21 
15:17:00 UTC (rev 27111)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21 
15:47:44 UTC (rev 27112)
@@ -209,6 +209,8 @@
 
   g_return_if_fail (IS_XFCE_MIXER_TRACK_COMBO (combo));
 
+  g_message (set_soundcard: combo-track_name = %s, combo-track_name);
+
   if (G_LIKELY (combo-card != NULL))
 g_object_unref (G_OBJECT (combo-card));
 
@@ -238,11 +240,18 @@
   NAME_COLUMN, GST_MIXER_TRACK 
(titer-data)-label, 
   TRACK_COLUMN, GST_MIXER_TRACK (titer-data), -1);
 
+  g_message (compare %s to %s, combo-track_name, GST_MIXER_TRACK 
(titer-data)-label);
+
   if (G_UNLIKELY (combo-track_name != NULL  g_utf8_collate 
(GST_MIXER_TRACK (titer-data)-label, combo-track_name) == 0))
-active_index = counter;
+{
+  g_message (equal = active_index = %i, counter);
+  active_index = counter;
+}
 }
 }
 
+  g_message (active_index = %i, active_index);
+
   gtk_combo_box_set_active (GTK_COMBO_BOX (combo), active_index);
 }
 

Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-21 15:17:00 UTC 
(rev 27111)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-21 15:47:44 UTC 
(rev 27112)
@@ -188,6 +188,8 @@
 
   size -= 2 + 2 * MAX (mixer_plugin-button-style-xthickness, 
mixer_plugin-button-style-ythickness);
 
+  g_message (icon size = %i, size);
+
   xfce_volume_button_set_icon_size (XFCE_VOLUME_BUTTON (mixer_plugin-button), 
size);
   xfce_volume_button_update (XFCE_VOLUME_BUTTON (mixer_plugin-button));
 
@@ -253,22 +255,22 @@
 static void
 xfce_mixer_plugin_configure (XfceMixerPlugin *mixer_plugin)
 {
-  XfceMixerCard *card;
-  GstMixerTrack *track;
+  XfceMixerCard *card = NULL;
+  GstMixerTrack *track = NULL;
   GtkWidget *dialog;
 
   g_return_if_fail (mixer_plugin != NULL);
 
   xfce_panel_plugin_block_menu (mixer_plugin-plugin);
 
+  g_message (mixer_plugin-card_name = %s, mixer_plugin-track_name = %s, 
mixer_plugin-card_name, mixer_plugin-track_name);
+
   dialog = xfce_plugin_dialog_new (mixer_plugin-card_name, 
mixer_plugin-track_name);
 
   gtk_dialog_run (GTK_DIALOG (dialog));
 
   xfce_plugin_dialog_get_data (XFCE_PLUGIN_DIALOG (dialog), card, track);
 
-  gtk_widget_destroy (dialog);
-
   if (G_LIKELY (IS_XFCE_MIXER_CARD (card)  GST_IS_MIXER_TRACK (track)))
 {
   g_message (Changed to card %s and track %s, 
xfce_mixer_card_get_display_name (card), GST_MIXER_TRACK (track)-label);
@@ -280,6 +282,8 @@
   xfce_mixer_plugin_update_track (mixer_plugin);
 }
 
+  gtk_widget_destroy (dialog);
+
   xfce_panel_plugin_unblock_menu (mixer_plugin-plugin);
 }
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27113 - in xfce4-mixer/trunk: . libxfce4mixer

2008-06-21 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-21 15:58:21 + (Sat, 21 Jun 2008)
New Revision: 27113

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
Log:
* libxfce4mixer/xfce-mixer-track-combo.c: Increment the counter
  for determining the active track index only when playback
  and capture tracks are found.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 15:47:44 UTC (rev 27112)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 15:58:21 UTC (rev 27113)
@@ -1,5 +1,11 @@
 2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * libxfce4mixer/xfce-mixer-track-combo.c: Increment the counter
+ for determining the active track index only when playback
+ and capture tracks are found.
+
+2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
+
* panel-plugin/xfce-volume-button.{c,h}: Add mute-toggled 
  signal for when the middle mouse button is clicked. Add 
  xfce_volume_button_set_muted() method for manually changing

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21 
15:47:44 UTC (rev 27112)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-21 
15:58:21 UTC (rev 27113)
@@ -229,7 +229,7 @@
 
   gtk_list_store_clear (combo-model);
 
-  for (titer = xfce_mixer_card_get_tracks (combo-card), counter = 0; titer != 
NULL; titer = g_list_next (titer), ++counter)
+  for (titer = xfce_mixer_card_get_tracks (combo-card), counter = 0; titer != 
NULL; titer = g_list_next (titer))
 {
   type = xfce_mixer_track_type_new (titer-data);
 
@@ -247,6 +247,8 @@
   g_message (equal = active_index = %i, counter);
   active_index = counter;
 }
+
+  ++counter;
 }
 }
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27119 - in xfce4-mixer/trunk: . xfce4-mixer

2008-06-21 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 01:00:20 + (Sun, 22 Jun 2008)
New Revision: 27119

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.h
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-switch.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-switch.h
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.h
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* xfce4-mixer/xfce-mixer-track.{c,h},
  xfce4-mixer/xfce-mixer-option.{c,h},
  xfce4-mixer/xfce-mixer-switch.{c,h},
  xfce4-mixer/xfce-mixer.c: Implement monitoring for mute,
  record, volume, option and switch changes on all controls.
  Works like a charm!


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 22:27:50 UTC (rev 27118)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 01:00:20 UTC (rev 27119)
@@ -1,3 +1,12 @@
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * xfce4-mixer/xfce-mixer-track.{c,h},
+ xfce4-mixer/xfce-mixer-option.{c,h},
+ xfce4-mixer/xfce-mixer-switch.{c,h},
+ xfce4-mixer/xfce-mixer.c: Implement monitoring for mute,
+ record, volume, option and switch changes on all controls.
+ Works like a charm!
+
 2008-06-21 Jannis Pohlmann [EMAIL PROTECTED]
 
* libxfce4mixer/xfce-mixer-card.c: Mark cards as ready when

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c   2008-06-21 22:27:50 UTC 
(rev 27118)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c   2008-06-22 01:00:20 UTC 
(rev 27119)
@@ -56,6 +56,10 @@
   XfceMixerCard *card;
 
   GstMixerTrack *track;
+
+  GtkWidget *combo;
+
+  gboolean   ignore_signals;
 };
 
 
@@ -111,6 +115,7 @@
 static void
 xfce_mixer_option_init (XfceMixerOption *option)
 {
+  option-ignore_signals = FALSE;
 }
 
 
@@ -161,7 +166,6 @@
 xfce_mixer_option_create_contents (XfceMixerOption *option)
 {
   GstMixerOptions *options;
-  GtkWidget   *combo;
   GtkWidget   *label;
   const GList *iter;
   const gchar *active_option;
@@ -180,20 +184,20 @@
   options = GST_MIXER_OPTIONS (option-track);
   active_option = xfce_mixer_card_get_track_option (option-card, 
option-track);
 
-  combo = gtk_combo_box_new_text ();
+  option-combo = gtk_combo_box_new_text ();
 
   for (iter = options-values, i = 0; iter != NULL; iter = g_list_next (iter), 
++i)
 {
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), iter-data);
+  gtk_combo_box_append_text (GTK_COMBO_BOX (option-combo), iter-data);
 
   if (G_UNLIKELY (g_utf8_collate (active_option, iter-data) == 0))
-gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i);
+gtk_combo_box_set_active (GTK_COMBO_BOX (option-combo), i);
 }
   
-  gtk_box_pack_start (GTK_BOX (option), combo, FALSE, FALSE, 0);
-  gtk_widget_show (combo);
+  gtk_box_pack_start (GTK_BOX (option), option-combo, FALSE, FALSE, 0);
+  gtk_widget_show (option-combo);
 
-  g_signal_connect (combo, changed, G_CALLBACK (xfce_mixer_option_changed), 
option);
+  g_signal_connect (option-combo, changed, G_CALLBACK 
(xfce_mixer_option_changed), option);
 
   g_free (title);
 }
@@ -206,6 +210,9 @@
 {
   gchar *active_option;
 
+  if (G_UNLIKELY (option-ignore_signals))
+return;
+
   active_option = gtk_combo_box_get_active_text (combo);
 
   if (G_LIKELY (active_option != NULL))
@@ -214,3 +221,45 @@
   g_free (active_option);
 }
 }
+
+
+
+void
+xfce_mixer_option_update (XfceMixerOption *option)
+{
+  GstMixerOptions *options;
+  GtkTreeModel*model;
+  GtkTreeIter  iter;
+  const gchar *active_option;
+  gchar   *str;
+  gint i;
+
+  g_return_if_fail (IS_XFCE_MIXER_OPTION (option));
+
+  options = GST_MIXER_OPTIONS (option-track);
+  active_option = xfce_mixer_card_get_track_option (option-card, 
option-track);
+
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (option-combo));
+
+  if (gtk_tree_model_get_iter_first (model, iter))
+{
+  do 
+{
+  gtk_tree_model_get (model, iter, 0, str, -1);
+
+  if (G_UNLIKELY (g_utf8_collate (str, active_option) == 0))
+{
+  option-ignore_signals = TRUE;
+  gtk_combo_box_set_active_iter (GTK_COMBO_BOX (option-combo), 
iter);
+  option-ignore_signals = FALSE;
+
+  g_free (str);
+  
+  break;
+}
+
+  g_free (str);
+}
+  while (gtk_tree_model_iter_next (model, iter));
+}
+}

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.h
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.h   2008-06-21 22

[Xfce4-commits] r27120 - in xfce4-mixer/trunk: panel-plugin po

2008-06-21 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 01:34:11 + (Sun, 22 Jun 2008)
New Revision: 27120

Added:
   xfce4-mixer/trunk/po/xfce4-mixer.pot
Modified:
   xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c
   xfce4-mixer/trunk/po/ChangeLog
   xfce4-mixer/trunk/po/POTFILES.in
   xfce4-mixer/trunk/po/am.po
   xfce4-mixer/trunk/po/da.po
   xfce4-mixer/trunk/po/de.po
   xfce4-mixer/trunk/po/fr.po
   xfce4-mixer/trunk/po/nl.po
   xfce4-mixer/trunk/po/pt_BR.po
   xfce4-mixer/trunk/po/pt_PT.po
   xfce4-mixer/trunk/po/ru.po
   xfce4-mixer/trunk/po/si.po
Log:
* de.po: Update German translations.
* xfce4-mixer.pot, *.po: Merge strings.


Modified: xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c 2008-06-22 01:00:20 UTC 
(rev 27119)
+++ xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c 2008-06-22 01:34:11 UTC 
(rev 27120)
@@ -224,7 +224,7 @@
   gchar   *title;
 
   gtk_window_set_icon_name (GTK_WINDOW (dialog), xfce4-mixer);
-  gtk_window_set_title (GTK_WINDOW (dialog), _(Mixer Plugin Settings));
+  gtk_window_set_title (GTK_WINDOW (dialog), _(Mixer Plugin));
 
   xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), _(Please 
select which mixer track should be used by the plugin));
   

Modified: xfce4-mixer/trunk/po/ChangeLog
===
--- xfce4-mixer/trunk/po/ChangeLog  2008-06-22 01:00:20 UTC (rev 27119)
+++ xfce4-mixer/trunk/po/ChangeLog  2008-06-22 01:34:11 UTC (rev 27120)
@@ -1,16 +1,21 @@
-2008-06-21  Stephan Arts [EMAIL PROTECTED]
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * de.po: Update German translations.
+   * xfce4-mixer.pot, *.po: Merge strings.
+
+2008-06-21 Stephan Arts [EMAIL PROTECTED]
+
* nl.po, LINGUAS: Add Dutch translation
 
-2008-05-27  Mike Massonnet [EMAIL PROTECTED]
+2008-05-27 Mike Massonnet [EMAIL PROTECTED]
 
* da.po, LINGUAS: Add Danish translation (Ole Guldberg Jensen)
 
-2008-05-05  Og Maciel [EMAIL PROTECTED]
+2008-05-05 Og Maciel [EMAIL PROTECTED]
 
* pt_BR.po: Added Brazilian Portuguese translation file.
 
-2008-04-21  Og Maciel [EMAIL PROTECTED]
+2008-04-21 Og Maciel [EMAIL PROTECTED]
 
* pt_BR.po: Added Brazilian Portuguese translation.
* LINGUAS: Added pt_BR

Modified: xfce4-mixer/trunk/po/POTFILES.in
===
--- xfce4-mixer/trunk/po/POTFILES.in2008-06-22 01:00:20 UTC (rev 27119)
+++ xfce4-mixer/trunk/po/POTFILES.in2008-06-22 01:34:11 UTC (rev 27120)
@@ -1,3 +1,23 @@
+panel-plugin/xfce-mixer-plugin.c
+panel-plugin/xfce-plugin-dialog.c
+panel-plugin/xfce-volume-button.c
+panel-plugin/xfce-plugin-dialog.h
+panel-plugin/xfce-volume-button.h
+panel-plugin/xfce4-mixer-plugin.desktop.in.in
+libxfce4mixer/xfce-mixer-card.c
+libxfce4mixer/xfce-mixer-card-combo.c
+libxfce4mixer/xfce-mixer-preferences.c
+libxfce4mixer/xfce-mixer-stock.c
+libxfce4mixer/xfce-mixer-track-combo.c
+libxfce4mixer/xfce-mixer-track-type.c
+libxfce4mixer/xfce-mixer-utilities.c
+libxfce4mixer/xfce-mixer-card-combo.h
+libxfce4mixer/xfce-mixer-card.h
+libxfce4mixer/xfce-mixer-preferences.h
+libxfce4mixer/xfce-mixer-stock.h
+libxfce4mixer/xfce-mixer-track-combo.h
+libxfce4mixer/xfce-mixer-track-type.h
+libxfce4mixer/xfce-mixer-utilities.h
 xfce4-mixer/main.c
 xfce4-mixer/xfce-mixer.c
 xfce4-mixer/xfce-mixer-controls-dialog.c
@@ -5,8 +25,10 @@
 xfce4-mixer/xfce-mixer-switch.c
 xfce4-mixer/xfce-mixer-track.c
 xfce4-mixer/xfce-mixer-window.c
+xfce4-mixer/xfce-mixer-controls-dialog.h
+xfce4-mixer/xfce-mixer.h
+xfce4-mixer/xfce-mixer-option.h
+xfce4-mixer/xfce-mixer-switch.h
+xfce4-mixer/xfce-mixer-track.h
+xfce4-mixer/xfce-mixer-window.h
 xfce4-mixer/xfce4-mixer.desktop.in.in
-libxfce4mixer/xfce-mixer-card.c
-libxfce4mixer/xfce-mixer-preferences.c
-libxfce4mixer/xfce-mixer-stock.c
-libxfce4mixer/xfce-mixer-track-type.c

Modified: xfce4-mixer/trunk/po/am.po
===
--- xfce4-mixer/trunk/po/am.po  2008-06-22 01:00:20 UTC (rev 27119)
+++ xfce4-mixer/trunk/po/am.po  2008-06-22 01:34:11 UTC (rev 27120)
@@ -7,7 +7,7 @@
 msgstr 
 Project-Id-Version: xfce4-mixer 4.4.2\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2008-06-21 15:45+0200\n
+POT-Creation-Date: 2008-06-22 03:25+0200\n
 PO-Revision-Date: 2007-07-07 10:23+0100\n
 Last-Translator: tegegne tefera [EMAIL PROTECTED]\n
 Language-Team: Amharic [EMAIL PROTECTED]\n
@@ -15,6 +15,42 @@
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
 
+#: ../panel-plugin/xfce-mixer-plugin.c:248
+msgid Could not find xfce4-mixer in PATH.
+msgstr 
+
+#: ../panel-plugin/xfce-plugin-dialog.c:227
+#, fuzzy
+msgid Mixer Plugin
+msgstr ሚክሰር ስየማዎች
+
+#: ../panel-plugin/xfce-plugin-dialog.c:229
+msgid Please select which mixer track should be used

[Xfce4-commits] r27121 - in xfce4-mixer/trunk: . xfce4-mixer

2008-06-21 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 01:50:16 + (Sun, 22 Jun 2008)
New Revision: 27121

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
Log:
* xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the
  fader of a mixer track with only one channel (which was
  caused by accessing the unitialized track-lock_button
  variable).


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 01:34:11 UTC (rev 27120)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 01:50:16 UTC (rev 27121)
@@ -1,5 +1,12 @@
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the 
+ fader of a mixer track with only one channel (which was 
+ caused by accessing the unitialized track-lock_button
+ variable).
+
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
* xfce4-mixer/xfce-mixer-track.{c,h},
  xfce4-mixer/xfce-mixer-option.{c,h},
  xfce4-mixer/xfce-mixer-switch.{c,h},

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c2008-06-22 01:34:11 UTC 
(rev 27120)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c2008-06-22 01:50:16 UTC 
(rev 27121)
@@ -301,8 +301,8 @@
   for (iter = track-channel_faders, channel = 0; iter != NULL; iter = 
g_list_next (iter), ++channel)
 {
   /* If the channels are bound together, apply the volume to all the 
others */
-  if (G_LIKELY (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(track-lock_button
-gtk_range_set_value (GTK_RANGE (iter-data), gtk_range_get_value 
(range));
+  if (G_LIKELY (track-gst_track-num_channels = 2  
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (track-lock_button
+  gtk_range_set_value (GTK_RANGE (iter-data), gtk_range_get_value 
(range));
 
   volumes[channel] = (gint) gtk_range_get_value (GTK_RANGE (iter-data));
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27122 - in xfce4-mixer/trunk: . xfce4-mixer

2008-06-21 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 02:01:36 + (Sun, 22 Jun 2008)
New Revision: 27122

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* xfce4-mixer/xfce-mixer.c: Don't free the hash table keys as
  they are owned by GStreamer. That introduced a really, really
  weird bug ...
* xfce4-mixer/xfce-mixer-track.c: Use 5% step size for all
  faders.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 01:50:16 UTC (rev 27121)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 02:01:36 UTC (rev 27122)
@@ -1,5 +1,13 @@
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * xfce4-mixer/xfce-mixer.c: Don't free the hash table keys as
+ they are owned by GStreamer. That introduced a really, really
+ weird bug ...
+   * xfce4-mixer/xfce-mixer-track.c: Use 5% step size for all 
+ faders.
+
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
* xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the 
  fader of a mixer track with only one channel (which was 
  caused by accessing the unitialized track-lock_button

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c2008-06-22 01:50:16 UTC 
(rev 27121)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c2008-06-22 02:01:36 UTC 
(rev 27122)
@@ -192,6 +192,7 @@
   GtkWidget   *button_box;
   GtkWidget   *fader;
   const GList *iter;
+  gdouble  step;
   gint channel;
   gint columns;
   gint*volumes;
@@ -212,10 +213,12 @@
   gtk_table_attach (GTK_TABLE (track), label, 0, columns, 0, 1, GTK_FILL, 
GTK_SHRINK, 0, 0);
   gtk_widget_show (label);
 
+  step = (gdouble) (track-gst_track-max_volume - 
track-gst_track-min_volume) / (gdouble) 20;
+
   /* Create a fader for each channel */
   for (channel = 0; channel  track-gst_track-num_channels; ++channel)
 {
-  fader = gtk_vscale_new_with_range (track-gst_track-min_volume, 
track-gst_track-max_volume, 1);
+  fader = gtk_vscale_new_with_range (track-gst_track-min_volume, 
track-gst_track-max_volume, step);
   gtk_scale_set_draw_value (GTK_SCALE (fader), FALSE);
   gtk_range_set_inverted (GTK_RANGE (fader), TRUE);
   gtk_range_set_value (GTK_RANGE (fader), volumes[channel]);

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-06-22 01:50:16 UTC (rev 
27121)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-06-22 02:01:36 UTC (rev 
27122)
@@ -118,7 +118,7 @@
 static void
 xfce_mixer_init (XfceMixer *mixer)
 {
-  mixer-widgets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, 
NULL);
+  mixer-widgets = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
 }
 
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27130 - in xfce4-mixer/trunk: . panel-plugin

2008-06-22 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 12:09:04 + (Sun, 22 Jun 2008)
New Revision: 27130

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/TODO
   xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
Log:
* panel-plugin/xfce-volume-button.c: Preload icon pixbufs whenever
  the icon size is changed.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 10:57:49 UTC (rev 27129)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 12:09:04 UTC (rev 27130)
@@ -1,5 +1,10 @@
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * panel-plugin/xfce-volume-button.c: Preload icon pixbufs whenever
+ the icon size is changed.
+
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
* xfce4-mixer/xfce-mixer.c: Don't free the hash table keys as
  they are owned by GStreamer. That introduced a really, really
  weird bug ...

Modified: xfce4-mixer/trunk/TODO
===
--- xfce4-mixer/trunk/TODO  2008-06-22 10:57:49 UTC (rev 27129)
+++ xfce4-mixer/trunk/TODO  2008-06-22 12:09:04 UTC (rev 27130)
@@ -1,7 +1,9 @@
-* Monitor for changes and update the controls according to them:
-   1) Add GHashTable for (track name = mixer widget) lookup
-   2) Extend xfce_mixer_bus_message() to handle all types of messages
-  by updating the corresponding mixer widgets
+* Design new icons for the mixer plugin
 
+* Panel plugin: Decide on how to react on tracks with
+  different channel volume levels (median, minimum, maximum value?)
+
+* Panel plugin: Add volume percentage tooltip
+
 * Allow changing controls from the console, probably via something like:
   --change-control=SOUNDCARD NAME:TRACK NAME:NEW VALUE

Modified: xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-22 10:57:49 UTC 
(rev 27129)
+++ xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-22 12:09:04 UTC 
(rev 27130)
@@ -22,6 +22,7 @@
 #include config.h
 #endif
 
+#include gdk/gdk.h
 #include gtk/gtk.h
 
 #include gdk/gdkkeysyms.h
@@ -98,13 +99,15 @@
 {
   GtkButton __parent__;
 
-  GtkWidget *image;
+  GtkWidget  *image;
 
-  GtkObject *adjustment;
+  GtkObject  *adjustment;
 
-  gint   icon_size;
+  ginticon_size;
 
-  gboolean   is_muted;
+  GdkPixbuf **pixbufs;
+
+  gbooleanis_muted;
 };
 
 
@@ -187,6 +190,8 @@
 {
   button-is_muted = FALSE;
 
+  button-pixbufs = g_new0 (GdkPixbuf*, G_N_ELEMENTS (icons)-1);
+
   button-adjustment = gtk_adjustment_new (0.0, 0.0, 1.0, 0.05, 0.05, 0.2);
   button-image = xfce_scaled_image_new ();
 
@@ -220,8 +225,16 @@
 static void
 xfce_volume_button_finalize (GObject *object)
 {
+  gint i;
+
   XfceVolumeButton *button = XFCE_VOLUME_BUTTON (object);
 
+  for (i = 0; i  G_N_ELEMENTS (icons)-1; ++i)
+if (GDK_IS_PIXBUF (button-pixbufs[i]))
+  g_object_unref (G_OBJECT (button-pixbufs[i]));
+  
+  g_free (button-pixbufs);
+
   (*G_OBJECT_CLASS (xfce_volume_button_parent_class)-finalize) (object);
 }
 
@@ -368,22 +381,19 @@
   range = (upper - lower) / (G_N_ELEMENTS (icons) - 2);
 
   if (G_UNLIKELY (value == 0 || button-is_muted))
-pixbuf = xfce_themed_icon_load (icons[0], button-icon_size);
+pixbuf = button-pixbufs[0];
   else
 {
   for (i = 1; i  G_N_ELEMENTS (icons) - 1; ++i)
 if (value = range * i)
   {
-pixbuf = xfce_themed_icon_load (icons[i], button-icon_size);
+pixbuf = button-pixbufs[i];
 break;
   }
 }
 
   if (G_LIKELY (pixbuf != NULL))
-{
-  xfce_scaled_image_set_from_pixbuf (XFCE_SCALED_IMAGE (button-image), 
pixbuf);
-  g_object_unref (G_OBJECT (pixbuf));
-}
+xfce_scaled_image_set_from_pixbuf (XFCE_SCALED_IMAGE (button-image), 
pixbuf);
 }
 
 
@@ -421,9 +431,20 @@
 xfce_volume_button_set_icon_size (XfceVolumeButton *button,
   gint  size)
 {
+  gint i;
+
   g_return_if_fail (IS_XFCE_VOLUME_BUTTON (button));
   g_return_if_fail (size = 0);
+
   button-icon_size = size;
+
+  for (i = 0; i  G_N_ELEMENTS (icons)-1; ++i)
+{
+  if (GDK_IS_PIXBUF (button-pixbufs[i]))
+g_object_unref (G_OBJECT (button-pixbufs[i]));
+
+  button-pixbufs[i] = xfce_themed_icon_load (icons[i], button-icon_size);
+}
 }
 
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27131 - in xfce4-mixer/trunk: . panel-plugin po

2008-06-22 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 12:28:48 + (Sun, 22 Jun 2008)
New Revision: 27131

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/TODO
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
   xfce4-mixer/trunk/po/ChangeLog
   xfce4-mixer/trunk/po/am.po
   xfce4-mixer/trunk/po/da.po
   xfce4-mixer/trunk/po/de.po
   xfce4-mixer/trunk/po/fr.po
   xfce4-mixer/trunk/po/id.po
   xfce4-mixer/trunk/po/nl.po
   xfce4-mixer/trunk/po/pt_BR.po
   xfce4-mixer/trunk/po/pt_PT.po
   xfce4-mixer/trunk/po/ru.po
   xfce4-mixer/trunk/po/si.po
   xfce4-mixer/trunk/po/xfce4-mixer.pot
Log:
* panel-plugin/xfce-mixer-plugin.c: Add support for tooltips
  showing the currently used track and volume level in percent
  (e.g. 'Master: 50%').
* de.po: Update German translations.
* xfce4-mixer.pot, *.po: Merge strings.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 12:09:04 UTC (rev 27130)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 12:28:48 UTC (rev 27131)
@@ -1,5 +1,11 @@
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * panel-plugin/xfce-mixer-plugin.c: Add support for tooltips 
+ showing the currently used track and volume level in percent 
+ (e.g. 'Master: 50%').
+
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
* panel-plugin/xfce-volume-button.c: Preload icon pixbufs whenever
  the icon size is changed.
 

Modified: xfce4-mixer/trunk/TODO
===
--- xfce4-mixer/trunk/TODO  2008-06-22 12:09:04 UTC (rev 27130)
+++ xfce4-mixer/trunk/TODO  2008-06-22 12:28:48 UTC (rev 27131)
@@ -3,7 +3,5 @@
 * Panel plugin: Decide on how to react on tracks with
   different channel volume levels (median, minimum, maximum value?)
 
-* Panel plugin: Add volume percentage tooltip
-
 * Allow changing controls from the console, probably via something like:
   --change-control=SOUNDCARD NAME:TRACK NAME:NEW VALUE

Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-22 12:09:04 UTC 
(rev 27130)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-22 12:28:48 UTC 
(rev 27131)
@@ -51,6 +51,8 @@
   gchar   *card_name;
   gchar   *track_name;
 
+  GtkTooltips *tooltips;
+
   XfceMixerCard   *card;
   GstMixerTrack   *track;
 
@@ -107,6 +109,9 @@
   mixer_plugin-card = NULL;
   mixer_plugin-track = NULL;
 
+  mixer_plugin-tooltips = gtk_tooltips_new ();
+  gtk_tooltips_set_delay (mixer_plugin-tooltips, 10);
+
   mixer_plugin-hvbox = GTK_WIDGET (xfce_hvbox_new 
(GTK_ORIENTATION_HORIZONTAL, FALSE, 0));
   xfce_panel_plugin_add_action_widget (plugin, mixer_plugin-hvbox);
   gtk_container_add (GTK_CONTAINER (plugin), mixer_plugin-hvbox);
@@ -202,15 +207,21 @@
 xfce_mixer_plugin_volume_changed (XfceMixerPlugin  *mixer_plugin,
   gdouble   volume)
 {
-  gint *volumes;
-  gint  volume_range;
-  gint  new_volume;
-  gint  i;
+  gchar *tip_text;
+  gint  *volumes;
+  gint   volume_range;
+  gint   new_volume;
+  gint   i;
 
   g_return_if_fail (mixer_plugin != NULL);
   g_return_if_fail (IS_XFCE_MIXER_CARD (mixer_plugin-card));
   g_return_if_fail (GST_IS_MIXER_TRACK (mixer_plugin-track));
 
+  /* Set tooltip (e.g. 'Master: 50%') */
+  tip_text = g_strdup_printf (_(%s: %i%%), GST_MIXER_TRACK 
(mixer_plugin-track)-label, (gint) (volume * 100));
+  gtk_tooltips_set_tip (mixer_plugin-tooltips, mixer_plugin-button, 
tip_text, test);
+  g_free (tip_text);
+
   volumes = g_new (gint, mixer_plugin-track-num_channels);
 
   volume_range = mixer_plugin-track-max_volume - 
mixer_plugin-track-min_volume;
@@ -365,6 +376,7 @@
 {
   gint   *volumes;
   gdouble volume;
+  gchar  *tip_text;
 
   g_return_if_fail (mixer_plugin != NULL);
 
@@ -388,6 +400,11 @@
   xfce_mixer_card_get_track_volume (mixer_plugin-card, mixer_plugin-track, 
volumes);
   volume = ((gdouble) volumes[0]) / mixer_plugin-track-max_volume;
 
+  /* Set tooltip (e.g. 'Master: 50%') */
+  tip_text = g_strdup_printf (_(%s: %i%%), GST_MIXER_TRACK 
(mixer_plugin-track)-label, (gint) (volume * 100));
+  gtk_tooltips_set_tip (mixer_plugin-tooltips, mixer_plugin-button, 
tip_text, test);
+  g_free (tip_text);
+
   xfce_volume_button_set_volume (XFCE_VOLUME_BUTTON (mixer_plugin-button), 
volume);
 
   g_free (volumes);

Modified: xfce4-mixer/trunk/po/ChangeLog
===
--- xfce4-mixer/trunk/po/ChangeLog  2008-06-22 12:09:04 UTC (rev 27130)
+++ xfce4-mixer/trunk/po/ChangeLog  2008-06-22 12:28:48 UTC (rev 27131)
@@ -1,5 +1,10 @@
-2008-06-22  Mike Massonnet [EMAIL PROTECTED]
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * de.po: Update German translations

[Xfce4-commits] r27134 - in xfce4-mixer/trunk: . panel-plugin

2008-06-22 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 13:35:51 + (Sun, 22 Jun 2008)
New Revision: 27134

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
Log:
* panel-plugin/xfce-mixer-plugin.c: Ignore GstBus messages
  while applying changes to the active card/track to avoid
  conflicting states.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 13:27:43 UTC (rev 27133)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 13:35:51 UTC (rev 27134)
@@ -1,5 +1,11 @@
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * panel-plugin/xfce-mixer-plugin.c: Ignore GstBus messages
+ while applying changes to the active card/track to avoid
+ conflicting states.
+
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
* icons/: Revamp icons yet again.
 
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]

Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-22 13:27:43 UTC 
(rev 27133)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-22 13:35:51 UTC 
(rev 27134)
@@ -58,6 +58,8 @@
 
   GtkWidget   *hvbox;
   GtkWidget   *button;
+
+  gboolean ignore_bus_messages;
 };
 
 
@@ -108,6 +110,7 @@
 
   mixer_plugin-card = NULL;
   mixer_plugin-track = NULL;
+  mixer_plugin-ignore_bus_messages = FALSE;
 
   mixer_plugin-tooltips = gtk_tooltips_new ();
   gtk_tooltips_set_delay (mixer_plugin-tooltips, 10);
@@ -217,6 +220,8 @@
   g_return_if_fail (IS_XFCE_MIXER_CARD (mixer_plugin-card));
   g_return_if_fail (GST_IS_MIXER_TRACK (mixer_plugin-track));
 
+  mixer_plugin-ignore_bus_messages = TRUE;
+
   /* Set tooltip (e.g. 'Master: 50%') */
   tip_text = g_strdup_printf (_(%s: %i%%), GST_MIXER_TRACK 
(mixer_plugin-track)-label, (gint) (volume * 100));
   gtk_tooltips_set_tip (mixer_plugin-tooltips, mixer_plugin-button, 
tip_text, test);
@@ -233,6 +238,8 @@
   xfce_mixer_card_set_track_volume (mixer_plugin-card, mixer_plugin-track, 
volumes);
 
   g_free (volumes);
+
+  mixer_plugin-ignore_bus_messages = FALSE;
 }
 
 
@@ -245,7 +252,11 @@
   g_return_if_fail (IS_XFCE_MIXER_CARD (mixer_plugin-card));
   g_return_if_fail (GST_IS_MIXER_TRACK (mixer_plugin-track));
 
+  mixer_plugin-ignore_bus_messages = TRUE;
+
   xfce_mixer_card_set_track_muted (mixer_plugin-card, mixer_plugin-track, 
mute);
+
+  mixer_plugin-ignore_bus_messages = FALSE;
 }
 
 
@@ -442,6 +453,9 @@
   gintnum_channels;
   gbooleanmute;
 
+  if (G_UNLIKELY (mixer_plugin-ignore_bus_messages))
+return;
+
   if (G_UNLIKELY (!xfce_mixer_card_get_message_owner (mixer_plugin-card, 
message)))
 return TRUE;
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27135 - xfce4-mixer/trunk/panel-plugin

2008-06-22 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 14:14:39 + (Sun, 22 Jun 2008)
New Revision: 27135

Modified:
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
   xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
Log:
Add some debug messages for Jens.


Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-22 13:35:51 UTC 
(rev 27134)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-22 14:14:39 UTC 
(rev 27135)
@@ -48,17 +48,26 @@
 {
   XfcePanelPlugin *plugin;
 
+  /* Currently used sound card name */
   gchar   *card_name;
+
+  /* Currently used mixer track name */
   gchar   *track_name;
 
+  /* Tooltips structure */
   GtkTooltips *tooltips;
 
+  /* Sound card being used */
   XfceMixerCard   *card;
+
+  /* Mixer track being used */
   GstMixerTrack   *track;
 
+  /* Widgets */
   GtkWidget   *hvbox;
   GtkWidget   *button;
 
+  /* Flag for ignoring messages from the GstBus */
   gboolean ignore_bus_messages;
 };
 
@@ -108,26 +117,32 @@
   /* Store pointer to the panel plugin */
   mixer_plugin-plugin = plugin;
 
+  /* Initialize some of the plugin variables */
   mixer_plugin-card = NULL;
   mixer_plugin-track = NULL;
   mixer_plugin-ignore_bus_messages = FALSE;
 
+  /* Allocate a tooltips structure */
   mixer_plugin-tooltips = gtk_tooltips_new ();
   gtk_tooltips_set_delay (mixer_plugin-tooltips, 10);
 
+  /* Create container for the plugin */
   mixer_plugin-hvbox = GTK_WIDGET (xfce_hvbox_new 
(GTK_ORIENTATION_HORIZONTAL, FALSE, 0));
   xfce_panel_plugin_add_action_widget (plugin, mixer_plugin-hvbox);
   gtk_container_add (GTK_CONTAINER (plugin), mixer_plugin-hvbox);
   gtk_widget_show (mixer_plugin-hvbox);
 
+  /* Create volume button for the plugin */
   mixer_plugin-button = xfce_volume_button_new ();
-  xfce_panel_plugin_add_action_widget (plugin, mixer_plugin-button);
   g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), volume-changed, 
G_CALLBACK (xfce_mixer_plugin_volume_changed), mixer_plugin);
   g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), mute-toggled, 
G_CALLBACK (xfce_mixer_plugin_mute_toggled), mixer_plugin);
   g_signal_connect_swapped (G_OBJECT (mixer_plugin-button), clicked, 
G_CALLBACK (xfce_mixer_plugin_clicked), mixer_plugin);
   gtk_container_add (GTK_CONTAINER (mixer_plugin-hvbox), 
mixer_plugin-button);
   gtk_widget_show (mixer_plugin-button);
 
+  /* Let the volume button receive mouse events */
+  xfce_panel_plugin_add_action_widget (plugin, mixer_plugin-button);
+
   return mixer_plugin;
 }
 
@@ -137,9 +152,11 @@
 xfce_mixer_plugin_free (XfcePanelPlugin *plugin,
 XfceMixerPlugin *mixer_plugin)
 {
+  /* Free card and track names */
   g_free (mixer_plugin-card_name);
   g_free (mixer_plugin-track_name);
 
+  /* Free memory of the mixer plugin */
   panel_slice_free (XfceMixerPlugin, mixer_plugin);
 }
 
@@ -153,6 +170,7 @@
   /* Set up translation domain */
   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
 
+  /* Initialize the thread system */
   if (!g_thread_supported ())
 g_thread_init (NULL);
 
@@ -232,6 +250,10 @@
   volume_range = mixer_plugin-track-max_volume - 
mixer_plugin-track-min_volume;
   new_volume = mixer_plugin-track-min_volume + (volume * volume_range);
 
+  g_message (Volume changed for %s (%s):, xfce_mixer_card_get_display_name 
(mixer_plugin-card), GST_MIXER_TRACK (mixer_plugin-track)-label);
+  g_message (  min_volume = %i, max_volume = %i, volume_range = %i, 
new_volume = %i, 
+ mixer_plugin-track-min_volume, mixer_plugin-track-max_volume, 
volume_range, new_volume);
+
   for (i = 0; i  mixer_plugin-track-num_channels; ++i)
 volumes[i] = new_volume;
 
@@ -459,13 +481,15 @@
   if (G_UNLIKELY (!xfce_mixer_card_get_message_owner (mixer_plugin-card, 
message)))
 return TRUE;
 
-  g_debug (Message from card received: %s, GST_MESSAGE_TYPE_NAME (message));
+  g_message (Message from card received: %s, GST_MESSAGE_TYPE_NAME 
(message));
 
   switch (gst_mixer_message_get_type (message))
 {
   case GST_MIXER_MESSAGE_VOLUME_CHANGED:
 gst_mixer_message_parse_volume_changed (message, track, volumes, 
num_channels);
 
+g_message (  volume of %s changed to: %i, track-label, volumes[0]);
+
 if (G_UNLIKELY (g_utf8_collate (track-label, 
mixer_plugin-track-label) == 0))
   {
 volume = ((gdouble) volumes[0]) / mixer_plugin-track-max_volume;

Modified: xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-22 13:35:51 UTC 
(rev 27134)
+++ xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-06-22 14:14:39 UTC 
(rev 27135)
@@ -29,6 +29,8 @@
 
 #include libxfcegui4/libxfcegui4.h
 
+#include libxfce4mixer/xfce-mixer-stock.h
+

[Xfce4-commits] r27136 - in xfce4-mixer/trunk: . icons/scalable

2008-06-22 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 14:14:46 + (Sun, 22 Jun 2008)
New Revision: 27136

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/icons/scalable/audio-volume-01.svg
   xfce4-mixer/trunk/icons/scalable/audio-volume-02.svg
   xfce4-mixer/trunk/icons/scalable/audio-volume-03.svg
   xfce4-mixer/trunk/icons/scalable/audio-volume-04.svg
   xfce4-mixer/trunk/icons/scalable/audio-volume-05.svg
Log:
* icons/scalable/: Improved again.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 14:14:39 UTC (rev 27135)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 14:14:46 UTC (rev 27136)
@@ -1,5 +1,9 @@
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * icons/scalable/: Improved again.
+
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
* panel-plugin/xfce-mixer-plugin.c: Ignore GstBus messages
  while applying changes to the active card/track to avoid
  conflicting states.

Modified: xfce4-mixer/trunk/icons/scalable/audio-volume-01.svg
===
--- xfce4-mixer/trunk/icons/scalable/audio-volume-01.svg2008-06-22 
14:14:39 UTC (rev 27135)
+++ xfce4-mixer/trunk/icons/scalable/audio-volume-01.svg2008-06-22 
14:14:46 UTC (rev 27136)
@@ -384,7 +384,7 @@
xlink:href=#linearGradient3498
id=radialGradient3506
gradientUnits=userSpaceOnUse
-   
gradientTransform=matrix(43.968272,-19.425114,10.906929,30.761994,-1863.6997,-5.6801315)
+   
gradientTransform=matrix(43.968272,-19.425114,10.906929,30.761994,-1863.6997,-6.2189009)
cx=36.82843
cy=24.427683
fx=36.82843
@@ -395,7 +395,7 @@
xlink:href=#linearGradient3498
id=radialGradient3508
gradientUnits=userSpaceOnUse
-   
gradientTransform=matrix(32.313054,-14.275864,12.619686,35.592614,-1477.7809,-313.45956)
+   
gradientTransform=matrix(31.048208,-13.717057,12.125707,34.199395,-1418.48,-299.33636)
cx=36.82843
cy=24.427677
fx=36.82843
@@ -483,6 +483,10 @@
orientation=horizontal
position=-4.7729708
id=guide6153 /
+sodipodi:guide
+   orientation=horizontal
+   position=0.88388348
+   id=guide2256 /
   /sodipodi:namedview
   metadata
  id=metadata2571

Modified: xfce4-mixer/trunk/icons/scalable/audio-volume-02.svg
===
--- xfce4-mixer/trunk/icons/scalable/audio-volume-02.svg2008-06-22 
14:14:39 UTC (rev 27135)
+++ xfce4-mixer/trunk/icons/scalable/audio-volume-02.svg2008-06-22 
14:14:46 UTC (rev 27136)
@@ -384,7 +384,7 @@
xlink:href=#linearGradient3498
id=radialGradient3506
gradientUnits=userSpaceOnUse
-   
gradientTransform=matrix(43.968272,-19.425114,10.906929,30.761994,-1863.6997,-5.6801315)
+   
gradientTransform=matrix(43.968272,-19.425114,10.906929,30.761994,-1863.6997,-6.2189009)
cx=36.82843
cy=24.427683
fx=36.82843
@@ -395,7 +395,7 @@
xlink:href=#linearGradient3498
id=radialGradient3508
gradientUnits=userSpaceOnUse
-   
gradientTransform=matrix(32.313054,-14.275864,12.619686,35.592614,-1477.7809,-313.45956)
+   
gradientTransform=matrix(31.048208,-13.717057,12.125707,34.199395,-1418.48,-299.33636)
cx=36.82843
cy=24.427677
fx=36.82843
@@ -483,6 +483,10 @@
orientation=horizontal
position=-4.7729708
id=guide6153 /
+sodipodi:guide
+   orientation=horizontal
+   position=0.88388348
+   id=guide2256 /
   /sodipodi:namedview
   metadata
  id=metadata2571

Modified: xfce4-mixer/trunk/icons/scalable/audio-volume-03.svg
===
--- xfce4-mixer/trunk/icons/scalable/audio-volume-03.svg2008-06-22 
14:14:39 UTC (rev 27135)
+++ xfce4-mixer/trunk/icons/scalable/audio-volume-03.svg2008-06-22 
14:14:46 UTC (rev 27136)
@@ -384,7 +384,7 @@
xlink:href=#linearGradient3498
id=radialGradient3506
gradientUnits=userSpaceOnUse
-   
gradientTransform=matrix(43.968272,-19.425114,10.906929,30.761994,-1863.6997,-5.6801315)
+   
gradientTransform=matrix(43.968272,-19.425114,10.906929,30.761994,-1863.6997,-6.2189009)
cx=36.82843
cy=24.427683
fx=36.82843
@@ -395,7 +395,7 @@
xlink:href=#linearGradient3498
id=radialGradient3508
gradientUnits=userSpaceOnUse
-   
gradientTransform=matrix(32.313054,-14.275864,12.619686,35.592614,-1477.7809,-313.45956)
+   
gradientTransform=matrix(31.048208,-13.717057,12.125707,34.199395,-1418.48,-299.33636)
cx=36.82843
cy=24.427677
fx=36.82843
@@ -483,6 +483,10 @@
orientation=horizontal
position=-4.7729708
id=guide6153 /
+sodipodi:guide
+   orientation

[Xfce4-commits] r27139 - in xfce4-mixer/trunk: . libxfce4mixer panel-plugin

2008-06-22 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 21:43:39 + (Sun, 22 Jun 2008)
New Revision: 27139

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.c
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.h
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
   xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c
Log:
* libxfce4mixer/xfce-mixer-card.c: Improve
  xfce_card_get_message_owner() by additionally comparing
  device names. I noticed that sometimes plugins are not
  updated even though the GstBus should invoke the signal
  handler. Hopefully, this fixes it.
* libxfce4mixer/xfce-mixer-utilities.{c,h}: Add
  xfce_mixer_utilities_get_max_volume() to determine the
  maximum volume in a gint array.
* panel-plugin/xfce-mixer-plugin.c: Don't call g_object_ref on
  GstMixerTracks. Add methods for setting the card and track
  used by the plugin. Improve the _update_track() method.
  Remove _replace_values() method. Add a lot of comments.
* panel-plugin/xfce-plugin-dialog.c: Don't call g_object_ref on
  the GstMixerTrack in xfce_plugin_dialog_get_data().


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 20:57:28 UTC (rev 27138)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 21:43:39 UTC (rev 27139)
@@ -1,5 +1,22 @@
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * libxfce4mixer/xfce-mixer-card.c: Improve
+ xfce_card_get_message_owner() by additionally comparing 
+ device names. I noticed that sometimes plugins are not
+ updated even though the GstBus should invoke the signal
+ handler. Hopefully, this fixes it.
+   * libxfce4mixer/xfce-mixer-utilities.{c,h}: Add 
+ xfce_mixer_utilities_get_max_volume() to determine the
+ maximum volume in a gint array.
+   * panel-plugin/xfce-mixer-plugin.c: Don't call g_object_ref on
+ GstMixerTracks. Add methods for setting the card and track
+ used by the plugin. Improve the _update_track() method. 
+ Remove _replace_values() method. Add a lot of comments.
+   * panel-plugin/xfce-plugin-dialog.c: Don't call g_object_ref on
+ the GstMixerTrack in xfce_plugin_dialog_get_data().
+
+2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
+
* icons/scalable/: Improved again.
 
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c   2008-06-22 20:57:28 UTC 
(rev 27138)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c   2008-06-22 21:43:39 UTC 
(rev 27139)
@@ -375,9 +375,24 @@
 xfce_mixer_card_get_message_owner (XfceMixerCard *card,
GstMessage*message)
 {
+  gboolean  is_owner;
+  gchar*device_name1;
+  gchar*device_name2;
+
   g_return_val_if_fail (IS_XFCE_MIXER_CARD (card), FALSE);
   g_return_val_if_fail (GST_IS_MESSAGE (message), FALSE);
 
-  return GST_MESSAGE_SRC (message) == GST_OBJECT (card-element);
+  if (!GST_IS_MIXER (GST_MESSAGE_SRC (message)))
+return FALSE;
+
+  g_object_get (G_OBJECT (GST_MESSAGE_SRC (message)), device-name, 
device_name1, NULL);
+  g_object_get (G_OBJECT (card-element), device-name, device_name2, NULL);
+
+  is_owner = (GST_MESSAGE_SRC (message) == card-element || g_utf8_collate 
(device_name1, device_name2) == 0);
+
+  g_free (device_name1);
+  g_free (device_name2);
+
+  return is_owner;
 }
 #endif

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.c  2008-06-22 
20:57:28 UTC (rev 27138)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.c  2008-06-22 
21:43:39 UTC (rev 27139)
@@ -125,3 +125,20 @@
 
   return card;
 }
+
+
+
+gint
+xfce_mixer_utilities_get_max_volume (gint *volumes,
+ gint  num_channels)
+{
+  gint max = 0;
+
+  g_return_val_if_fail (volumes != NULL, 0);
+
+  for (--num_channels; num_channels = 0; --num_channels)
+if (volumes[num_channels]  max)
+  max = volumes[num_channels];
+
+  return max;
+}

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.h
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.h  2008-06-22 
20:57:28 UTC (rev 27138)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.h  2008-06-22 
21:43:39 UTC (rev 27139)
@@ -25,6 +25,8 @@
 
 GList *xfce_mixer_utilities_get_cards(void);
 XfceMixerCard *xfce_mixer_utilities_get_card_by_name (const gchar *card_name);
+gint

[Xfce4-commits] r27140 - in xfce4-mixer/trunk: . libxfce4mixer panel-plugin po

2008-06-22 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 22:05:17 + (Sun, 22 Jun 2008)
New Revision: 27140

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
   xfce4-mixer/trunk/po/am.po
   xfce4-mixer/trunk/po/da.po
   xfce4-mixer/trunk/po/de.po
   xfce4-mixer/trunk/po/fr.po
   xfce4-mixer/trunk/po/id.po
   xfce4-mixer/trunk/po/nl.po
   xfce4-mixer/trunk/po/pt_BR.po
   xfce4-mixer/trunk/po/pt_PT.po
   xfce4-mixer/trunk/po/ru.po
   xfce4-mixer/trunk/po/si.po
   xfce4-mixer/trunk/po/xfce4-mixer.pot
Log:
* libxfce4mixer/xfce-mixer-card.c,
  panel-plugin/xfce-mixer-plugin.c: Fix a compiler warning and
  and an error.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 21:43:39 UTC (rev 27139)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 22:05:17 UTC (rev 27140)
@@ -1,3 +1,9 @@
+2008-06-23 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * libxfce4mixer/xfce-mixer-card.c,
+ panel-plugin/xfce-mixer-plugin.c: Fix a compiler warning and
+ and an error.
+
 2008-06-22 Jannis Pohlmann [EMAIL PROTECTED]
 
* libxfce4mixer/xfce-mixer-card.c: Improve

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c   2008-06-22 21:43:39 UTC 
(rev 27139)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c   2008-06-22 22:05:17 UTC 
(rev 27140)
@@ -388,7 +388,7 @@
   g_object_get (G_OBJECT (GST_MESSAGE_SRC (message)), device-name, 
device_name1, NULL);
   g_object_get (G_OBJECT (card-element), device-name, device_name2, NULL);
 
-  is_owner = (GST_MESSAGE_SRC (message) == card-element || g_utf8_collate 
(device_name1, device_name2) == 0);
+  is_owner = (GST_MESSAGE_SRC (message) == GST_OBJECT (card-element) || 
g_utf8_collate (device_name1, device_name2) == 0);
 
   g_free (device_name1);
   g_free (device_name2);

Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-22 21:43:39 UTC 
(rev 27139)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-22 22:05:17 UTC 
(rev 27140)
@@ -90,7 +90,7 @@
 static void xfce_mixer_plugin_write_config  (XfceMixerPlugin  
*mixer_plugin);
 static void xfce_mixer_plugin_update_track  (XfceMixerPlugin  
*mixer_plugin);
 #ifdef HAVE_GST_MIXER_NOTIFICATION
-static gboolean xfce_mixer_plugin_bus_message   (GstBus   
*bus,
+static void xfce_mixer_plugin_bus_message   (GstBus   
*bus,
  GstMessage   
*message,
  XfceMixerPlugin  
*mixer_plugin);
 #endif

Modified: xfce4-mixer/trunk/po/am.po
===
--- xfce4-mixer/trunk/po/am.po  2008-06-22 21:43:39 UTC (rev 27139)
+++ xfce4-mixer/trunk/po/am.po  2008-06-22 22:05:17 UTC (rev 27140)
@@ -7,7 +7,7 @@
 msgstr 
 Project-Id-Version: xfce4-mixer 4.4.2\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2008-06-22 14:26+0200\n
+POT-Creation-Date: 2008-06-23 00:03+0200\n
 PO-Revision-Date: 2007-07-07 10:23+0100\n
 Last-Translator: tegegne tefera [EMAIL PROTECTED]\n
 Language-Team: Amharic [EMAIL PROTECTED]\n
@@ -16,13 +16,13 @@
 Content-Transfer-Encoding: 8bit\n
 
 #. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:221
-#: ../panel-plugin/xfce-mixer-plugin.c:404
+#: ../panel-plugin/xfce-mixer-plugin.c:251
+#: ../panel-plugin/xfce-mixer-plugin.c:466
 #, c-format
 msgid %s: %i%%
 msgstr 
 
-#: ../panel-plugin/xfce-mixer-plugin.c:259
+#: ../panel-plugin/xfce-mixer-plugin.c:315
 msgid Could not find xfce4-mixer in PATH.
 msgstr 
 

Modified: xfce4-mixer/trunk/po/da.po
===
--- xfce4-mixer/trunk/po/da.po  2008-06-22 21:43:39 UTC (rev 27139)
+++ xfce4-mixer/trunk/po/da.po  2008-06-22 22:05:17 UTC (rev 27140)
@@ -7,7 +7,7 @@
 msgstr 
 Project-Id-Version: xfce 4-mixer\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2008-06-22 14:26+0200\n
+POT-Creation-Date: 2008-06-23 00:03+0200\n
 PO-Revision-Date: 2008-05-18 21:16+0100\n
 Last-Translator: Ole Guldberg [EMAIL PROTECTED]\n
 Language-Team: Danish\n
@@ -17,13 +17,13 @@
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
 #. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:221
-#: ../panel-plugin/xfce-mixer-plugin.c:404
+#: ../panel-plugin/xfce-mixer-plugin.c:251
+#: ../panel-plugin/xfce-mixer-plugin.c:466
 #, c-format
 msgid %s: %i%%
 msgstr 
 
-#: ../panel-plugin/xfce-mixer-plugin.c:259
+#: ../panel-plugin/xfce-mixer-plugin.c:315
 msgid Could not find xfce4-mixer

[Xfce4-commits] r27141 - in xfce4-mixer/trunk: . libxfce4mixer panel-plugin po

2008-06-22 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-22 22:32:00 + (Sun, 22 Jun 2008)
New Revision: 27141

Removed:
   xfce4-mixer/trunk/po/xfce4-mixer.pot
Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/Makefile.am
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.c
   xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
   xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c
Log:
* libxfce4mixer/xfce-mixer-track-combo.c,
  libxfce4mixer/xfce-mixer-card-combo.c,
  libxfce4mixer/xfce-mixer-utilities.c,
  panel-plugin/xfce-mixer-plugin.c,
  panel-plugin/xfce-plugin-dialog.c: Fix compiler warnings due
  to missing includes.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-22 22:05:17 UTC (rev 27140)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-22 22:32:00 UTC (rev 27141)
@@ -1,5 +1,14 @@
 2008-06-23 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * libxfce4mixer/xfce-mixer-track-combo.c,
+ libxfce4mixer/xfce-mixer-card-combo.c,
+ libxfce4mixer/xfce-mixer-utilities.c,
+ panel-plugin/xfce-mixer-plugin.c,
+ panel-plugin/xfce-plugin-dialog.c: Fix compiler warnings due
+ to missing includes.
+
+2008-06-23 Jannis Pohlmann [EMAIL PROTECTED]
+
* libxfce4mixer/xfce-mixer-card.c,
  panel-plugin/xfce-mixer-plugin.c: Fix a compiler warning and
  and an error.

Modified: xfce4-mixer/trunk/libxfce4mixer/Makefile.am
===
--- xfce4-mixer/trunk/libxfce4mixer/Makefile.am 2008-06-22 22:05:17 UTC (rev 
27140)
+++ xfce4-mixer/trunk/libxfce4mixer/Makefile.am 2008-06-22 22:32:00 UTC (rev 
27141)
@@ -22,7 +22,10 @@
xfce-mixer-preferences.c
 
 libxfce4mixer_la_CFLAGS =  \
+   -I$(top_builddir)   \
-I$(top_srcdir) \
+   -DDATADIR=\$(datadir)\\
+   -DPACKAGE_LOCALE_DIR=\$(localedir)\   \
-DG_LOG_DOMAIN=\libxfce4mixer\\
$(PLATFORM_CFLAGS)  \
$(GLIB_CFLAGS)  \
@@ -40,4 +43,6 @@
$(GTK_FLAGS)\
$(LIBXFCE4UTIL_LIBS)\
$(LIBXFCEGUI4_LIBS) \
-   $(GST_PLUGINS_BASE_LIBS)
+   $(GST_PLUGINS_BASE_LIBS)\
+   -lgstaudio-0.10 \
+   -lgstinterfaces-0.10

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c 2008-06-22 
22:05:17 UTC (rev 27140)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c 2008-06-22 
22:32:00 UTC (rev 27141)
@@ -27,6 +27,7 @@
 #include gst/gst.h
 
 #include xfce-mixer-card.h
+#include xfce-mixer-utilities.h
 #include xfce-mixer-card-combo.h
 
 

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-22 
22:05:17 UTC (rev 27140)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c2008-06-22 
22:32:00 UTC (rev 27141)
@@ -22,10 +22,13 @@
 #include config.h
 #endif
 
+#include glib.h
+
 #include gtk/gtk.h
 
 #include xfce-mixer-track-type.h
 #include xfce-mixer-track-combo.h
+#include xfce-mixer-utilities.h
 
 
 

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.c  2008-06-22 
22:05:17 UTC (rev 27140)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-utilities.c  2008-06-22 
22:32:00 UTC (rev 27141)
@@ -24,6 +24,7 @@
 #endif
 
 #include glib.h
+#include glib/gi18n.h
 
 #include gst/gst.h
 #include gst/audio/mixerutils.h
@@ -85,7 +86,7 @@
 }
   else
 {
-  title = g_strdup_printf (gettext (Unknown Volume Control %d), 
(*counter)++);
+  title = g_strdup_printf (_(Unknown Volume Control %d), (*counter)++);
   name = g_strdup_printf (%s (%s), title, long_name);
   g_free (title);
 }

Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c  2008-06-22 22:05:17 UTC 
(rev 27140)
+++ xfce4-mixer/trunk

[Xfce4-commits] r27172 - in xfce4-settings/trunk: . dialogs/appearance-settings

2008-06-28 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-28 22:18:26 + (Sat, 28 Jun 2008)
New Revision: 27172

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
Log:
* dialogs/appearance-settings/appearance-dialog.glade: Improve
  the dialog layout. I've chosen 12px for horizontal distance
  and 6px for horizontal distance between neighboured widgets.
  All boxes now have a border of 10px expect for those inside
  notebooks+alignments: they now have a border of 6px.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-06-28 15:16:50 UTC (rev 27171)
+++ xfce4-settings/trunk/ChangeLog  2008-06-28 22:18:26 UTC (rev 27172)
@@ -0,0 +1,9 @@
+2008-06-28 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * dialogs/appearance-settings/appearance-dialog.glade: Improve
+ the dialog layout. I've chosen 12px for horizontal distance
+ and 6px for horizontal distance between neighboured widgets.
+ All boxes now have a border of 10px expect for those inside
+ notebooks+alignments: they now have a border of 6px.
+
+vim:set sw=8 sts=8 ts=8 noexpandtab:

Modified: 
xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
===
--- xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2008-06-28 15:16:50 UTC (rev 27171)
+++ xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2008-06-28 22:18:26 UTC (rev 27172)
@@ -1,158 +1,129 @@
 ?xml version=1.0 encoding=UTF-8 standalone=no?
 !DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Sat Jun 14 09:04:56 2008 --
+!--Generated with glade3 3.4.5 on Sun Jun 29 00:14:13 2008 --
 glade-interface
   requires lib=xfce4/
-  widget class=GtkDialog id=appearance-settings-dialog
-property name=border_width5/property
+  widget class=XfceTitledDialog id=appearance-settings-dialog
+property name=title translatable=yesAppearance Settings/property
 property name=resizableFalse/property
 property name=window_positionGTK_WIN_POS_CENTER_ON_PARENT/property
+property name=icon_namepreferences-desktop-theme/property
 property name=type_hintGDK_WINDOW_TYPE_HINT_DIALOG/property
 property name=has_separatorFalse/property
+property name=subtitle translatable=yesChange the looks of your Xfce 
desktop/property
 child internal-child=vbox
   widget class=GtkVBox id=dialog-vbox1
 property name=visibleTrue/property
-property name=spacing2/property
 child
   widget class=GtkVBox id=vbox1
 property name=visibleTrue/property
+property name=border_width6/property
 child
-  widget class=XfceHeading 
id=xfce-appearance-settings-heading
-property name=visibleTrue/property
-property name=icon_namepreferences-desktop-theme/property
-property name=subtitle translatable=yesChange the looks 
of your XFCE desktop/property
-property name=title translatable=yesAppearance 
Settings/property
-  /widget
-  packing
-property name=expandFalse/property
-property name=fillFalse/property
-  /packing
-/child
-child
   widget class=GtkNotebook id=notebook1
 property name=visibleTrue/property
 property name=can_focusTrue/property
 child
-  widget class=GtkFrame id=frame6
+  widget class=GtkNotebook id=notebook2
 property name=visibleTrue/property
-property name=label_xalign0/property
-property name=shadow_typeGTK_SHADOW_NONE/property
+property name=can_focusTrue/property
+property name=border_width10/property
 child
-  widget class=GtkAlignment id=alignment6
+  widget class=GtkVBox id=vbox8
 property name=visibleTrue/property
-property name=left_padding12/property
+property name=border_width10/property
 child
-  widget class=GtkNotebook id=notebook2
+  widget class=GtkLabel id=label14
 property name=visibleTrue/property
+property name=xalign0/property
+property name=yalign0/property
+property name=ypad6/property
+property name=label translatable=yesPlease 
select the UI-theme you want to use/property
+  /widget
+  packing

[Xfce4-commits] r27176 - in xfce4-settings/trunk: . dialogs/accessibility-settings

2008-06-28 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-28 22:28:58 + (Sat, 28 Jun 2008)
New Revision: 27176

Modified:
   xfce4-settings/trunk/ChangeLog
   
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
Log:
* dialogs/accessibility-settings/accessibility-dialog.glade:
  Same here. Maybe I should also mention that all these dialogs
  now use XfceTitledDialog instead of GtkDialog and XfceHeading.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-06-28 22:24:08 UTC (rev 27175)
+++ xfce4-settings/trunk/ChangeLog  2008-06-28 22:28:58 UTC (rev 27176)
@@ -1,5 +1,11 @@
 2008-06-28 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * dialogs/accessibility-settings/accessibility-dialog.glade:
+ Same here. Maybe I should also mention that all these dialogs
+ now use XfceTitledDialog instead of GtkDialog and XfceHeading.
+
+2008-06-28 Jannis Pohlmann [EMAIL PROTECTED]
+
* dialogs/appearance-settings/appearance-dialog.glade: Improve
  the dialog layout. I've chosen 12px for horizontal distance
  and 6px for horizontal distance between neighboured widgets.

Modified: 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
===
--- 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade  
2008-06-28 22:24:08 UTC (rev 27175)
+++ 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade  
2008-06-28 22:28:58 UTC (rev 27176)
@@ -1,10 +1,12 @@
 ?xml version=1.0 encoding=UTF-8 standalone=no?
 !DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Sun Jun 15 21:18:13 2008 --
+!--Generated with glade3 3.4.5 on Sun Jun 29 00:27:53 2008 --
 glade-interface
   requires lib=xfce4/
-  widget class=GtkDialog id=accessibility-settings-dialog
+  widget class=XfceTitledDialog id=accessibility-settings-dialog
+property name=title translatable=yesAccessibility settings/property
 property name=window_positionGTK_WIN_POS_CENTER_ON_PARENT/property
+property name=icon_namepreferences-desktop-accessibility/property
 property name=type_hintGDK_WINDOW_TYPE_HINT_DIALOG/property
 property name=has_separatorFalse/property
 child internal-child=vbox
@@ -15,23 +17,14 @@
   widget class=GtkVBox id=vbox1
 property name=visibleTrue/property
 child
-  widget class=XfceHeading id=xfce-heading1
-property name=eventsGDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK/property
-property 
name=icon_namepreferences-desktop-accessibility/property
-property name=title translatable=yesAccessibility 
settings/property
-  /widget
-  packing
-property name=expandFalse/property
-property name=fillFalse/property
-  /packing
-/child
-child
   widget class=GtkNotebook id=notebook1
 property name=visibleTrue/property
 property name=can_focusTrue/property
+property name=border_width10/property
 child
   widget class=GtkVBox id=vbox2
 property name=visibleTrue/property
+property name=border_width10/property
 child
   widget class=GtkFrame id=frame1
 property name=visibleTrue/property
@@ -44,6 +37,8 @@
 child
   widget class=GtkVBox id=vbox3
 property name=visibleTrue/property
+property name=border_width6/property
+property name=spacing6/property
 child
   widget class=GtkCheckButton 
id=xkb_accessx_sticky_check
 property name=visibleTrue/property
@@ -66,6 +61,7 @@
 child
   widget class=GtkVBox id=vbox7
 property 
name=visibleTrue/property
+property name=spacing6/property
 child
   widget class=GtkHBox id=hbox4
 property 
name=visibleTrue/property
@@ -160,6 +156,8 @@
 child
   widget class=GtkVBox id=vbox4
 property name=visibleTrue/property
+property name=border_width6/property
+property name=spacing6

[Xfce4-commits] r27177 - in xfce4-settings/trunk: . dialogs/keyboard-settings

2008-06-28 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-28 22:42:45 + (Sat, 28 Jun 2008)
New Revision: 27177

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
Log:
* dialogs/keyboard-settings/keyboard-dialog.glade: Same
  procedure as before.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-06-28 22:28:58 UTC (rev 27176)
+++ xfce4-settings/trunk/ChangeLog  2008-06-28 22:42:45 UTC (rev 27177)
@@ -1,5 +1,10 @@
 2008-06-28 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * dialogs/keyboard-settings/keyboard-dialog.glade: Same 
+ procedure as before.
+
+2008-06-28 Jannis Pohlmann [EMAIL PROTECTED]
+
* dialogs/accessibility-settings/accessibility-dialog.glade:
  Same here. Maybe I should also mention that all these dialogs
  now use XfceTitledDialog instead of GtkDialog and XfceHeading.

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
2008-06-28 22:28:58 UTC (rev 27176)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
2008-06-28 22:42:45 UTC (rev 27177)
@@ -1,10 +1,12 @@
 ?xml version=1.0 encoding=UTF-8 standalone=no?
 !DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Sat Jun 21 13:21:41 2008 --
+!--Generated with glade3 3.4.5 on Sun Jun 29 00:41:01 2008 --
 glade-interface
   requires lib=xfce4/
-  widget class=GtkDialog id=keyboard-settings-dialog
+  widget class=XfceTitledDialog id=keyboard-settings-dialog
+property name=title translatable=yesKeyboard Settings/property
 property name=window_positionGTK_WIN_POS_CENTER_ON_PARENT/property
+property name=icon_namepreferences-desktop-keyboard/property
 property name=type_hintGDK_WINDOW_TYPE_HINT_DIALOG/property
 property name=has_separatorFalse/property
 child internal-child=vbox
@@ -14,24 +16,17 @@
 child
   widget class=GtkVBox id=vbox1
 property name=visibleTrue/property
+property name=border_width10/property
+property name=spacing6/property
 child
-  widget class=XfceHeading id=xfce-heading1
-property name=eventsGDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK/property
-property 
name=icon_namepreferences-desktop-keyboard/property
-property name=title translatable=yesKeyboard 
settings/property
-  /widget
-  packing
-property name=expandFalse/property
-property name=fillFalse/property
-  /packing
-/child
-child
   widget class=GtkNotebook id=notebook1
 property name=visibleTrue/property
 property name=can_focusTrue/property
 child
   widget class=GtkHBox id=hbox1
 property name=visibleTrue/property
+property name=border_width10/property
+property name=spacing12/property
 child
   widget class=GtkFrame id=frame1
 property name=visibleTrue/property
@@ -40,6 +35,7 @@
 child
   widget class=GtkAlignment id=alignment1
 property name=visibleTrue/property
+property name=border_width6/property
 property name=left_padding12/property
 child
   widget class=GtkScrolledWindow 
id=scrolledwindow1
@@ -78,6 +74,7 @@
 child
   widget class=GtkVBox id=vbox2
 property name=visibleTrue/property
+property name=spacing6/property
 child
   widget class=GtkFrame id=frame2
 property name=visibleTrue/property
@@ -90,6 +87,8 @@
 child
   widget class=GtkVBox id=vbox3
 property name=visibleTrue/property
+property name=border_width6/property
+property name=spacing6/property
 child
   widget class=GtkCheckButton 
id=xkb_key_repeat_check
 property 
name=visibleTrue/property
@@ -111,6 +110,7 @@
 child
   widget class=GtkVBox id=vbox6

[Xfce4-commits] r27178 - in xfce4-settings/trunk: . dialogs/accessibility-settings dialogs/appearance-settings dialogs/keyboard-settings dialogs/mouse-settings

2008-06-28 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-28 23:02:33 + (Sat, 28 Jun 2008)
New Revision: 27178

Modified:
   xfce4-settings/trunk/ChangeLog
   
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
   xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
   xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
   xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
Log:
* dialogs/accessibility-settings/accessibility-dialog.glade,
  dialogs/appearance-settings/appearance-dialog.glade,
  dialogs/keyboard-settings/keyboard-dialog.glade,
  dialogs/mouse-settings/mouse-dialog.glade: Change maximum
  border width of all boxes to 6 in order to align the toplevel
  boxes with the dialog buttons. Update the mouse dialog in
  the same way as I did with the others before.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-06-28 22:42:45 UTC (rev 27177)
+++ xfce4-settings/trunk/ChangeLog  2008-06-28 23:02:33 UTC (rev 27178)
@@ -1,5 +1,15 @@
 2008-06-28 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * dialogs/accessibility-settings/accessibility-dialog.glade,
+ dialogs/appearance-settings/appearance-dialog.glade,
+ dialogs/keyboard-settings/keyboard-dialog.glade,
+ dialogs/mouse-settings/mouse-dialog.glade: Change maximum
+ border width of all boxes to 6 in order to align the toplevel
+ boxes with the dialog buttons. Update the mouse dialog in
+ the same way as I did with the others before.
+
+2008-06-28 Jannis Pohlmann [EMAIL PROTECTED]
+
* dialogs/keyboard-settings/keyboard-dialog.glade: Same 
  procedure as before.
 

Modified: 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
===
--- 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade  
2008-06-28 22:42:45 UTC (rev 27177)
+++ 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade  
2008-06-28 23:02:33 UTC (rev 27178)
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=UTF-8 standalone=no?
 !DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Sun Jun 29 00:27:53 2008 --
+!--Generated with glade3 3.4.5 on Sun Jun 29 00:52:57 2008 --
 glade-interface
   requires lib=xfce4/
   widget class=XfceTitledDialog id=accessibility-settings-dialog
@@ -20,11 +20,12 @@
   widget class=GtkNotebook id=notebook1
 property name=visibleTrue/property
 property name=can_focusTrue/property
-property name=border_width10/property
+property name=border_width6/property
 child
   widget class=GtkVBox id=vbox2
 property name=visibleTrue/property
-property name=border_width10/property
+property name=border_width6/property
+property name=spacing6/property
 child
   widget class=GtkFrame id=frame1
 property name=visibleTrue/property
@@ -407,7 +408,7 @@
 child
   widget class=GtkVBox id=vbox5
 property name=visibleTrue/property
-property name=border_width10/property
+property name=border_width6/property
 child
   widget class=GtkFrame id=frame4
 property name=visibleTrue/property

Modified: 
xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
===
--- xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2008-06-28 22:42:45 UTC (rev 27177)
+++ xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2008-06-28 23:02:33 UTC (rev 27178)
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=UTF-8 standalone=no?
 !DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Sun Jun 29 00:14:13 2008 --
+!--Generated with glade3 3.4.5 on Sun Jun 29 00:55:43 2008 --
 glade-interface
   requires lib=xfce4/
   widget class=XfceTitledDialog id=appearance-settings-dialog
@@ -26,11 +26,11 @@
   widget class=GtkNotebook id=notebook2
 property name=visibleTrue/property
 property name=can_focusTrue/property
-property name=border_width10/property
+property name=border_width6/property
 child
   widget class=GtkVBox id=vbox8
 property name=visibleTrue/property
-property name=border_width10/property
+property name

[Xfce4-commits] r27180 - in xfce4-settings/trunk: . dialogs/accessibility-settings dialogs/appearance-settings dialogs/keyboard-settings dialogs/mouse-settings

2008-06-29 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-29 12:31:36 + (Sun, 29 Jun 2008)
New Revision: 27180

Modified:
   xfce4-settings/trunk/ChangeLog
   
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
   xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
   xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
   xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
Log:
* dialogs/accessibility-settings/accessibility-dialog.glade,
  dialogs/appearance-settings/appearance-dialog.glade,
  dialogs/keyboard-settings/keyboard-dialog.glade,
  dialogs/mouse-settings/mouse-dialog.glade: Change border of
  toplevel boxes inside notebooks to 12px for the sake of
  consistency (thunar does the same). Add bottom padding of
  alignments below section titles to 6px.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-06-29 12:11:52 UTC (rev 27179)
+++ xfce4-settings/trunk/ChangeLog  2008-06-29 12:31:36 UTC (rev 27180)
@@ -1,5 +1,15 @@
-2008-06-29 Nick Schermer nickxfce.org
+2008-06-29 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * dialogs/accessibility-settings/accessibility-dialog.glade,
+ dialogs/appearance-settings/appearance-dialog.glade,
+ dialogs/keyboard-settings/keyboard-dialog.glade,
+ dialogs/mouse-settings/mouse-dialog.glade: Change border of
+ toplevel boxes inside notebooks to 12px for the sake of 
+ consistency (thunar does the same). Add bottom padding of
+ alignments below section titles to 6px.
+
+2008-06-29 Nick Schermer [EMAIL PROTECTED]
+
* xfce4-settings-manager/xfce-settings-manager-dialog.c Dialog
  default size is 600x400px; Changed window icon name to
  preferences-desktop instead of xfce4-settings, since that's

Modified: 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
===
--- 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade  
2008-06-29 12:11:52 UTC (rev 27179)
+++ 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade  
2008-06-29 12:31:36 UTC (rev 27180)
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=UTF-8 standalone=no?
 !DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Sun Jun 29 00:52:57 2008 --
+!--Generated with glade3 3.4.5 on Sun Jun 29 14:23:01 2008 --
 glade-interface
   requires lib=xfce4/
   widget class=XfceTitledDialog id=accessibility-settings-dialog
@@ -24,7 +24,7 @@
 child
   widget class=GtkVBox id=vbox2
 property name=visibleTrue/property
-property name=border_width6/property
+property name=border_width12/property
 property name=spacing6/property
 child
   widget class=GtkFrame id=frame1
@@ -34,6 +34,7 @@
 child
   widget class=GtkAlignment id=alignment1
 property name=visibleTrue/property
+property name=bottom_padding6/property
 property name=left_padding12/property
 child
   widget class=GtkVBox id=vbox3
@@ -153,6 +154,7 @@
 child
   widget class=GtkAlignment id=alignment2
 property name=visibleTrue/property
+property name=bottom_padding6/property
 property name=left_padding12/property
 child
   widget class=GtkVBox id=vbox4
@@ -408,7 +410,7 @@
 child
   widget class=GtkVBox id=vbox5
 property name=visibleTrue/property
-property name=border_width6/property
+property name=border_width12/property
 child
   widget class=GtkFrame id=frame4
 property name=visibleTrue/property

Modified: 
xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
===
--- xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2008-06-29 12:11:52 UTC (rev 27179)
+++ xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2008-06-29 12:31:36 UTC (rev 27180)
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=UTF-8 standalone=no?
 !DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Sun Jun 29 14:00:30 2008 --
+!--Generated with glade3 3.4.5 on Sun Jun 29 14:25:24 2008 --
 glade-interface
   requires lib

[Xfce4-commits] r27181 - in xfce4-settings/trunk: . xfce4-settings-manager

2008-06-29 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-29 12:31:40 + (Sun, 29 Jun 2008)
New Revision: 27181

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
Log:
* xfce4-settings-manager/xfce-settings-manager-dialog.c:
  Add 6px border to the scrolled window in order to align it
  with the dialog buttons.
* xfce4-settings-manager/xfce-settings-manager-dialog.c: Dialog

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-06-29 12:31:36 UTC (rev 27180)
+++ xfce4-settings/trunk/ChangeLog  2008-06-29 12:31:40 UTC (rev 27181)
@@ -1,5 +1,11 @@
 2008-06-29 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * xfce4-settings-manager/xfce-settings-manager-dialog.c: 
+ Add 6px border to the scrolled window in order to align it
+ with the dialog buttons.
+
+2008-06-29 Jannis Pohlmann [EMAIL PROTECTED]
+
* dialogs/accessibility-settings/accessibility-dialog.glade,
  dialogs/appearance-settings/appearance-dialog.glade,
  dialogs/keyboard-settings/keyboard-dialog.glade,
@@ -10,7 +16,7 @@
 
 2008-06-29 Nick Schermer [EMAIL PROTECTED]
 
-   * xfce4-settings-manager/xfce-settings-manager-dialog.c Dialog
+   * xfce4-settings-manager/xfce-settings-manager-dialog.c: Dialog
  default size is 600x400px; Changed window icon name to
  preferences-desktop instead of xfce4-settings, since that's
  the default icon name; Don't show the dialog separator.

Modified: 
xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
===
--- xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c  
2008-06-29 12:31:36 UTC (rev 27180)
+++ xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c  
2008-06-29 12:31:40 UTC (rev 27181)
@@ -106,6 +106,7 @@
 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), 
GTK_SHADOW_IN);
 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+gtk_container_set_border_width (GTK_CONTAINER (sw), 6);
 gtk_widget_show(sw);
 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)-vbox), sw, TRUE, TRUE, 0);
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27182 - in libxfce4util/trunk: . libxfce4util

2008-06-29 Thread Jannis Pohlmann

Author: jannis
Date: 2008-06-29 16:51:33 + (Sun, 29 Jun 2008)
New Revision: 27182

Modified:
   libxfce4util/trunk/ChangeLog
   libxfce4util/trunk/INSTALL
   libxfce4util/trunk/libxfce4util/xfce-resource.c
Log:
* libxfce4util/xfce-resource.c: Add _res_remove_trailing_slashes().
  It is used to support _res_remove_duplicates() in finding paths
  which appear multiple times but in fact refer to the same
  directory (like e.g. /usr/share/// and /usr/share). Use
  g_build_path() in g_resource_lookup() and g_resource_lookup_all()
  instead of concatenating with %s/%s.

Modified: libxfce4util/trunk/ChangeLog
===
--- libxfce4util/trunk/ChangeLog2008-06-29 12:31:40 UTC (rev 27181)
+++ libxfce4util/trunk/ChangeLog2008-06-29 16:51:33 UTC (rev 27182)
@@ -1,3 +1,12 @@
+2008-06-29 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * libxfce4util/xfce-resource.c: Add _res_remove_trailing_slashes().
+ It is used to support _res_remove_duplicates() in finding paths
+ which appear multiple times but in fact refer to the same
+ directory (like e.g. /usr/share/// and /usr/share). Use 
+ g_build_path() in g_resource_lookup() and g_resource_lookup_all()
+ instead of concatenating with %s/%s.
+
 2007-12-17  Brian Tarricone [EMAIL PROTECTED]
 
 * Fix docs/ stuff to include new signal handling functionality.

Modified: libxfce4util/trunk/INSTALL
===
--- libxfce4util/trunk/INSTALL  2008-06-29 12:31:40 UTC (rev 27181)
+++ libxfce4util/trunk/INSTALL  2008-06-29 16:51:33 UTC (rev 27182)
@@ -2,7 +2,7 @@
 *
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@
  all sorts of other programs in order to regenerate files that came
  with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
 Compilers and Options
 =
 

Modified: libxfce4util/trunk/libxfce4util/xfce-resource.c
===
--- libxfce4util/trunk/libxfce4util/xfce-resource.c 2008-06-29 12:31:40 UTC 
(rev 27181)
+++ libxfce4util/trunk/libxfce4util/xfce-resource.c 2008-06-29 16:51:33 UTC 
(rev 27182)
@@ -124,6 +124,43 @@
 
 
 
+static GList*
+_res_remove_trailing_slashes (GList *list)
+{
+  GList   *ll = NULL;
+  GList   *lp;
+  const gchar *path;
+  gint len;
+
+  for (lp = list; lp != NULL; lp = lp-next)
+{
+  path = (const gchar *) lp-data;
+  len = strlen (path);
+
+  while (len  0  G_IS_DIR_SEPARATOR (path[len-1]))
+--len;
+
+  if (len = 0)
+{
+  /* A string with slashes only = root directory */
+  ll = g_list_append (ll, g_strdup (/));
+  g_free (lp-data);
+}
+  else if (len  strlen (path))
+{
+  ll = g_list_append (ll, g_strndup (path, len));
+  g_free (lp-data);
+}
+  else
+ll = g_list_append (ll, lp-data);
+}
+
+  g_list_free (list);
+  return ll;
+}
+
+
+
 static void
 _res_init (void)
 {
@@ -222,6 +259,15 @@
   _list[XFCE_RESOURCE_THEMES] = g_list_append 
(_list[XFCE_RESOURCE_THEMES], path);
 }
 
+  /* Remove trailing slashes */
+#define REMOVE_TRAILING_SLASHES(type) { _list[(type)] = 
_res_remove_trailing_slashes (_list[(type)]); }
+  REMOVE_TRAILING_SLASHES (XFCE_RESOURCE_DATA);
+  REMOVE_TRAILING_SLASHES (XFCE_RESOURCE_CONFIG);
+  REMOVE_TRAILING_SLASHES (XFCE_RESOURCE_CACHE);
+  REMOVE_TRAILING_SLASHES (XFCE_RESOURCE_ICONS);
+  REMOVE_TRAILING_SLASHES (XFCE_RESOURCE_THEMES);
+#undef REMOVE_TRAILING_SLASHES
+
   /* remove duplicates from the lists */
 #define REMOVE_DUPLICATES(type) { _list[(type)] = _res_remove_duplicates 
(_list[(type)]); }
   REMOVE_DUPLICATES (XFCE_RESOURCE_DATA);
@@ -425,7 +471,7 @@
   const gchar *filename)
 {
   GFileTest test;
-  gchar path[PATH_MAX];
+  gchar*path;
   GList*l;
 
   g_return_val_if_fail (TYPE_VALID (type), NULL);
@@ -440,10 +486,13 @@
 
   for (l = _list[type]; l != NULL; l = l-next)
 {
-  g_snprintf (path, PATH_MAX, %s/%s, (const gchar *) l-data, filename);
 
+  path = g_build_path (G_DIR_SEPARATOR_S, (const gchar *) l-data, 
filename, NULL);
+
   if (g_file_test (path, test))
-return g_strdup (path);
+return path;
+  else
+g_free (path);
 }
 
   return NULL;
@@ -473,7 +522,7 @@
   const gchar *filename)
 {
   GFileTest test;
-  gchar path[PATH_MAX];
+  gchar*path;
   gchar   **paths;
   guint size;
   guint pos;
@@ -495,7

[Xfce4-commits] r27196 - in xfce4-settings/trunk: . dialogs/appearance-settings

2008-07-02 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-02 22:35:29 + (Wed, 02 Jul 2008)
New Revision: 27196

Modified:
   xfce4-settings/trunk/AUTHORS
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/appearance-settings/main.c
Log:
* dialogs/appearance-dialog/main.c: Load icon themes properly.
  I used some of the code from the old mcs ui plugin.
* AUTHORS: I took the liberty to add my name here.

Modified: xfce4-settings/trunk/AUTHORS
===
--- xfce4-settings/trunk/AUTHORS2008-07-02 21:17:11 UTC (rev 27195)
+++ xfce4-settings/trunk/AUTHORS2008-07-02 22:35:29 UTC (rev 27196)
@@ -1,2 +1,3 @@
 Stephan Arts [EMAIL PROTECTED]
 Brian J. Tarricone [EMAIL PROTECTED]
+Jannis Pohlmann [EMAIL PROTECTED]

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-02 21:17:11 UTC (rev 27195)
+++ xfce4-settings/trunk/ChangeLog  2008-07-02 22:35:29 UTC (rev 27196)
@@ -1,3 +1,9 @@
+2008-07-02 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * dialogs/appearance-dialog/main.c: Load icon themes properly.
+ I used some of the code from the old mcs ui plugin.
+   * AUTHORS: I took the liberty to add my name here. 
+
 2008-07-01 Nick Schermer [EMAIL PROTECTED]
 
* dialogs/accessibility-settings/accessibility-dialog.glade,

Modified: xfce4-settings/trunk/dialogs/appearance-settings/main.c
===
--- xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-07-02 
21:17:11 UTC (rev 27195)
+++ xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-07-02 
22:35:29 UTC (rev 27196)
@@ -1,5 +1,6 @@
 /*
  *  Copyright (c) 2008 Stephan Arts [EMAIL PROTECTED]
+ *  Copyright (c) 2008 Jannis Pohlmann [EMAIL PROTECTED]
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -262,121 +263,95 @@
 return theme_list;
 }
 
-/**
- * TODO: Fix icon-theme-spec compliance
- */
+
+
 static void
 check_icon_themes (GtkListStore *list_store, GtkTreeView *tree_view)
 {
-gchar *dir_name;
-gchar *active_theme_name = xfconf_channel_get_string (xsettings_channel, 
/Net/IconThemeName, hicolor);
-const gchar * const *xdg_system_data_dirs = g_get_system_data_dirs();
-GList *user_theme_list = NULL;
-GList *xdg_user_theme_list = NULL;
-GList *xdg_system_theme_list = NULL;
-GList *theme_list = NULL;
-GList *list_iter = NULL;
-GList *temp_iter = NULL;
-GtkTreeIter iter;
-GtkTreeSelection *selection = gtk_tree_view_get_selection (tree_view);
+  GDir *dir;
+  GtkTreePath  *tree_path;
+  GtkTreeIter   iter;
+  XfceRc   *index_file;
+  const gchar  *file;
+  gchar   **icon_theme_dirs;
+  gchar*index_filename;
+  gchar*theme_name;
+  gchar*active_theme_name;
+  gint  i;
 
-dir_name = g_build_filename (g_get_home_dir (), .icons, NULL);
-user_theme_list = read_themes_from_dir (dir_name, THEME_TYPE_GTK);
-g_free (dir_name);
+  /* Determine current theme */
+  active_theme_name = xfconf_channel_get_string (xsettings_channel, 
/Net/IconThemeName, Default);
 
-dir_name = g_build_filename (g_get_user_data_dir(), icons,  NULL);
-xdg_user_theme_list = read_themes_from_dir (dir_name, THEME_TYPE_ICONS);
-g_free (dir_name);
+  /* Determine directories to look in for icon themes */
+  xfce_resource_push_path (XFCE_RESOURCE_ICONS, DATADIR /xfce4/icons);
+  icon_theme_dirs = xfce_resource_dirs (XFCE_RESOURCE_ICONS);
+  xfce_resource_pop_path (XFCE_RESOURCE_ICONS);
 
-while (*xdg_system_data_dirs)
+  /* Iterate over all base directories */
+  for (i = 0; icon_theme_dirs[i] != NULL; ++i)
 {
-dir_name = g_build_filename (*xdg_system_data_dirs, icons, NULL);
-xdg_system_theme_list = g_list_concat (xdg_system_theme_list, 
read_themes_from_dir (dir_name, THEME_TYPE_ICONS));
-g_free (dir_name);
+  /* Open directory handle */
+  dir = g_dir_open (icon_theme_dirs[i], 0, NULL);
 
-xdg_system_data_dirs++;
-}
+  /* Try next base directory if this one cannot be read */
+  if (G_UNLIKELY (dir == NULL))
+continue;
 
-/* Legacy ~/.icons */
-list_iter = user_theme_list;
-while (user_theme_list  list_iter != NULL)
-{
-temp_iter = g_list_find_custom (theme_list, list_iter-data, 
(GCompareFunc)strcmp);
-if (temp_iter == NULL)
+  /* Iterate over filenames in the directory */
+  while ((file = g_dir_read_name (dir)) != NULL)
 {
-user_theme_list = g_list_remove_link (user_theme_list, list_iter);
-theme_list = g_list_concat (theme_list, list_iter);
+  /* Build filename for the index.theme of the current icon theme 
directory

[Xfce4-commits] r27197 - in xfce4-settings/trunk: . dialogs/appearance-settings

2008-07-02 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-02 22:45:02 + (Wed, 02 Jul 2008)
New Revision: 27197

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
   xfce4-settings/trunk/dialogs/appearance-settings/main.c
Log:
* dialogs/appearance-dialog/main.c: Sort user interface and
  icon themes. Use the only column (0) for searching.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-02 22:35:29 UTC (rev 27196)
+++ xfce4-settings/trunk/ChangeLog  2008-07-02 22:45:02 UTC (rev 27197)
@@ -1,5 +1,10 @@
 2008-07-02 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * dialogs/appearance-dialog/main.c: Sort user interface and
+ icon themes. Use the only column (0) for searching.
+
+2008-07-02 Jannis Pohlmann [EMAIL PROTECTED]
+
* dialogs/appearance-dialog/main.c: Load icon themes properly.
  I used some of the code from the old mcs ui plugin.
* AUTHORS: I took the liberty to add my name here. 

Modified: 
xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
===
--- xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2008-07-02 22:35:29 UTC (rev 27196)
+++ xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
2008-07-02 22:45:02 UTC (rev 27197)
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=UTF-8 standalone=no?
 !DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Wed Jul  2 21:13:58 2008 --
+!--Generated with glade3 3.4.5 on Wed Jul  2 23:40:23 2008 --
 glade-interface
   requires lib=xfce4/
   widget class=XfceTitledDialog id=appearance-settings-dialog
@@ -54,6 +54,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=headers_visibleFalse/property
+property name=search_column0/property
   /widget
 /child
   /widget
@@ -101,6 +102,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=headers_visibleFalse/property
+property name=search_column0/property
   /widget
 /child
   /widget
@@ -222,28 +224,27 @@
 property name=column_spacing12/property
 property name=row_spacing6/property
 child
-  widget class=GtkLabel id=label17
+  widget class=GtkCheckButton 
id=xft_antialias_check_button
 property name=visibleTrue/property
-property name=xalign0/property
-property name=label 
translatable=yes_Subpixel order:/property
+property name=can_focusTrue/property
+property name=label 
translatable=yes_Enable antialias/property
 property 
name=use_underlineTrue/property
-property 
name=mnemonic_widgetxft_rgba_combo_box/property
+property name=response_id0/property
+property 
name=draw_indicatorTrue/property
   /widget
   packing
-property name=top_attach2/property
-property name=bottom_attach3/property
-property 
name=x_optionsGTK_FILL/property
+property name=right_attach2/property
   /packing
 /child
 child
-  widget class=GtkComboBox 
id=xft_rgba_combo_box
+  widget class=GtkComboBox 
id=xft_hinting_style_combo_box
 property name=visibleTrue/property
   /widget
   packing
 property name=left_attach1/property
 property name=right_attach2/property
-property name=top_attach2/property
-property name=bottom_attach3/property
+property name=top_attach1/property

[Xfce4-commits] r27198 - in xfconf/trunk: . xfconf-query xfconfd

2008-07-02 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-03 00:19:22 + (Thu, 03 Jul 2008)
New Revision: 27198

Modified:
   xfconf/trunk/ChangeLog
   xfconf/trunk/gtk-doc.make
   xfconf/trunk/xfconf-query/main.c
   xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
   xfconf/trunk/xfconfd/xfconf-backend.c
   xfconf/trunk/xfconfd/xfconf-daemon.c
Log:
* xfconfd/xfconf-backend.c, xfconfd/xfconf-backend-perchannel-xml.c:
  Allow '' and '' to be in property names. Escape property names
using g_markup_escape() before writing them to the XML files.
* xfconf-query/main.c: Add message newline to one of the error
  messages.

Modified: xfconf/trunk/ChangeLog
===
--- xfconf/trunk/ChangeLog  2008-07-02 22:45:02 UTC (rev 27197)
+++ xfconf/trunk/ChangeLog  2008-07-03 00:19:22 UTC (rev 27198)
@@ -0,0 +1,7 @@
+2008-07-03 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * xfconfd/xfconf-backend.c, xfconfd/xfconf-backend-perchannel-xml.c: 
+ Allow '' and '' to be in property names. Escape property names
+   using g_markup_escape() before writing them to the XML files.
+   * xfconf-query/main.c: Add message newline to one of the error 
+ messages.

Modified: xfconf/trunk/gtk-doc.make
===
--- xfconf/trunk/gtk-doc.make   2008-07-02 22:45:02 UTC (rev 27197)
+++ xfconf/trunk/gtk-doc.make   2008-07-03 00:19:22 UTC (rev 27198)
@@ -5,11 +5,11 @@
 
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) 
$(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -128,7 +128,7 @@
cd $(srcdir)  rm -rf xml html
 
 install-data-local:
-   -installfiles=`echo $(srcdir)/html/*`; \
+   installfiles=`echo $(srcdir)/html/*`; \
if test $$installfiles = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
@@ -139,8 +139,9 @@
  done; \
  echo '-- Installing $(srcdir)/html/index.sgml' ; \
  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || 
:; \
- which gtkdoc-rebase /dev/null  \
-   gtkdoc-rebase --relative --dest-dir=$(DESTDIR) 
--html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+ if test `which gtkdoc-rebase` != ; then \
+gtkdoc-rebase --relative --dest-dir=$(DESTDIR) 
--html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+ fi \
fi

 
@@ -165,8 +166,8 @@
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
cp $(srcdir)/html/* $(distdir)/html
-   -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-   -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+   cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+   cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
cd $(distdir)  rm -f $(DISTCLEANFILES)
-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 

Modified: xfconf/trunk/xfconf-query/main.c
===
--- xfconf/trunk/xfconf-query/main.c2008-07-02 22:45:02 UTC (rev 27197)
+++ xfconf/trunk/xfconf-query/main.c2008-07-03 00:19:22 UTC (rev 27198)
@@ -193,7 +193,7 @@
 
 if(!xfconf_channel_get_property(channel, property_name, value))
 {
-g_print(_(Property \%s\ doesn't exist on channel \%s\.),
+g_print(_(Property \%s\ doesn't exist on channel 
\%s\.\n),
 property_name, channel_name);
 return 1;
 }

Modified: xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
===
--- xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-07-02 
22:45:02 UTC (rev 27197)
+++ xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-07-03 
00:19:22 UTC (rev 27198)
@@ -75,11 +75,11 @@
 struct _XfconfBackendPerchannelXml
 {
 GObject parent;
-
+
 gchar *config_save_path;
-
+
 GTree *channels;
-
+
 guint save_id;
 GList *dirty_channels;
 
@@ -200,7 +200,7 @@
 xfconf_backend_perchannel_xml_class_init(XfconfBackendPerchannelXmlClass 
*klass)
 {
 GObjectClass *object_class = (GObjectClass *)klass;
-
+
 object_class-finalize

[Xfce4-commits] r27213 - in xfconf/trunk: . xfconf

2008-07-05 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-05 21:13:52 + (Sat, 05 Jul 2008)
New Revision: 27213

Modified:
   xfconf/trunk/ChangeLog
   xfconf/trunk/xfconf/xfconf-channel.c
Log:
* xfconf/xfconf-channel.c: Disconnect from 'PropertyRemoved' signal
  when destroying an XfconfChannel.

Modified: xfconf/trunk/ChangeLog
===
--- xfconf/trunk/ChangeLog  2008-07-05 20:40:34 UTC (rev 27212)
+++ xfconf/trunk/ChangeLog  2008-07-05 21:13:52 UTC (rev 27213)
@@ -1,3 +1,8 @@
+2008-07-05 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * xfconf/xfconf-channel.c: Disconnect from 'PropertyRemoved' signal
+ when destroying an XfconfChannel.
+
 2008-07-03 Jannis Pohlmann [EMAIL PROTECTED]
 
* xfconfd/xfconf-backend.c, xfconfd/xfconf-backend-perchannel-xml.c: 

Modified: xfconf/trunk/xfconf/xfconf-channel.c
===
--- xfconf/trunk/xfconf/xfconf-channel.c2008-07-05 20:40:34 UTC (rev 
27212)
+++ xfconf/trunk/xfconf/xfconf-channel.c2008-07-05 21:13:52 UTC (rev 
27213)
@@ -224,6 +224,10 @@
G_CALLBACK(xfconf_channel_property_changed),
channel);
 
+dbus_g_proxy_disconnect_signal(proxy, PropertyRemoved,
+   G_CALLBACK(xfconf_channel_property_removed),
+   channel);
+
 g_free(channel-channel_name);
 
 G_OBJECT_CLASS(xfconf_channel_parent_class)-finalize(obj);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27247 - xfce4-panel/trunk

2008-07-09 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-09 21:58:34 + (Wed, 09 Jul 2008)
New Revision: 27247

Modified:
   xfce4-panel/trunk/ChangeLog
   xfce4-panel/trunk/autogen.sh
Log:
* autogen.sh: Fix @REVISION@ subsitution when using git svn.

Modified: xfce4-panel/trunk/ChangeLog
===
--- xfce4-panel/trunk/ChangeLog 2008-07-09 20:24:51 UTC (rev 27246)
+++ xfce4-panel/trunk/ChangeLog 2008-07-09 21:58:34 UTC (rev 27247)
@@ -1,3 +1,7 @@
+2008-07-09 23:57 jannis
+
+   * autogen.sh: Fix @REVISION@ subsitution when using git svn. 
+
 2008-01-14 02:08 jannis
 
* configure.in.in: Fix debugging support for SVN snapshots. Until now

Modified: xfce4-panel/trunk/autogen.sh
===
--- xfce4-panel/trunk/autogen.sh2008-07-09 20:24:51 UTC (rev 27246)
+++ xfce4-panel/trunk/autogen.sh2008-07-09 21:58:34 UTC (rev 27247)
@@ -30,7 +30,7 @@
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if test -d .git/svn; then
- revision=`LC_ALL=C git-svn find-rev trunk`
+ revision=`LC_ALL=C git svn find-rev master`
 else
  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,
 $2}'`

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27249 - xfce4-panel/trunk

2008-07-09 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-09 22:23:24 + (Wed, 09 Jul 2008)
New Revision: 27249

Modified:
   xfce4-panel/trunk/autogen.sh
Log:
I guess this is better.

Modified: xfce4-panel/trunk/autogen.sh
===
--- xfce4-panel/trunk/autogen.sh2008-07-09 22:22:23 UTC (rev 27248)
+++ xfce4-panel/trunk/autogen.sh2008-07-09 22:23:24 UTC (rev 27249)
@@ -30,7 +30,7 @@
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if test -d .git/svn; then
- revision=`LC_ALL=C git svn find-rev master`
+ revision=`LC_ALL=C git svn find-rev HEAD`
 else
  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,
 $2}'`

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27248 - xfconf/trunk

2008-07-09 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-09 22:22:23 + (Wed, 09 Jul 2008)
New Revision: 27248

Modified:
   xfconf/trunk/ChangeLog
   xfconf/trunk/autogen.sh
Log:
* autogen.sh: Fix @REVISION@ substitution when using git svn.

Modified: xfconf/trunk/ChangeLog
===
--- xfconf/trunk/ChangeLog  2008-07-09 21:58:34 UTC (rev 27247)
+++ xfconf/trunk/ChangeLog  2008-07-09 22:22:23 UTC (rev 27248)
@@ -1,3 +1,7 @@
+2008-07-10 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * autogen.sh: Fix @REVISION@ substitution when using git svn.
+
 2008-07-05 Jannis Pohlmann [EMAIL PROTECTED]
 
* xfconf/xfconf-channel.c: Disconnect from 'PropertyRemoved' signal

Modified: xfconf/trunk/autogen.sh
===
--- xfconf/trunk/autogen.sh 2008-07-09 21:58:34 UTC (rev 27247)
+++ xfconf/trunk/autogen.sh 2008-07-09 22:22:23 UTC (rev 27248)
@@ -35,7 +35,7 @@
 # substitute revision and linguas
 linguas=$(sed -e '/^#/d' po/LINGUAS)
 if [ -d .git/svn ]; then
-revision=$(git-svn find-rev trunk)
+revision=$(git svn find-rev HEAD)
 elif [ -d .svn ]; then
 revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, 
$2}')
 else

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27250 - libxfce4menu/trunk

2008-07-09 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-09 22:23:53 + (Wed, 09 Jul 2008)
New Revision: 27250

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/autogen.sh
Log:
* autogen.sh: Fix @REVISION@ substitution when using git svn.

Modified: libxfce4menu/trunk/ChangeLog
===
--- libxfce4menu/trunk/ChangeLog2008-07-09 22:23:24 UTC (rev 27249)
+++ libxfce4menu/trunk/ChangeLog2008-07-09 22:23:53 UTC (rev 27250)
@@ -1,3 +1,7 @@
+2008-07-10 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * autogen.sh: Fix @REVISION@ substitution when using git svn.
+
 2008-07-06 Jannis Pohlmann [EMAIL PROTECTED]
 
* libxfce4menu/xfce-menu.c: Add #if 0 around 

Modified: libxfce4menu/trunk/autogen.sh
===
--- libxfce4menu/trunk/autogen.sh   2008-07-09 22:23:24 UTC (rev 27249)
+++ libxfce4menu/trunk/autogen.sh   2008-07-09 22:23:53 UTC (rev 27250)
@@ -31,7 +31,12 @@
 
 # Substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
+if test -d .git/svn; then
+ revision=`LC_ALL=C git svn find-rev HEAD`
+else
+ revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,
+$2}'`
+fi
 sed -e s/@LINGUAS@/${linguas}/g \
 -e s/@REVISION@/${revision}/g \
  configure.in.in  configure.in

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27254 - xfce4-settings/trunk

2008-07-11 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-11 10:07:13 + (Fri, 11 Jul 2008)
New Revision: 27254

Added:
   xfce4-settings/trunk/TODO
Modified:
   xfce4-settings/trunk/ChangeLog
Log:
* TODO: Add TODO file and fill it with the stuff that's still
  missing in the keyboard settings.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-10 21:52:53 UTC (rev 27253)
+++ xfce4-settings/trunk/ChangeLog  2008-07-11 10:07:13 UTC (rev 27254)
@@ -1,3 +1,8 @@
+2008-07-11 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * TODO: Add TODO file and fill it with the stuff that's still
+ missing in the keyboard settings.
+
 2008-07-10 Nick Schermer [EMAIL PROTECTED]
 
* dialogs/appearance-settings/images.h,

Added: xfce4-settings/trunk/TODO
===
--- xfce4-settings/trunk/TODO   (rev 0)
+++ xfce4-settings/trunk/TODO   2008-07-11 10:07:13 UTC (rev 27254)
@@ -0,0 +1,6 @@
+Keyboard settings (Jannis)
+
+
+  * Implement 'Add' button in the keyboard shortcuts dialog
+  * Add shortcut execution code to xfce4-settings-helper
+ (* Maybe add support for keyboard themes again)  

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27293 - in libxfce4menu/trunk: . libxfce4menu

2008-07-15 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-15 10:53:42 + (Tue, 15 Jul 2008)
New Revision: 27293

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/autogen.sh
   libxfce4menu/trunk/libxfce4menu/xfce-menu.c
Log:
* autogen.sh: Change @REVISION@ substitution for git svn
  repositories again.

Modified: libxfce4menu/trunk/ChangeLog
===
--- libxfce4menu/trunk/ChangeLog2008-07-15 10:25:25 UTC (rev 27292)
+++ libxfce4menu/trunk/ChangeLog2008-07-15 10:53:42 UTC (rev 27293)
@@ -1,3 +1,8 @@
+2008-07-15 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * autogen.sh: Change @REVISION@ substitution for git svn
+ repositories again.
+
 2008-07-10 Jannis Pohlmann [EMAIL PROTECTED]
 
* autogen.sh: Fix @REVISION@ substitution when using git svn.

Modified: libxfce4menu/trunk/autogen.sh
===
--- libxfce4menu/trunk/autogen.sh   2008-07-15 10:25:25 UTC (rev 27292)
+++ libxfce4menu/trunk/autogen.sh   2008-07-15 10:53:42 UTC (rev 27293)
@@ -32,7 +32,10 @@
 # Substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if test -d .git/svn; then
- revision=`LC_ALL=C git svn find-rev HEAD`
+ revision=$(git svn find-rev trunk ||
+git svn find-rev origin/trunk ||
+git svn find-rev HEAD ||
+git svn find-rev master)
 else
  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,
 $2}'`

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu.c
===
--- libxfce4menu/trunk/libxfce4menu/xfce-menu.c 2008-07-15 10:25:25 UTC (rev 
27292)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu.c 2008-07-15 10:53:42 UTC (rev 
27293)
@@ -2031,7 +2031,7 @@
 GSList*
 xfce_menu_get_menus (XfceMenu *menu)
 {
-  GSList *menus;
+  GSList *menus = NULL;
 
   g_return_val_if_fail (XFCE_IS_MENU (menu), NULL);
   

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27294 - xfce4-panel/trunk

2008-07-15 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-15 11:05:25 + (Tue, 15 Jul 2008)
New Revision: 27294

Modified:
   xfce4-panel/trunk/ChangeLog
   xfce4-panel/trunk/autogen.sh
Log:
* autogen.sh: Change @REVISION@ substitution for git svn repositories
  again.

Modified: xfce4-panel/trunk/ChangeLog
===
--- xfce4-panel/trunk/ChangeLog 2008-07-15 10:53:42 UTC (rev 27293)
+++ xfce4-panel/trunk/ChangeLog 2008-07-15 11:05:25 UTC (rev 27294)
@@ -1,3 +1,8 @@
+2008-07-15 13:04 jannis
+
+   * autogen.sh: Change @REVISION@ substitution for git svn repositories
+ again.
+
 2008-07-09 23:57 jannis
 
* autogen.sh: Fix @REVISION@ subsitution when using git svn. 

Modified: xfce4-panel/trunk/autogen.sh
===
--- xfce4-panel/trunk/autogen.sh2008-07-15 10:53:42 UTC (rev 27293)
+++ xfce4-panel/trunk/autogen.sh2008-07-15 11:05:25 UTC (rev 27294)
@@ -30,7 +30,10 @@
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if test -d .git/svn; then
- revision=`LC_ALL=C git svn find-rev HEAD`
+ revision=`git svn find-rev trunk ||
+   git svn find-rev origin/trunk ||
+   git svn find-rev HEAD ||
+   git svn find-rev master`
 else
  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,
 $2}'`

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27305 - xfce4-settings/trunk

2008-07-15 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-15 22:58:55 + (Tue, 15 Jul 2008)
New Revision: 27305

Modified:
   xfce4-settings/trunk/ChangeLog
Log:
* dialogs/keyboard-settings/keyboard-dialog.glade: In the last commit
  I forgot to mention that I've removed the keyboard theme stuff from
  the dialog because this would be too complicated to implement before
  the release.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-15 22:57:11 UTC (rev 27304)
+++ xfce4-settings/trunk/ChangeLog  2008-07-15 22:58:55 UTC (rev 27305)
@@ -1,5 +1,12 @@
 2008-07-16 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * dialogs/keyboard-settings/keyboard-dialog.glade: In the last commit
+ I forgot to mention that I've removed the keyboard theme stuff from
+ the dialog because this would be too complicated to implement before
+ the release.
+
+2008-07-16 Jannis Pohlmann [EMAIL PROTECTED]
+
* dialogs/keyboard-settings/Makefile.am,
  dialogs/keyboard-settings/command-dialog{c,h},
  dialogs/keyboard-settings/main.c,

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27306 - xfce4-settings/trunk

2008-07-15 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-15 23:00:48 + (Tue, 15 Jul 2008)
New Revision: 27306

Modified:
   xfce4-settings/trunk/TODO
Log:
Update the TODO.

Modified: xfce4-settings/trunk/TODO
===
--- xfce4-settings/trunk/TODO   2008-07-15 22:58:55 UTC (rev 27305)
+++ xfce4-settings/trunk/TODO   2008-07-15 23:00:48 UTC (rev 27306)
@@ -1,9 +1,10 @@
 Keyboard settings (Jannis)
 
 
-  * Implement 'Add' button in the keyboard shortcuts dialog
-  * Add shortcut execution code to xfce4-settings-helper
- (* Maybe add support for keyboard themes again)  
+  * Make xfce4-settings-helper keyboard code refresh itself when a 
+shortcut is added/removed/changed.
+ (* Not before the 4.6 alpha: Maybe add support for keyboard themes 
+again)  
 
 
 Mouse Settings (Nick)

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27314 - in xfce4-settings/trunk: . xfce4-settings-helper

2008-07-16 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-16 19:44:23 + (Wed, 16 Jul 2008)
New Revision: 27314

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
Log:
* xfce4-settings-helper/keyboard-shortcuts.c: Connect to the
  property-changed signal of the XfconfChannel. Ungrab keys when a
  property is removed and grab keys when a new property is added.
  Update the shortcuts - command hash table according to the changes.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-16 17:45:40 UTC (rev 27313)
+++ xfce4-settings/trunk/ChangeLog  2008-07-16 19:44:23 UTC (rev 27314)
@@ -5,6 +5,13 @@
 
 2008-07-16 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * xfce4-settings-helper/keyboard-shortcuts.c: Connect to the
+ property-changed signal of the XfconfChannel. Ungrab keys when a
+ property is removed and grab keys when a new property is added.
+ Update the shortcuts - command hash table according to the changes.
+
+2008-07-16 Jannis Pohlmann [EMAIL PROTECTED]
+
* dialogs/keyboard-settings/keyboard-dialog.glade: In the last commit
  I forgot to mention that I've removed the keyboard theme stuff from
  the dialog because this would be too complicated to implement before

Modified: xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c 
2008-07-16 17:45:40 UTC (rev 27313)
+++ xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c 
2008-07-16 19:44:23 UTC (rev 27314)
@@ -76,7 +76,7 @@
 const 
GValue *value,
 
XfceKeyboardShortcutsHelper  *helper);
 static gbooleanxfce_keyboard_shortcuts_helper_grab_shortcut
(XfceKeyboardShortcutsHelper  *helper,
-const 
char   *shortcut,
+const 
gchar  *shortcut,
 
gboolean  grab);
 static gbooleanxfce_keyboard_shortcuts_helper_parse_shortcut   
(XfceKeyboardShortcutsHelper  *helper,
 
GdkDisplay   *display,
@@ -93,9 +93,19 @@
 
gboolean  grab);
 static voidxfce_keyboard_shortcuts_helper_handle_key_press 
(XfceKeyboardShortcutsHelper  *helper,
 
XKeyEvent*xevent);
+static voidxfce_keyboard_shortcuts_helper_property_changed 
(XfconfChannel*channel,
+gchar  
  *property,
+GValue 
  *value,
+
XfceKeyboardShortcutsHelper  *helper);
+static gbooleanxfce_keyboard_shortcuts_helper_extract_values   
(XfceKeyboardShortcutsHelper  *helper,
+const 
gchar  *key,
+const 
GValue *value,
+gchar  
 **shortcut,
+gchar  
 **action);
 
 
 
+
 struct _XfceKeyboardShortcutsHelperClass
 {
   GObjectClass __parent__;
@@ -192,6 +202,9 @@
 }
 
   xfce_keyboard_shortcuts_helper_add_filter (helper);
+
+  /* Be notified of property changes */
+  g_signal_connect (helper-channel, property-changed, G_CALLBACK 
(xfce_keyboard_shortcuts_helper_property_changed), helper);
 }
 
 
@@ -316,48 +329,27 @@
   const GValue
*value,
   XfceKeyboardShortcutsHelper 
*helper)
 {
-  const GPtrArray *array;
-  const GValue*type_value;
-  const GValue*action_value;
-  const gchar *type;
-  const gchar *action;
+  gchar *shortcut;
+  gchar *action;
 
   g_return_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper));
+  g_return_if_fail (G_IS_VALUE (value));
 
-  /* MAke sure we only

[Xfce4-commits] r27315 - in xfce4-settings/trunk: . dialogs/keyboard-settings

2008-07-16 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-16 19:44:27 + (Wed, 16 Jul 2008)
New Revision: 27315

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/keyboard-settings/main.c
Log:
* dialogs/keyboard-settings/main.c: Save property when a new shortcut
  is created.
* dialogs/keyboard-settings/main.c,
  dialogs/keyboard-settings/command-dialog.c: Fix compilation.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-16 19:44:23 UTC (rev 27314)
+++ xfce4-settings/trunk/ChangeLog  2008-07-16 19:44:27 UTC (rev 27315)
@@ -1,7 +1,7 @@
-2008-07-16 Nick Schermer [EMAIL PROTECTED]
+2008-07-16 Jannis Pohlmann [EMAIL PROTECTED]
 
-   * dialogs/keyboard-settings/main.c, 
- dialogs/keyboard-settings/command-dialog.c: Fix compilation.
+   * dialogs/keyboard-settings/main.c: Save property when a new shortcut
+ is created.
 
 2008-07-16 Jannis Pohlmann [EMAIL PROTECTED]
 
@@ -10,6 +10,11 @@
  property is removed and grab keys when a new property is added.
  Update the shortcuts - command hash table according to the changes.
 
+2008-07-16 Nick Schermer [EMAIL PROTECTED]
+
+   * dialogs/keyboard-settings/main.c, 
+ dialogs/keyboard-settings/command-dialog.c: Fix compilation.
+
 2008-07-16 Jannis Pohlmann [EMAIL PROTECTED]
 
* dialogs/keyboard-settings/keyboard-dialog.glade: In the last commit

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/main.c   2008-07-16 
19:44:23 UTC (rev 27314)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c   2008-07-16 
19:44:27 UTC (rev 27315)
@@ -210,6 +210,7 @@
   const gchar  *shortcut = NULL;
   gboolean  finished = FALSE;
   gchar*command = NULL;
+  gchar*property;
   gint  response;
 
   /* Create command dialog */
@@ -258,6 +259,11 @@
 
   /* Set row values */
   gtk_list_store_set (GTK_LIST_STORE (model), iter, SHORTCUT_COLUMN, 
shortcut, ACTION_COLUMN, command, -1);
+
+  /* Save the new shortcut to xfconf */
+  property = g_strdup_printf (/%s, shortcut);
+  xfconf_channel_set_array (kbd_channel, property, G_TYPE_STRING, 
execute, G_TYPE_STRING, command, G_TYPE_INVALID);
+  g_free (property);
 }
 
   /* Destroy the shortcut dialog */
@@ -326,53 +332,7 @@
 }
 
 
-#if 0
 static void
-keyboard_settings_shortcut_action_edited (GtkTreeView *tree_view,
-  gchar   *path,
-  gchar   *new_text)
-
-{
-  GtkTreeModel  *model;
-  GtkTreeIteriter;
-  gchar *shortcut;
-  gchar *old_text;
-  gchar *property_name;
-
-  /* Get tree model */
-  model = gtk_tree_view_get_model (tree_view);
-
-  /* Get iter for the edited row */
-  if (G_LIKELY (gtk_tree_model_get_iter_from_string (model, iter, path)))
-{
-  /* Read row values */
-  gtk_tree_model_get (model, iter, SHORTCUT_COLUMN, shortcut, 
ACTION_COLUMN, old_text, -1);
-
-  /* Check whether anything has changed at all */
-  if (G_LIKELY (g_utf8_collate (old_text, new_text) != 0))
-{
-  /* Upate row data with the new text */
-  gtk_list_store_set (GTK_LIST_STORE (model), iter, ACTION_COLUMN, 
new_text, -1);
-
-  /* Build xfconf property name */
-  property_name = g_strdup_printf (/%s, shortcut);
-
-  /* Save new shortcut settings */
-  xfconf_channel_set_array (kbd_channel, property_name, G_TYPE_STRING, 
execute, G_TYPE_STRING, new_text, G_TYPE_INVALID);
-
-  /* Free property name */
-  g_free (property_name);
-}
-
-  /* Free strings */
-  g_free (shortcut);
-  g_free (old_text);
-}
-}
-#endif
-
-
-static void
 keyboard_settings_edit_shortcut (GtkTreeView *tree_view,
  GtkTreePath *path)
 {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27317 - xfce4-settings/trunk/dialogs/keyboard-settings

2008-07-16 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-16 19:48:55 + (Wed, 16 Jul 2008)
New Revision: 27317

Modified:
   xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
Log:
Remove debug message.

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-07-16 19:45:04 UTC (rev 27316)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-07-16 19:48:55 UTC (rev 27317)
@@ -313,8 +313,6 @@
   /* Let 'validate-shortcut' listeners decide whether this shortcut is ok or 
not */
   g_signal_emit_by_name (dialog, validate-shortcut, shortcut, 
shortcut_accepted);
 
-  g_message (shortcut accepted: %s, shortcut_accepted ? yes : no);
-
   /* Check if the shortcut was accepted */
   if (G_LIKELY (shortcut_accepted))
 {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27318 - in xfce4-settings/trunk: . xfce4-settings-helper

2008-07-16 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-16 19:59:26 + (Wed, 16 Jul 2008)
New Revision: 27318

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/xfce4-settings-helper/accessx.c
   xfce4-settings/trunk/xfce4-settings-helper/xkb.c
Log:
* xfce4-settings-helper/accessx.c, xfce4-settings-helper/xkb.c: Call
  XkbFreeControls prior to XkbFree. This should fix two memory leaks
  and hopefully doesn't break anything.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-16 19:48:55 UTC (rev 27317)
+++ xfce4-settings/trunk/ChangeLog  2008-07-16 19:59:26 UTC (rev 27318)
@@ -1,5 +1,11 @@
 2008-07-16 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * xfce4-settings-helper/accessx.c, xfce4-settings-helper/xkb.c: Call
+ XkbFreeControls prior to XkbFree. This should fix two memory leaks
+ and hopefully doesn't break anything.
+
+2008-07-16 Jannis Pohlmann [EMAIL PROTECTED]
+
* dialogs/keyboard-settings/main.c: Save property when a new shortcut
  is created.
 

Modified: xfce4-settings/trunk/xfce4-settings-helper/accessx.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/accessx.c2008-07-16 
19:48:55 UTC (rev 27317)
+++ xfce4-settings/trunk/xfce4-settings-helper/accessx.c2008-07-16 
19:59:26 UTC (rev 27318)
@@ -245,6 +245,7 @@
 XkbSetControls (GDK_DISPLAY (), XkbControlsEnabledMask | 
XkbStickyKeysMask | XkbBounceKeysMask | XkbSlowKeysMask | XkbMouseKeysMask, 
xkb);
 
 /* free the structure */
+XkbFreeControls (xkb, XkbAllControlsMask, True);
 XFree (xkb);
 
 /* flush errors and pop trap */

Modified: xfce4-settings/trunk/xfce4-settings-helper/xkb.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/xkb.c2008-07-16 19:48:55 UTC 
(rev 27317)
+++ xfce4-settings/trunk/xfce4-settings-helper/xkb.c2008-07-16 19:59:26 UTC 
(rev 27318)
@@ -211,6 +211,7 @@
 XkbSetControls (GDK_DISPLAY (), XkbRepeatKeysMask, xkb);
 
 /* cleanup */
+XkbFreeControls (xkb, XkbRepeatKeysMask, True);
 XFree (xkb);
 }
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27322 - in xfce4-settings/trunk: . dialogs/accessibility-settings dialogs/appearance-settings dialogs/display-settings dialogs/keyboard-settings dialogs/mouse-settings

2008-07-16 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-16 23:14:49 + (Wed, 16 Jul 2008)
New Revision: 27322

Modified:
   xfce4-settings/trunk/ChangeLog
   
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
   xfce4-settings/trunk/dialogs/accessibility-settings/main.c
   xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade
   xfce4-settings/trunk/dialogs/display-settings/display-dialog.glade
   xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade
   xfce4-settings/trunk/dialogs/keyboard-settings/main.c
   xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade
Log:
* dialogs/accessibility-settings/accessibility-dialog.glade,
  dialogs/appearance-settings/appearance-dialog.glade,
  dialogs/display-settings/display-dialog.glade,
  dialogs/keyboard-settings/keyboard-dialog.glade,
  dialogs/mouse-settings/mouse-dialog.glade: Make all dialogs use
  consistent borders/paddings/distances etc. again. Please keep it
  this way when adding new dialogs/widgets.
* dialogs/accesibility-settings/main.c,
  dialogs/keyboard-settings/main.c: Destroy GladeXML after the dialog
  is destroyed.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-16 23:12:36 UTC (rev 27321)
+++ xfce4-settings/trunk/ChangeLog  2008-07-16 23:14:49 UTC (rev 27322)
@@ -1,3 +1,16 @@
+2008-07-17 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * dialogs/accessibility-settings/accessibility-dialog.glade,
+ dialogs/appearance-settings/appearance-dialog.glade,
+ dialogs/display-settings/display-dialog.glade,
+ dialogs/keyboard-settings/keyboard-dialog.glade,
+ dialogs/mouse-settings/mouse-dialog.glade: Make all dialogs use
+ consistent borders/paddings/distances etc. again. Please keep it
+ this way when adding new dialogs/widgets.
+   * dialogs/accesibility-settings/main.c, 
+ dialogs/keyboard-settings/main.c: Destroy GladeXML after the dialog
+ is destroyed. 
+
 2008-07-16 Nick Schermer [EMAIL PROTECTED]
 
* Mv xfce4-settings-helper/xkb.* xfce4-settings-helper/keyboards.*:

Modified: 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade
===
--- 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade  
2008-07-16 23:12:36 UTC (rev 27321)
+++ 
xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade  
2008-07-16 23:14:49 UTC (rev 27322)
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=UTF-8 standalone=no?
 !DOCTYPE glade-interface SYSTEM glade-2.0.dtd
-!--Generated with glade3 3.4.5 on Tue Jul  1 22:36:17 2008 --
+!--Generated with glade3 3.4.5 on Thu Jul 17 01:05:41 2008 --
 glade-interface
   requires lib=xfce4/
   widget class=XfceTitledDialog id=accessibility-settings-dialog
@@ -183,7 +183,7 @@
 child
   widget class=GtkVBox id=vbox9
 property 
name=visibleTrue/property
-property name=spacing6/property
+property name=spacing2/property
 child
   widget class=GtkLabel id=label6
 property 
name=visibleTrue/property
@@ -309,7 +309,7 @@
 child
   widget class=GtkVBox id=vbox10
 property 
name=visibleTrue/property
-property name=spacing6/property
+property name=spacing2/property
 child
   widget class=GtkLabel id=label9
 property 
name=visibleTrue/property
@@ -453,7 +453,7 @@
 child
   widget class=GtkVBox id=vbox12
 property 
name=visibleTrue/property
-property 
name=spacing6/property
+property 
name=spacing2/property
 child
   widget class=GtkLabel 
id=label7
 property 
name=visibleTrue/property
@@ -524,7 +524,7 @@
 child
   widget class=GtkVBox id=vbox13
 property 
name=visibleTrue/property

[Xfce4-commits] r27323 - in xfce4-mixer/trunk: . libxfce4mixer xfce4-mixer

2008-07-16 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-17 00:22:45 + (Thu, 17 Jul 2008)
New Revision: 27323

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-preferences.c
   xfce4-mixer/trunk/xfce4-mixer/main.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
Log:
* libxfce4mixer/xfce-mixer-preferences.c, xfce4-mixer/main.c,
  xfce4-mixer/xfce-mixer-window.c: Fix a few memory leaks.

Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-07-16 23:14:49 UTC (rev 27322)
+++ xfce4-mixer/trunk/ChangeLog 2008-07-17 00:22:45 UTC (rev 27323)
@@ -1,3 +1,8 @@
+2008-07-17 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * libxfce4mixer/xfce-mixer-preferences.c, xfce4-mixer/main.c,
+ xfce4-mixer/xfce-mixer-window.c: Fix a few memory leaks.
+
 2008-06-23 Jannis Pohlmann [EMAIL PROTECTED]
 
* libxfce4mixer/xfce-mixer-track-combo.c,

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-preferences.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-preferences.c2008-07-16 
23:14:49 UTC (rev 27322)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-preferences.c2008-07-17 
00:22:45 UTC (rev 27323)
@@ -280,6 +280,8 @@
   g_value_unset (src);
 }
 
+  g_free (specs);
+
   xfce_rc_close (rc);
 
   g_object_thaw_notify (G_OBJECT (preferences));
@@ -335,6 +337,8 @@
   g_value_unset (dest);
 }
 
+  g_free (specs);
+
   xfce_rc_close (rc);
 }
 

Modified: xfce4-mixer/trunk/xfce4-mixer/main.c
===
--- xfce4-mixer/trunk/xfce4-mixer/main.c2008-07-16 23:14:49 UTC (rev 
27322)
+++ xfce4-mixer/trunk/xfce4-mixer/main.c2008-07-17 00:22:45 UTC (rev 
27323)
@@ -99,5 +99,8 @@
   /* Enter the GTK+ main loop */
   gtk_main ();
 
+  /* Destroy the window */
+  gtk_widget_destroy (window);
+
   return EXIT_SUCCESS;
 }

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c   2008-07-16 23:14:49 UTC 
(rev 27322)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c   2008-07-17 00:22:45 UTC 
(rev 27323)
@@ -224,6 +224,8 @@
   gtk_container_add (GTK_CONTAINER (hbox), window-soundcard_combo);
   gtk_widget_show (window-soundcard_combo);
 
+  g_free (active_card);
+
   window-mixer_frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (window-mixer_frame), GTK_SHADOW_NONE);
   gtk_container_set_border_width (GTK_CONTAINER (window-mixer_frame), 6);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27327 - xfconf/trunk/xfsettingsd

2008-07-17 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-17 14:40:16 + (Thu, 17 Jul 2008)
New Revision: 27327

Modified:
   xfconf/trunk/xfsettingsd/registry.c
Log:
xfsettingsd/registry.c: Fix memory leaks and a crash due to invalid
free'ing of a GError (use g_error_free instead of g_free).

Modified: xfconf/trunk/xfsettingsd/registry.c
===
--- xfconf/trunk/xfsettingsd/registry.c 2008-07-17 13:49:30 UTC (rev 27326)
+++ xfconf/trunk/xfsettingsd/registry.c 2008-07-17 14:40:16 UTC (rev 27327)
@@ -371,7 +371,7 @@
 
 /* print warning */
 g_critical (Failed to spawn xrdb: %s, error-message);
-g_free (error);
+g_error_free (error);
 }
 
 void
@@ -533,6 +533,8 @@
 8, PropModeReplace, buffer, buf_len);
 
 registry-priv-last_change_serial = registry-priv-serial;
+
+g_free (buffer);
 }
 
 XSettingsRegistry *
@@ -703,6 +705,7 @@
 {
 XfconfChannel *channel = registry-priv-channel;
 XSettingsRegistryEntry *entry = properties;
+gchar *str;
 
 while (entry-name)
 {
@@ -717,7 +720,9 @@
 g_value_set_int(entry-value, 
xfconf_channel_get_int(channel, name, g_value_get_int(entry-value)));
 break;
 case G_TYPE_STRING:
-g_value_set_string(entry-value, 
xfconf_channel_get_string(channel, name, g_value_get_string(entry-value)));
+str = xfconf_channel_get_string(channel, name, 
g_value_get_string(entry-value));
+g_value_set_string(entry-value, str);
+g_free(str);
 break;
 case G_TYPE_BOOLEAN:
 g_value_set_boolean(entry-value, 
xfconf_channel_get_bool(channel, name, g_value_get_boolean(entry-value)));

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27328 - xfconf/trunk/xfconfd

2008-07-17 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-17 15:03:54 + (Thu, 17 Jul 2008)
New Revision: 27328

Modified:
   xfconf/trunk/xfconfd/main.c
   xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
Log:
xfconfd/main.c, xfconfd/xfconf-backend-perchannel-xml.c: Fix a few
small memory leaks and add a comment about one I don't know how to fix.

Modified: xfconf/trunk/xfconfd/main.c
===
--- xfconf/trunk/xfconfd/main.c 2008-07-17 14:40:16 UTC (rev 27327)
+++ xfconf/trunk/xfconfd/main.c 2008-07-17 15:03:54 UTC (rev 27328)
@@ -161,8 +161,11 @@
 g_option_context_add_main_entries(opt_ctx, options, PACKAGE);
 if(!g_option_context_parse(opt_ctx, argc, argv, error)) {
 g_printerr(Error parsing options: %s\n, error-message);
+g_error_free(error);
+g_option_context_free(opt_ctx);
 return 1;
 }
+g_option_context_free(opt_ctx);
 
 if(print_version) {
 g_print(Xfconfd version  VERSION \n);
@@ -199,6 +202,7 @@
 xfconfd = xfconf_daemon_new_unique(backends, error);
 if(!xfconfd) {
 g_printerr(Xfconfd failed to start: %s\n, error-message);
+g_error_free(error);
 return 1;
 }
 g_strfreev(backends);

Modified: xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
===
--- xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-07-17 
14:40:16 UTC (rev 27327)
+++ xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-07-17 
15:03:54 UTC (rev 27328)
@@ -897,6 +897,7 @@
 }
 
 /* FIXME: validate name for valid chars */
+/* FIXME: Is this used at all? Where does it need to be 
free'd? */
 state-channel_name = g_strdup(name);
 
 if((locked  *locked) || (unlocked  *unlocked)) {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27332 - xfconf/trunk/xfconfd

2008-07-17 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-17 19:31:41 + (Thu, 17 Jul 2008)
New Revision: 27332

Modified:
   xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
Log:
xfconfd/xfconf-backend-perchannel-xml.c: Fix crash when removing the
last property of a channel. The check whether we are at the root node
(the one with prop-name == /) was done after accessing the parent
of the current node (which is NULL for the root node).

Modified: xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
===
--- xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-07-17 
18:19:09 UTC (rev 27331)
+++ xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-07-17 
19:31:41 UTC (rev 27332)
@@ -712,11 +712,11 @@
 g_node_unlink(node);
 xfconf_proptree_destroy(node);
 
-/* remove parents without values until we find a parent with
- * a value or any children */
+/* remove parents without values until we find the root node 
or 
+ * a parent with a value or any children */
 while(parent) {
 prop = parent-data;
-if(!G_IS_VALUE(prop-value)  !parent-children) {
+if(!G_IS_VALUE(prop-value)  !parent-children  
strcmp(prop-name, /) != 0) {
 GNode *tmp = parent;
 parent = parent-parent;
 
@@ -724,11 +724,6 @@
 
 g_node_unlink(tmp);
 xfconf_proptree_destroy(tmp);
-
-/* but don't remove the root node */
-prop = parent-data;
-if(!strcmp(/, prop-name))
-parent = NULL;
 } else
 parent = NULL;
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27334 - in xfce4-settings/trunk: . dialogs/keyboard-settings

2008-07-17 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-18 00:28:43 + (Fri, 18 Jul 2008)
New Revision: 27334

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/TODO
   xfce4-settings/trunk/dialogs/keyboard-settings/main.c
   xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
Log:
* dialogs/keyboard-settings/main.c: Fix some issues with multiple row
  selection in the shortcuts tree view. Properly destroy the command
  dialog when adding a new command but pressing the cancel button in
  the command dialog.
* dialogs/keyboard-settings/shortcut-dialog.c: Remove the No
  shortcut button as we don't support empty shortcut properties
  anyway.

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-17 22:01:30 UTC (rev 27333)
+++ xfce4-settings/trunk/ChangeLog  2008-07-18 00:28:43 UTC (rev 27334)
@@ -1,3 +1,13 @@
+2008-07-18 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * dialogs/keyboard-settings/main.c: Fix some issues with multiple row
+ selection in the shortcuts tree view. Properly destroy the command
+ dialog when adding a new command but pressing the cancel button in 
+ the command dialog. 
+   * dialogs/keyboard-settings/shortcut-dialog.c: Remove the No
+ shortcut button as we don't support empty shortcut properties
+ anyway.
+
 2008-07-17 Nick Schermer [EMAIL PROTECTED]
 
* dialogs/display-settings/Makefile.am,

Modified: xfce4-settings/trunk/TODO
===
--- xfce4-settings/trunk/TODO   2008-07-17 22:01:30 UTC (rev 27333)
+++ xfce4-settings/trunk/TODO   2008-07-18 00:28:43 UTC (rev 27334)
@@ -1,6 +1,7 @@
 Keyboard settings
 
 
+  * Use XfceTitledDialog for the ShortcutDialog.
   * The default values of the sliders don't make sence. I think we should
 also show the slider value and add a tooltip to the slide what the
 value actually stands for, like in the mouse dialog.

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/main.c   2008-07-17 
22:01:30 UTC (rev 27333)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c   2008-07-18 
00:28:43 UTC (rev 27334)
@@ -59,10 +59,7 @@
 
 
 
-gboolean opt_version = FALSE;
-
-
-
+static gboolean opt_version = FALSE;
 static GOptionEntry entries[] = {
   { version, 'v', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, opt_version, 
N_(Version information), NULL },
   { NULL }
@@ -70,6 +67,14 @@
 
 
 
+struct TreeViewInfo
+{
+  GtkTreeView *view;
+  GtkTreeIter *iter;
+};
+
+
+
 static void
 keyboard_settings_box_sensitivity (GtkToggleButton *button,
GtkWidget   *box)
@@ -146,9 +151,9 @@
 
 
 static gboolean
-keyboard_settings_validate_shortcut (ShortcutDialog *dialog,
- const gchar*shortcut,
- GtkTreeView*tree_view)
+keyboard_settings_validate_shortcut (ShortcutDialog  *dialog,
+ const gchar *shortcut,
+ struct TreeViewInfo *info)
 {
   GtkTreeSelection *selection;
   GtkTreeModel *model;
@@ -157,31 +162,40 @@
   gchar*current_shortcut;
   gchar*property;
 
-#if 1
-  /* Ignore raw 'Return' since that may have been used to activate the 
shortcut row */
-  if (G_UNLIKELY (g_utf8_collate (shortcut, Return) == 0
-  || g_utf8_collate (shortcut, space) == 0))
+  /* Ignore raw 'Return' and 'space' since that may have been used to activate 
the shortcut row */
+  if (G_UNLIKELY (g_utf8_collate (shortcut, Return) == 0 || g_utf8_collate 
(shortcut, space) == 0))
 return FALSE;
-#endif
 
-  selection = gtk_tree_view_get_selection (tree_view);
+  /* Build property name */
+  property = g_strdup_printf (/%s, shortcut);
 
-  if (G_LIKELY (gtk_tree_selection_get_selected (selection, model, iter)))
+  if (G_LIKELY (info-iter != NULL))
 {
-  gtk_tree_model_get (model, iter, SHORTCUT_COLUMN, current_shortcut, 
-1);
+  /* Get shortcut of the row we're currently editing */
+  gtk_tree_model_get (gtk_tree_view_get_model (info-view), info-iter, 
SHORTCUT_COLUMN, current_shortcut, -1);
 
-  property = g_strdup_printf (/%s, shortcut);
-
+  /* Don't accept the shortcut if it already is being used somewhere else 
(and not by the current row) */
   if (G_UNLIKELY (xfconf_channel_has_property (kbd_channel, property)  
g_utf8_collate (current_shortcut, shortcut) != 0))
 {
   xfce_err (_(Keyboard shortcut '%s' is already being used for 
something else.), shortcut);
   shortcut_accepted = FALSE

[Xfce4-commits] r27375 - libexo/trunk

2008-07-26 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-26 12:27:03 + (Sat, 26 Jul 2008)
New Revision: 27375

Modified:
   libexo/trunk/ChangeLog
   libexo/trunk/autogen.sh
Log:
* autogen.sh: Add @REVISION@ substitution support for git svn
  repositories.

Modified: libexo/trunk/ChangeLog
===
--- libexo/trunk/ChangeLog  2008-07-26 10:58:23 UTC (rev 27374)
+++ libexo/trunk/ChangeLog  2008-07-26 12:27:03 UTC (rev 27375)
@@ -1,3 +1,8 @@
+2008-07-26 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * autogen.sh: Add @REVISION@ substitution support for git svn 
+ repositories.
+
 2008-07-17 Nick Schermer [EMAIL PROTECTED]
 
* exo-csource/main.c: Don't strip text between nodes 

Modified: libexo/trunk/autogen.sh
===
--- libexo/trunk/autogen.sh 2008-07-26 10:58:23 UTC (rev 27374)
+++ libexo/trunk/autogen.sh 2008-07-26 12:27:03 UTC (rev 27375)
@@ -29,7 +29,14 @@
 
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
+if [ -d .git/svn ]; then
+  revision=`git svn find-rev trunk ||
+git svn find-rev origin/trunk ||
+git svn find-rev HEAD ||
+git svn find-rev master`
+else
+  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
+fi
 sed -e s/@LINGUAS@/${linguas}/g \
 -e s/@REVISION@/${revision}/g \
  configure.in.in  configure.in

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27378 - in xfce4-settings/trunk: . dialogs/keyboard-settings xfce4-settings-helper

2008-07-26 Thread Jannis Pohlmann

Author: jannis
Date: 2008-07-27 05:34:14 + (Sun, 27 Jul 2008)
New Revision: 27378

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/keyboard-settings/main.c
   xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
Log:
* dialogs/keyboard-settings/main.c,
  xfce4-settings-helper/keyboard-shortcuts.c: Use
  xfconf_channel_get_properties() instead of xfconf_channel_get_all().

Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-07-27 02:07:15 UTC (rev 27377)
+++ xfce4-settings/trunk/ChangeLog  2008-07-27 05:34:14 UTC (rev 27378)
@@ -1,3 +1,9 @@
+2008-07-27 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * dialogs/keyboard-settings/main.c,
+ xfce4-settings-helper/keyboard-shortcuts.c: Use
+ xfconf_channel_get_properties() instead of xfconf_channel_get_all().
+
 2008-07-26 Nick Schermer [EMAIL PROTECTED]
 
First commit with legacy code working (randr  1.2). Randr

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/main.c   2008-07-27 
02:07:15 UTC (rev 27377)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c   2008-07-27 
05:34:14 UTC (rev 27378)
@@ -139,7 +139,7 @@
   g_return_if_fail (GTK_IS_TREE_VIEW (kbd_shortcuts_view));
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
 
-  shortcuts = xfconf_channel_get_all (kbd_channel);
+  shortcuts = xfconf_channel_get_properties (kbd_channel, NULL);
 
   if (G_LIKELY (shortcuts != NULL))
 {

Modified: xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
===
--- xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c 
2008-07-27 02:07:15 UTC (rev 27377)
+++ xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c 
2008-07-27 05:34:14 UTC (rev 27378)
@@ -191,7 +191,7 @@
   helper-shortcuts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, 
g_free);
 
   /* Get all properties of the channel */
-  properties = xfconf_channel_get_all (helper-channel);
+  properties = xfconf_channel_get_properties (helper-channel, NULL);
 
   if (G_LIKELY (properties != NULL))
 {

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27441 - in xfce4-mixer/trunk: . panel-plugin

2008-08-10 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-10 13:37:37 + (Sun, 10 Aug 2008)
New Revision: 27441

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c
   xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
Log:
* panel-plugin/xfce-volume-button.c: Use mute icon only if the
  mixer track is actually muted.
* panel-plugin/xfce-plugin-dialog.c: Fix compiler warning due to
  missing gst/interfaces/mixer.h include.

Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-08-10 11:43:06 UTC (rev 27440)
+++ xfce4-mixer/trunk/ChangeLog 2008-08-10 13:37:37 UTC (rev 27441)
@@ -1,3 +1,10 @@
+2008-08-10 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * panel-plugin/xfce-volume-button.c: Use mute icon only if the
+ mixer track is actually muted.
+   * panel-plugin/xfce-plugin-dialog.c: Fix compiler warning due to
+ missing gst/interfaces/mixer.h include.
+
 2008-07-17 Jannis Pohlmann [EMAIL PROTECTED]
 
* libxfce4mixer/xfce-mixer-preferences.c, xfce4-mixer/main.c,

Modified: xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c 2008-08-10 11:43:06 UTC 
(rev 27440)
+++ xfce4-mixer/trunk/panel-plugin/xfce-plugin-dialog.c 2008-08-10 13:37:37 UTC 
(rev 27441)
@@ -25,6 +25,7 @@
 #include gtk/gtk.h
 
 #include gst/gst.h
+#include gst/interfaces/mixer.h
 
 #include libxfcegui4/libxfcegui4.h
 

Modified: xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-08-10 11:43:06 UTC 
(rev 27440)
+++ xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c 2008-08-10 13:37:37 UTC 
(rev 27441)
@@ -415,10 +415,9 @@
   /* Determine the difference between upper and lower bound (= volume range) */
   range = (upper - lower) / (G_N_ELEMENTS (icons) - 2);
 
-  if (G_UNLIKELY (value == lower || button-is_muted))
+  if (G_UNLIKELY (button-is_muted))
 {
-  /* By definition, use the first icon if the volume is set to the minimum 
value
-   * or if the button is muted */
+  /* By definition, use the first icon if the button is muted */
   pixbuf = button-pixbufs[0];
 }
   else

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27614 - libexo/trunk

2008-08-30 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-30 20:38:23 + (Sat, 30 Aug 2008)
New Revision: 27614

Modified:
   libexo/trunk/ChangeLog
   libexo/trunk/INSTALL
   libexo/trunk/autogen.sh
Log:
* autogen.sh: Do not print errors when trying to detect the
  revision of a git svn repository.


Modified: libexo/trunk/ChangeLog
===
--- libexo/trunk/ChangeLog  2008-08-30 09:35:46 UTC (rev 27613)
+++ libexo/trunk/ChangeLog  2008-08-30 20:38:23 UTC (rev 27614)
@@ -1,3 +1,8 @@
+2008-08-30 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * autogen.sh: Do not print errors when trying to detect the 
+ revision of a git svn repository.
+
 2008-08-25 Brian Tarricone [EMAIL PROTECTED]
 
* exo-helper/exo-preferred-applications.desktop.in: Include

Modified: libexo/trunk/INSTALL
===
--- libexo/trunk/INSTALL2008-08-30 09:35:46 UTC (rev 27613)
+++ libexo/trunk/INSTALL2008-08-30 20:38:23 UTC (rev 27614)
@@ -2,7 +2,7 @@
 *
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@
  all sorts of other programs in order to regenerate files that came
  with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
 Compilers and Options
 =
 

Modified: libexo/trunk/autogen.sh
===
--- libexo/trunk/autogen.sh 2008-08-30 09:35:46 UTC (rev 27613)
+++ libexo/trunk/autogen.sh 2008-08-30 20:38:23 UTC (rev 27614)
@@ -30,10 +30,10 @@
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if [ -d .git/svn ]; then
-  revision=`git svn find-rev trunk ||
-git svn find-rev origin/trunk ||
-git svn find-rev HEAD ||
-git svn find-rev master`
+  revision=`git svn find-rev trunk 2/dev/null ||
+git svn find-rev origin/trunk 2/dev/null ||
+git svn find-rev HEAD 2/dev/null ||
+git svn find-rev master 2/dev/null`
 else
   revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
 fi

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27615 - xfconf/trunk

2008-08-30 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-30 20:46:37 + (Sat, 30 Aug 2008)
New Revision: 27615

Modified:
   xfconf/trunk/autogen.sh
Log:
Don't print errors when trying to determine the revision of a git svn
repository.


Modified: xfconf/trunk/autogen.sh
===
--- xfconf/trunk/autogen.sh 2008-08-30 20:38:23 UTC (rev 27614)
+++ xfconf/trunk/autogen.sh 2008-08-30 20:46:37 UTC (rev 27615)
@@ -35,10 +35,10 @@
 # substitute revision and linguas
 linguas=$(sed -e '/^#/d' po/LINGUAS)
 if [ -d .git/svn ]; then
-revision=$(git svn find-rev trunk ||
-   git svn find-rev origin/trunk ||
-   git svn find-rev HEAD ||
-   git svn find-rev master)
+revision=$(git svn find-rev trunk 2/dev/null ||
+   git svn find-rev origin/trunk 2/dev/null ||
+   git svn find-rev HEAD 2/dev/null ||
+   git svn find-rev master 2/dev/null)
 elif [ -d .svn ]; then
 revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, 
$2}')
 else

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27617 - xfce4-panel/trunk

2008-08-30 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-30 22:04:41 + (Sat, 30 Aug 2008)
New Revision: 27617

Modified:
   xfce4-panel/trunk/ChangeLog
   xfce4-panel/trunk/autogen.sh
Log:
* autogen.sh: Don't print errors when trying to detect the revision
  of a git svn repository.


Modified: xfce4-panel/trunk/ChangeLog
===
--- xfce4-panel/trunk/ChangeLog 2008-08-30 21:16:27 UTC (rev 27616)
+++ xfce4-panel/trunk/ChangeLog 2008-08-30 22:04:41 UTC (rev 27617)
@@ -1,3 +1,8 @@
+2008-08-31 00:04 jannis
+
+   * autogen.sh: Don't print errors when trying to detect the revision
+ of a git svn repository.
+
 2008-08-25 06:20 kelnos
 
 * Include panel settings in new settings manager dialog

Modified: xfce4-panel/trunk/autogen.sh
===
--- xfce4-panel/trunk/autogen.sh2008-08-30 21:16:27 UTC (rev 27616)
+++ xfce4-panel/trunk/autogen.sh2008-08-30 22:04:41 UTC (rev 27617)
@@ -30,10 +30,10 @@
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if test -d .git/svn; then
- revision=`git svn find-rev trunk ||
-   git svn find-rev origin/trunk ||
-   git svn find-rev HEAD ||
-   git svn find-rev master`
+ revision=`git svn find-rev trunk 2/dev/null ||
+   git svn find-rev origin/trunk 2/dev/null ||
+   git svn find-rev HEAD 2/dev/null ||
+   git svn find-rev master 2/dev/null`
 else
  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,
 $2}'`

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27618 - libxfce4menu/trunk

2008-08-30 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-30 22:16:11 + (Sat, 30 Aug 2008)
New Revision: 27618

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/autogen.sh
Log:
* autogen.sh: Don't print errors when trying to detect the
  revision of a git svn repository.


Modified: libxfce4menu/trunk/ChangeLog
===
--- libxfce4menu/trunk/ChangeLog2008-08-30 22:04:41 UTC (rev 27617)
+++ libxfce4menu/trunk/ChangeLog2008-08-30 22:16:11 UTC (rev 27618)
@@ -1,3 +1,8 @@
+2008-08-31 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * autogen.sh: Don't print errors when trying to detect the
+ revision of a git svn repository.
+
 2008-08-17 Brian Tarricone [EMAIL PROTECTED]
 
* configure.in.in: Set LIBXFCE4MENU_VERSION_API independently

Modified: libxfce4menu/trunk/autogen.sh
===
--- libxfce4menu/trunk/autogen.sh   2008-08-30 22:04:41 UTC (rev 27617)
+++ libxfce4menu/trunk/autogen.sh   2008-08-30 22:16:11 UTC (rev 27618)
@@ -32,10 +32,10 @@
 # Substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if test -d .git/svn; then
- revision=$(git svn find-rev trunk ||
-git svn find-rev origin/trunk ||
-git svn find-rev HEAD ||
-git svn find-rev master)
+ revision=$(git svn find-rev trunk 2/dev/null ||
+git svn find-rev origin/trunk 2/dev/null ||
+git svn find-rev HEAD 2/dev/null ||
+git svn find-rev master 2/dev/null)
 else
  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,
 $2}'`

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27619 - libxfce4menu/trunk

2008-08-30 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-30 22:25:48 + (Sat, 30 Aug 2008)
New Revision: 27619

Modified:
   libxfce4menu/trunk/autogen.sh
Log:
Fix the previous commit.


Modified: libxfce4menu/trunk/autogen.sh
===
--- libxfce4menu/trunk/autogen.sh   2008-08-30 22:16:11 UTC (rev 27618)
+++ libxfce4menu/trunk/autogen.sh   2008-08-30 22:25:48 UTC (rev 27619)
@@ -32,13 +32,12 @@
 # Substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
 if test -d .git/svn; then
- revision=$(git svn find-rev trunk 2/dev/null ||
-git svn find-rev origin/trunk 2/dev/null ||
-git svn find-rev HEAD 2/dev/null ||
-git svn find-rev master 2/dev/null)
+  revision=$(git svn find-rev trunk 2/dev/null ||
+ git svn find-rev origin/trunk 2/dev/null ||
+ git svn find-rev HEAD 2/dev/null ||
+ git svn find-rev master 2/dev/null)
 else
- revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,
-$2}'`
+  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,$2}'`
 fi
 sed -e s/@LINGUAS@/${linguas}/g \
 -e s/@REVISION@/${revision}/g \

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27628 - in xfce4-settings/trunk: . dialogs/keyboard-settings

2008-08-31 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-31 13:38:18 + (Sun, 31 Aug 2008)
New Revision: 27628

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
Log:
* dialogs/keyboard-settings/shortcut-dialog.c: Ignore
  GDK_SUPER_MASK, GDK_HYPER_MASK and GDK_META_MASK when parsing
  key release events. xfce4-settings-helper handles X events
  instead of Gdk events and unlike Gdk X doesn't know which
  of the Super, Meta and Hyper keys are mapped to Mod2-Mod5.
  Having Super, Meta, Hyper or even SuperSuper_L in the
  accelerator name will cause the saved shortcut names to be
  different than the ones generated by parsing X key events.
  This should fix bug #4304 although I suppose it would be
  nicer to determine which keys are mapped to Mod2-Mod5 when
  parsing X key events from the semantic point of view.


Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-08-31 07:41:38 UTC (rev 27627)
+++ xfce4-settings/trunk/ChangeLog  2008-08-31 13:38:18 UTC (rev 27628)
@@ -1,3 +1,17 @@
+2008-08-31 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * dialogs/keyboard-settings/shortcut-dialog.c: Ignore
+ GDK_SUPER_MASK, GDK_HYPER_MASK and GDK_META_MASK when parsing
+ key release events. xfce4-settings-helper handles X events
+ instead of Gdk events and unlike Gdk X doesn't know which 
+ of the Super, Meta and Hyper keys are mapped to Mod2-Mod5. 
+ Having Super, Meta, Hyper or even SuperSuper_L in the
+ accelerator name will cause the saved shortcut names to be
+ different than the ones generated by parsing X key events.
+ This should fix bug #4304 although I suppose it would be 
+ nicer to determine which keys are mapped to Mod2-Mod5 when
+ parsing X key events from the semantic point of view.
+
 2008-08-30 Jannis Pohlmann [EMAIL PROTECTED]
 
* dialogs/keyboard-settings/main.c: Don't call gtk_widget_hide()

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-08-31 07:41:38 UTC (rev 27627)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-08-31 13:38:18 UTC (rev 27628)
@@ -32,6 +32,15 @@
 
 
 
+/* Modifiers to be ignored (0x2000 is an Xkb modifier) */
+#define IGNORED_MODIFIERS (0x2000 | GDK_LOCK_MASK | GDK_HYPER_MASK | 
GDK_SUPER_MASK | GDK_META_MASK)
+
+/* Modifiers to be used */
+#define USED_MODIFIERS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | 
GDK_MOD2_MASK | \
+GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK)
+
+
+
 static void shortcut_dialog_class_init   (ShortcutDialogClass *klass);
 static void shortcut_dialog_init (ShortcutDialog  *dialog);
 static void shortcut_dialog_dispose  (GObject *object);
@@ -302,9 +311,13 @@
   gboolean event_handled = FALSE;
   gboolean shortcut_accepted = FALSE;
   gchar   *shortcut;
+  gint modifiers;
 
+  /* Strip ignored modifiers from the event mask */
+  modifiers = event-state  ~IGNORED_MODIFIERS  GDK_MODIFIER_MASK;
+
   /* Get GTK+ accelerator string */
-  shortcut = gtk_accelerator_name (event-keyval, event-state);
+  shortcut = gtk_accelerator_name (event-keyval, modifiers);
 
   /* Let 'validate-shortcut' listeners decide whether this shortcut is ok or 
not */
   g_signal_emit_by_name (dialog, validate-shortcut, shortcut, 
shortcut_accepted);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27629 - in xfce4-mixer/trunk: . libxfce4mixer xfce4-mixer

2008-08-31 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-31 18:33:06 + (Sun, 31 Aug 2008)
New Revision: 27629

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
Log:
* libxfce4mixe/xfce-mixer-card-combo.c,
  xfce4-mixer/xfce-mixer-window.c: Remember the selected sound card so
  that it is selected again on next startup. Use
  xfce_mixer_card_get_name() instead of
  xfce_mixer_card_get_display_name() to determine the active card
  index in XFceMixerCardCombo.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-08-31 13:38:18 UTC (rev 27628)
+++ xfce4-mixer/trunk/ChangeLog 2008-08-31 18:33:06 UTC (rev 27629)
@@ -1,3 +1,12 @@
+2008-08-31 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * libxfce4mixe/xfce-mixer-card-combo.c,
+ xfce4-mixer/xfce-mixer-window.c: Remember the selected sound card so
+ that it is selected again on next startup. Use
+ xfce_mixer_card_get_name() instead of
+ xfce_mixer_card_get_display_name() to determine the active card
+ index in XFceMixerCardCombo.
+
 2008-08-10 Jannis Pohlmann [EMAIL PROTECTED]
 
* panel-plugin/xfce-volume-button.c: Use mute icon only if the

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c 2008-08-31 
13:38:18 UTC (rev 27628)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c 2008-08-31 
18:33:06 UTC (rev 27629)
@@ -218,7 +218,7 @@
   gtk_list_store_append (combo-model, iter);
   gtk_list_store_set (combo-model, iter, NAME_COLUMN, 
xfce_mixer_card_get_display_name (card), CARD_COLUMN, card, -1);
 
-  if (G_UNLIKELY (card_name != NULL  g_utf8_collate 
(xfce_mixer_card_get_display_name (card), card_name) == 0))
+  if (G_UNLIKELY (card_name != NULL  g_utf8_collate 
(xfce_mixer_card_get_name (card), card_name) == 0))
 active_index = counter;
 }
 

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c   2008-08-31 13:38:18 UTC 
(rev 27628)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c   2008-08-31 18:33:06 UTC 
(rev 27629)
@@ -319,6 +319,9 @@
 
   /* Make the Select Controls... button sensitive */
   gtk_widget_set_sensitive (window-select_controls_button, TRUE);
+
+  /* Remember the card for next time */
+  g_object_set (G_OBJECT (window-preferences), sound-card, 
xfce_mixer_card_get_name (card), NULL);
 }
 
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27632 - in xfce4-settings/trunk: . dialogs/keyboard-settings xfce4-settings-helper

2008-08-31 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-31 23:48:13 + (Sun, 31 Aug 2008)
New Revision: 27632

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
   xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
Log:
* dialogs/keyboard-settings/shortcuts-dialog.c,
  xfce4-settings-helper/keyboard-shortcuts.c: Add two new functions
  called get_modifier_masks() and get_ignore_mask(). The first
  determines to which of the Mod2-Mod5 modifiers CapsLock, NumLock and
  ScrollLock are mapped and generates a modifier mask for them. The
  latter combines this mask with the IGNORED_MODIFIERS mask which we
  already used before and which includes GDK_HYPER_MASK etc.. This
  mask is then used in several places to avoid these modifiers to
  appear in the result of gtk_accelerator_name() and to properly grab
  the shortcuts. This should fix bug #4304.


Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-08-31 19:02:51 UTC (rev 27631)
+++ xfce4-settings/trunk/ChangeLog  2008-08-31 23:48:13 UTC (rev 27632)
@@ -1,3 +1,16 @@
+2008-09-01 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * dialogs/keyboard-settings/shortcuts-dialog.c,
+ xfce4-settings-helper/keyboard-shortcuts.c: Add two new functions
+ called get_modifier_masks() and get_ignore_mask(). The first
+ determines to which of the Mod2-Mod5 modifiers CapsLock, NumLock and
+ ScrollLock are mapped and generates a modifier mask for them. The
+ latter combines this mask with the IGNORED_MODIFIERS mask which we
+ already used before and which includes GDK_HYPER_MASK etc.. This
+ mask is then used in several places to avoid these modifiers to
+ appear in the result of gtk_accelerator_name() and to properly grab
+ the shortcuts. This should fix bug #4304.
+.
 2008-08-31 Jannis Pohlmann [EMAIL PROTECTED]
 
* dialogs/keyboard-settings/shortcut-dialog.c: Ignore

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-08-31 19:02:51 UTC (rev 27631)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-08-31 23:48:13 UTC (rev 27632)
@@ -23,6 +23,8 @@
 #include config.h
 #endif
 
+#include gdk/gdkkeysyms.h
+
 #include gtk/gtk.h
 
 #include libxfce4util/libxfce4util.h
@@ -32,15 +34,6 @@
 
 
 
-/* Modifiers to be ignored (0x2000 is an Xkb modifier) */
-#define IGNORED_MODIFIERS (0x2000 | GDK_LOCK_MASK | GDK_HYPER_MASK | 
GDK_SUPER_MASK | GDK_META_MASK)
-
-/* Modifiers to be used */
-#define USED_MODIFIERS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | 
GDK_MOD2_MASK | \
-GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK)
-
-
-
 static void shortcut_dialog_class_init   (ShortcutDialogClass *klass);
 static void shortcut_dialog_init (ShortcutDialog  *dialog);
 static void shortcut_dialog_dispose  (GObject *object);
@@ -49,6 +42,11 @@
   const gchar *action);
 static gboolean shortcut_dialog_key_released (ShortcutDialog  *dialog,
   GdkEventKey *event);
+static gboolean get_modmap_masks (Display *display,
+  gint
*caps_lock_mask,
+  gint
*num_lock_mask,
+  gint
*scroll_lock_mask);
+static gint get_ignore_mask  (Display 
*display);
 
 
 
@@ -308,13 +306,18 @@
 shortcut_dialog_key_released (ShortcutDialog *dialog,
   GdkEventKey*event)
 {
+  Display *display;
   gboolean event_handled = FALSE;
   gboolean shortcut_accepted = FALSE;
   gchar   *shortcut;
   gint modifiers;
+  gint ignore_mask;
 
+  /* Determine mask of ignored modifiers */
+  ignore_mask = get_ignore_mask (GDK_DISPLAY_XDISPLAY (gdk_display_get_default 
()));
+
   /* Strip ignored modifiers from the event mask */
-  modifiers = event-state  ~IGNORED_MODIFIERS  GDK_MODIFIER_MASK;
+  modifiers = event-state  ~ignore_mask;
 
   /* Get GTK+ accelerator string */
   shortcut = gtk_accelerator_name (event-keyval, modifiers);
@@ -352,3 +355,117 @@
   g_return_val_if_fail (IS_SHORTCUT_DIALOG (dialog), NULL);
   return dialog-shortcut;
 }
+
+
+
+/* The following code appears again in 
xfce4-settings-helper/keyboard-shortcuts-helper.c: */
+
+/* Modifiers to be ignored (0x2000 is an Xkb modifier) */
+#define IGNORED_MODIFIERS (0x2000

[Xfce4-commits] r27637 - in xfce4-mixer/trunk: . xfce4-mixer

2008-09-01 Thread Jannis Pohlmann

Author: jannis
Date: 2008-09-01 11:40:15 + (Mon, 01 Sep 2008)
New Revision: 27637

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* xfce4-mixer/xfce-mixer.c: Connect to the GstBus after creating the
  mxier widgets, not before. This shouldn't change anything but it
  makes more sense to me.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-09-01 07:34:37 UTC (rev 27636)
+++ xfce4-mixer/trunk/ChangeLog 2008-09-01 11:40:15 UTC (rev 27637)
@@ -1,3 +1,9 @@
+2008-09-01 Jannis Pohlmann [EMAIL PROTECTED]
+
+   * xfce4-mixer/xfce-mixer.c: Connect to the GstBus after creating the
+ mxier widgets, not before. This shouldn't change anything but it
+ makes more sense to me.
+
 2008-08-31 Jannis Pohlmann [EMAIL PROTECTED]
 
* libxfce4mixe/xfce-mixer-card-combo.c,

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-09-01 07:34:37 UTC (rev 
27636)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-09-01 11:40:15 UTC (rev 
27637)
@@ -183,10 +183,6 @@
 
   xfce_mixer_card_set_ready (mixer-card);
 
-#ifdef HAVE_GST_MIXER_NOTIFICATION
-  xfce_mixer_card_connect (mixer-card, G_CALLBACK (xfce_mixer_bus_message), 
mixer);
-#endif
-
   /* Create widgets for all four tabs */
   for (i = 0; i  4; ++i)
 {
@@ -323,6 +319,10 @@
 
   gtk_notebook_append_page (GTK_NOTEBOOK (mixer), label2, label1);
 }
+
+#ifdef HAVE_GST_MIXER_NOTIFICATION
+  xfce_mixer_card_connect (mixer-card, G_CALLBACK (xfce_mixer_bus_message), 
mixer);
+#endif
 }
 
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27638 - in xfce4-mixer/trunk: . xfce4-mixer

2008-09-01 Thread Jannis Pohlmann

Author: jannis
Date: 2008-09-01 12:12:51 + (Mon, 01 Sep 2008)
New Revision: 27638

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* xfce4-mixer/xfce-mixer.c: Add g_return_val_if_fail() call to
  xfce_mixer_bus_message() in order to return when an invalid mixer
  object is passed to the function.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-09-01 11:40:15 UTC (rev 27637)
+++ xfce4-mixer/trunk/ChangeLog 2008-09-01 12:12:51 UTC (rev 27638)
@@ -1,5 +1,11 @@
 2008-09-01 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * xfce4-mixer/xfce-mixer.c: Add g_return_val_if_fail() call to
+ xfce_mixer_bus_message() in order to return when an invalid mixer
+ object is passed to the function.
+
+2008-09-01 Jannis Pohlmann [EMAIL PROTECTED]
+
* xfce4-mixer/xfce-mixer.c: Connect to the GstBus after creating the
  mxier widgets, not before. This shouldn't change anything but it
  makes more sense to me.

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-09-01 11:40:15 UTC (rev 
27637)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-09-01 12:12:51 UTC (rev 
27638)
@@ -343,6 +343,8 @@
   gint   *volumes;
   gintnum_channels;
 
+  g_return_val_if_fail (IS_XFCE_MIXER (mixer), TRUE);
+
   if (G_UNLIKELY (!xfce_mixer_card_get_message_owner (mixer-card, message)))
 return TRUE;
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27639 - in xfce4-mixer/trunk: . libxfce4mixer xfce4-mixer

2008-09-01 Thread Jannis Pohlmann

Author: jannis
Date: 2008-09-01 13:28:58 + (Mon, 01 Sep 2008)
New Revision: 27639

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.h
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* libxfce4mixer/xfce-mixer-card.{c,h}: Add new method
  xfce_mixer_card_disconnect() and return the signal handler ID from
  xfce_mixer_card_connect().
* xfce4-mixer/xfce-mixer.c: Disconnect from the XfceMixeCard in
  xfce_mixer_finalize(). This way there will be no GstBus messages
  sent to finalized XfceMixer objects any more. Fixes a bug on first
  startup.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-09-01 12:12:51 UTC (rev 27638)
+++ xfce4-mixer/trunk/ChangeLog 2008-09-01 13:28:58 UTC (rev 27639)
@@ -1,5 +1,15 @@
 2008-09-01 Jannis Pohlmann [EMAIL PROTECTED]
 
+   * libxfce4mixer/xfce-mixer-card.{c,h}: Add new method
+ xfce_mixer_card_disconnect() and return the signal handler ID from
+ xfce_mixer_card_connect(). 
+   * xfce4-mixer/xfce-mixer.c: Disconnect from the XfceMixeCard in
+ xfce_mixer_finalize(). This way there will be no GstBus messages
+ sent to finalized XfceMixer objects any more. Fixes a bug on first
+ startup.
+
+2008-09-01 Jannis Pohlmann [EMAIL PROTECTED]
+
* xfce4-mixer/xfce-mixer.c: Add g_return_val_if_fail() call to
  xfce_mixer_bus_message() in order to return when an invalid mixer
  object is passed to the function.

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c   2008-09-01 12:12:51 UTC 
(rev 27638)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c   2008-09-01 13:28:58 UTC 
(rev 27639)
@@ -352,7 +352,7 @@
 
 
 #ifdef HAVE_GST_MIXER_NOTIFICATION
-void
+gint
 xfce_mixer_card_connect (XfceMixerCard *card,
  GCallback  callback_func,
  gpointer   user_data)
@@ -366,11 +366,23 @@
   gst_element_set_bus (card-element, card-bus);
 }
 
-  g_signal_connect (G_OBJECT (card-bus), message::element, callback_func, 
user_data);
+  return g_signal_connect (G_OBJECT (card-bus), message::element, 
callback_func, user_data);
 }
 
 
 
+void
+xfce_mixer_card_disconnect (XfceMixerCard *card,
+gint   handler_id)
+{
+  g_return_if_fail (IS_XFCE_MIXER_CARD (card));
+
+  if (G_LIKELY (card-bus != NULL))
+g_signal_handler_disconnect (card-bus, handler_id);
+}
+
+
+
 gboolean
 xfce_mixer_card_get_message_owner (XfceMixerCard *card,
GstMessage*message)

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.h
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.h   2008-09-01 12:12:51 UTC 
(rev 27638)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.h   2008-09-01 13:28:58 UTC 
(rev 27639)
@@ -68,9 +68,11 @@
  GstMixerTrack *track,
  gchar *option);
 #ifdef HAVE_GST_MIXER_NOTIFICATION
-void   xfce_mixer_card_connect  (XfceMixerCard *card,
+gint   xfce_mixer_card_connect  (XfceMixerCard *card,
  GCallback  
callback_func,
  gpointer   user_data);
+void   xfce_mixer_card_disconnect   (XfceMixerCard *card,
+ gint   
handler_id);
 gboolean   xfce_mixer_card_get_message_owner(XfceMixerCard *card,
  GstMessage*message);
 #endif

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-09-01 12:12:51 UTC (rev 
27638)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c  2008-09-01 13:28:58 UTC (rev 
27639)
@@ -62,6 +62,10 @@
 
   XfceMixerCard *card;
 
+#ifdef HAVE_GST_MIXER_NOTIFICATION
+  gint   bus_connection_id;
+#endif
+
   GHashTable*widgets;
 };
 
@@ -119,6 +123,7 @@
 xfce_mixer_init (XfceMixer *mixer)
 {
   mixer-widgets = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
+  mixer-bus_connection_id = 0;
 }
 
 
@@ -136,6 +141,10 @@
 {
   XfceMixer *mixer = XFCE_MIXER (object);
 
+#ifdef HAVE_GST_MIXER_NOTIFICATION
+  xfce_mixer_card_disconnect (mixer-card, mixer-bus_connection_id);
+#endif
+
   g_object_unref (G_OBJECT (mixer-card));
 
   g_hash_table_unref (mixer-widgets);
@@ -321,7 +330,7 @@
 }
 
 #ifdef

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1819 matches

Mail list logo