Hello community,
here is the log from the commit of package xfce4-panel-plugin-pulseaudio for
openSUSE:Factory checked in at 2015-03-11 09:58:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-pulseaudio (Old)
and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-pulseaudio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-pulseaudio"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-panel-plugin-pulseaudio/xfce4-panel-plugin-pulseaudio.changes
2015-03-09 10:07:36.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xfce4-panel-plugin-pulseaudio.new/xfce4-panel-plugin-pulseaudio.changes
2015-03-11 09:58:10.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Mar 9 09:23:54 UTC 2015 - [email protected]
+
+- update to version 0.2.1
+ - incorrect mouse coordinate translation in the volume slider
+ - crash on menu popup/popdown
+
+-------------------------------------------------------------------
Old:
----
xfce4-pulseaudio-plugin-0.2.0.tar.bz2
New:
----
xfce4-pulseaudio-plugin-0.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-panel-plugin-pulseaudio.spec ++++++
--- /var/tmp/diff_new_pack.247Z2M/_old 2015-03-11 09:58:11.000000000 +0100
+++ /var/tmp/diff_new_pack.247Z2M/_new 2015-03-11 09:58:11.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-panel-plugin-pulseaudio
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 Guido Berhoerster.
#
# All modifications and additions to the file contributed by third parties
@@ -16,26 +16,27 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define panel_version 4.11.0
%define plugin_name xfce4-pulseaudio-plugin
Name: xfce4-panel-plugin-pulseaudio
-Version: 0.2.0
+Version: 0.2.1
Release: 0
-License: GPL-2.0+
Summary: Pulseaudio Volume Control Plugin for the Xfce Panel
-Url:
http://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin
+License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Mixers
+Url:
http://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin
Source0:
http://archive.xfce.org/src/panel-plugins/%{plugin_name}/0.2/%{plugin_name}-%{version}.tar.bz2
BuildRequires: intltool
-BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 0.9.19
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.6
BuildRequires: pkgconfig(exo-1)
-BuildRequires: pkgconfig(libxfce4util-1.0)
-BuildRequires: pkgconfig(libxfce4ui-2)
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.6
+BuildRequires: pkgconfig(keybinder-3.0)
+BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 0.9.19
BuildRequires: pkgconfig(libxfce4panel-2.0)
+BuildRequires: pkgconfig(libxfce4ui-2)
+BuildRequires: pkgconfig(libxfce4util-1.0)
BuildRequires: pkgconfig(libxfconf-0)
-BuildRequires: pkgconfig(keybinder-3.0)
Requires: pulseaudio
Requires: xfce4-panel >= %{panel_version}
#Recommends: %{name}-lang = %{version}
@@ -77,3 +78,5 @@
%{_datadir}/icons/hicolor/*/apps/xfce4-pulseaudio-plugin.*
#%%files lang -f %{name}.lang
+
+%changelog
++++++ xfce4-pulseaudio-plugin-0.2.0.tar.bz2 ->
xfce4-pulseaudio-plugin-0.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-pulseaudio-plugin-0.2.0/ChangeLog
new/xfce4-pulseaudio-plugin-0.2.1/ChangeLog
--- old/xfce4-pulseaudio-plugin-0.2.0/ChangeLog 2015-03-05 22:12:41.000000000
+0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/ChangeLog 2015-03-09 01:06:14.000000000
+0100
@@ -1,4 +1,13 @@
# created with git log --pretty=format:"%ad %h %s %aN <%aE>" --no-merges
--date=short
+2015-03-08 bdc61d0 Fixed a crash in menu popup/popdown Andrzej
<[email protected]>
+2015-03-08 0d64623 ScaleMenuItem clean-up and extra asserts Andrzej
<[email protected]>
+2015-03-08 06f8b30 Removed unused IDO library dependency Andrzej
<[email protected]>
+2015-03-08 3d42561 Fixed slider click/drag coordinate errors in Gtk3.14
Andrzej <[email protected]>
+2015-03-05 42eeba8 Fix the scale's slider behaving weird on click-drag with
Gtk3.14 Simon Steinbeiss <[email protected]>
+2015-03-07 d84fbe6 Added extra checks Andrzej <[email protected]>
+2015-03-05 2657a11 Back to development Andrzej <[email protected]>
+2015-03-05 1be7d40 Updates for a release Andrzej <[email protected]>
+2015-03-05 3d75ce7 Updated POTFILES Andrzej <[email protected]>
2015-03-05 7870c56 Add size steps for the panel icon Simon Steinbeiss
<[email protected]>
2015-03-05 0e27817 Updated a list of authors Andrzej <[email protected]>
2015-03-05 cf836c8 Correctly calculate the icon's size Simon Steinbeiss
<[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-pulseaudio-plugin-0.2.0/Makefile.in
new/xfce4-pulseaudio-plugin-0.2.1/Makefile.in
--- old/xfce4-pulseaudio-plugin-0.2.0/Makefile.in 2015-03-05
22:13:06.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/Makefile.in 2015-03-09
01:07:19.000000000 +0100
@@ -234,10 +234,6 @@
GTK_LIBS = @GTK_LIBS@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
GTK_VERSION = @GTK_VERSION@
-IDO_CFLAGS = @IDO_CFLAGS@
-IDO_LIBS = @IDO_LIBS@
-IDO_REQUIRED_VERSION = @IDO_REQUIRED_VERSION@
-IDO_VERSION = @IDO_VERSION@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-pulseaudio-plugin-0.2.0/config.h.in
new/xfce4-pulseaudio-plugin-0.2.1/config.h.in
--- old/xfce4-pulseaudio-plugin-0.2.0/config.h.in 2015-03-05
22:13:25.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/config.h.in 2015-03-09
01:07:33.000000000 +0100
@@ -24,9 +24,6 @@
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
-/* Define if libido3-0.1 >= 13.10.0 present */
-#undef HAVE_IDO
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-pulseaudio-plugin-0.2.0/configure
new/xfce4-pulseaudio-plugin-0.2.1/configure
--- old/xfce4-pulseaudio-plugin-0.2.0/configure 2015-03-05 22:13:07.000000000
+0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/configure 2015-03-09 01:07:20.000000000
+0100
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac 7870c56.
+# From configure.ac bdc61d0.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfce4-pulseaudio-plugin 0.2.0.
+# Generated by GNU Autoconf 2.69 for xfce4-pulseaudio-plugin 0.2.1.
#
# Report bugs to <http://bugzilla.xfce.org/>.
#
@@ -594,8 +594,8 @@
# Identity of this package.
PACKAGE_NAME='xfce4-pulseaudio-plugin'
PACKAGE_TARNAME='xfce4-pulseaudio-plugin'
-PACKAGE_VERSION='0.2.0'
-PACKAGE_STRING='xfce4-pulseaudio-plugin 0.2.0'
+PACKAGE_VERSION='0.2.1'
+PACKAGE_STRING='xfce4-pulseaudio-plugin 0.2.1'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_URL=''
@@ -650,12 +650,6 @@
KEYBINDER_LIBS
KEYBINDER_CFLAGS
KEYBINDER_VERSION
-HAVE_IDO_FALSE
-HAVE_IDO_TRUE
-IDO_REQUIRED_VERSION
-IDO_LIBS
-IDO_CFLAGS
-IDO_VERSION
XFCONF_REQUIRED_VERSION
XFCONF_LIBS
XFCONF_CFLAGS
@@ -880,7 +874,6 @@
enable_libtool_lock
with_locales_dir
with_x
-enable_ido
enable_keybinder
enable_debug
with_mixer_command
@@ -1438,7 +1431,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xfce4-pulseaudio-plugin 0.2.0 to adapt to many kinds
of systems.
+\`configure' configures xfce4-pulseaudio-plugin 0.2.1 to adapt to many kinds
of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1514,7 +1507,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-pulseaudio-plugin
0.2.0:";;
+ short | recursive ) echo "Configuration of xfce4-pulseaudio-plugin
0.2.1:";;
esac
cat <<\_ACEOF
@@ -1537,9 +1530,6 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
- --enable-ido Enable checking for IDO library
- (default=[])
- --disable-ido Disable checking for IDO library
--enable-keybinder Enable checking for keybinder Support
(default=[])
--disable-keybinder Disable checking for keybinder Support
@@ -1644,7 +1634,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-pulseaudio-plugin configure 0.2.0
+xfce4-pulseaudio-plugin configure 0.2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2016,7 +2006,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-pulseaudio-plugin $as_me 0.2.0, which was
+It was created by xfce4-pulseaudio-plugin $as_me 0.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2994,7 +2984,7 @@
# Define the identity of the package.
PACKAGE='xfce4-pulseaudio-plugin'
- VERSION='0.2.0'
+ VERSION='0.2.1'
cat >>confdefs.h <<_ACEOF
@@ -15326,242 +15316,6 @@
- # Check whether --enable-ido was given.
-if test "${enable_ido+set}" = set; then :
- enableval=$enable_ido; xdt_cv_IDO_check=$enableval
-else
- xdt_cv_IDO_check=yes
-fi
-
-
- if test x"$xdt_cv_IDO_check" = x"yes"; then
- if $PKG_CONFIG --exists "libido3-0.1 >= 13.10.0" >/dev/null 2>&1; then
-
-
- # minimum supported version of pkg-config
- xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
-
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a
program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with
args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the
test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext"
>&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not
prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at
least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... "
>&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-fi
-
- if test x"$PKG_CONFIG" = x""; then
- echo
- echo "*** Your version of pkg-config is too old. You need atleast"
- echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can
download pkg-config"
- echo "*** from the freedesktop.org software repository at"
- echo "***"
- echo "*** http://www.freedesktop.org/software/pkgconfig"
- echo "***"
- exit 1;
- fi
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libido3-0.1 >=
13.10.0" >&5
-$as_echo_n "checking for libido3-0.1 >= 13.10.0... " >&6; }
- if $PKG_CONFIG "--atleast-version=13.10.0" "libido3-0.1" >/dev/null 2>&1;
then
- IDO_VERSION=`$PKG_CONFIG --modversion "libido3-0.1"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IDO_VERSION" >&5
-$as_echo "$IDO_VERSION" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking IDO_CFLAGS" >&5
-$as_echo_n "checking IDO_CFLAGS... " >&6; }
- IDO_CFLAGS=`$PKG_CONFIG --cflags "libido3-0.1"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IDO_CFLAGS" >&5
-$as_echo "$IDO_CFLAGS" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking IDO_LIBS" >&5
-$as_echo_n "checking IDO_LIBS... " >&6; }
- IDO_LIBS=`$PKG_CONFIG --libs "libido3-0.1"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IDO_LIBS" >&5
-$as_echo "$IDO_LIBS" >&6; }
-
- IDO_REQUIRED_VERSION=13.10.0
-
-
-
-
-
-
-
-
-$as_echo "#define HAVE_IDO 1" >>confdefs.h
-
- IDO_FOUND="yes"
-
- elif $PKG_CONFIG --exists "libido3-0.1" >/dev/null 2>&1; then
- xdt_cv_version=`$PKG_CONFIG --modversion "libido3-0.1"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but
$xdt_cv_version" >&5
-$as_echo "found, but $xdt_cv_version" >&6; }
-
-
- echo "*** The required package libido3-0.1 was found on your system,"
- echo "*** but the installed version ($xdt_cv_version) is too old."
- echo "*** Please upgrade libido3-0.1 to atleast version 13.10.0, or
adjust"
- echo "*** the PKG_CONFIG_PATH environment variable if you installed"
- echo "*** the new version of the package in a nonstandard prefix so"
- echo "*** pkg-config is able to find it."
- exit 1
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-
-
- echo "*** The required package libido3-0.1 was not found on your system."
- echo "*** Please install libido3-0.1 (atleast version 13.10.0) or adjust"
- echo "*** the PKG_CONFIG_PATH environment variable if you"
- echo "*** installed the package in a nonstandard prefix so that"
- echo "*** pkg-config is able to find it."
- exit 1
-
- fi
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package
libido3-0.1 >= 13.10.0" >&5
-$as_echo_n "checking for optional package libido3-0.1 >= 13.10.0... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package
libido3-0.1" >&5
-$as_echo_n "checking for optional package libido3-0.1... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
- fi
-
- if test x"$IDO_FOUND" = x"yes"; then
- HAVE_IDO_TRUE=
- HAVE_IDO_FALSE='#'
-else
- HAVE_IDO_TRUE='#'
- HAVE_IDO_FALSE=
-fi
-
-
-
-
-
-
# Check whether --enable-keybinder was given.
if test "${enable_keybinder+set}" = set; then :
enableval=$enable_keybinder; xdt_cv_KEYBINDER_check=$enableval
@@ -16194,10 +15948,6 @@
ac_config_commands="$ac_config_commands po/stamp-it"
-if test -z "${HAVE_IDO_TRUE}" && test -z "${HAVE_IDO_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_IDO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${HAVE_KEYBINDER_TRUE}" && test -z "${HAVE_KEYBINDER_FALSE}"; then
as_fn_error $? "conditional \"HAVE_KEYBINDER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16599,7 +16349,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfce4-pulseaudio-plugin $as_me 0.2.0, which was
+This file was extended by xfce4-pulseaudio-plugin $as_me 0.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16665,7 +16415,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xfce4-pulseaudio-plugin config.status 0.2.0
+xfce4-pulseaudio-plugin config.status 0.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -18469,6 +18219,5 @@
echo
echo "* Debug Support: $enable_debug"
echo "* Use keybinder: ${KEYBINDER_FOUND:-no}"
-echo "* Use IDO library: ${IDO_FOUND:-no}"
echo "* Default Mixer command: $DEFAULT_MIXER_COMMAND"
echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-pulseaudio-plugin-0.2.0/configure.ac
new/xfce4-pulseaudio-plugin-0.2.1/configure.ac
--- old/xfce4-pulseaudio-plugin-0.2.0/configure.ac 2015-03-05
22:13:00.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/configure.ac 2015-03-09
01:07:15.000000000 +0100
@@ -13,9 +13,9 @@
dnl ***************************
m4_define([pulseaudio_version_major], [0])
m4_define([pulseaudio_version_minor], [2])
-m4_define([pulseaudio_version_micro], [0])
+m4_define([pulseaudio_version_micro], [1])
m4_define([pulseaudio_version_nano], []) dnl leave this empty to have no nano
version
-m4_define([pulseaudio_version_build], [7870c56])
+m4_define([pulseaudio_version_build], [bdc61d0])
m4_define([pulseaudio_version_tag], [])
m4_define([pulseaudio_version],
[pulseaudio_version_major().pulseaudio_version_minor().pulseaudio_version_micro()ifelse(pulseaudio_version_nano(),
[], [], [.pulseaudio_version_nano()])ifelse(pulseaudio_version_tag(), [git],
[pulseaudio_version_tag()-pulseaudio_version_build()],
[pulseaudio_version_tag()])])
@@ -28,7 +28,7 @@
AC_PREREQ([2.50])
AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_TARGET()
-AC_REVISION([7870c56])
+AC_REVISION([bdc61d0])
dnl ***************************
dnl *** Initialize automake ***
@@ -89,11 +89,6 @@
XDT_CHECK_PACKAGE([LIBXFCE4PANEL],
[libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.11.0])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
-dnl ****************************
-dnl *** Optional IDO library ***
-dnl ****************************
-XDT_CHECK_OPTIONAL_PACKAGE([IDO], [libido3-0.1], [13.10.0], [ido], [IDO
library])
-
dnl **********************************
dnl *** Optional keybinder Support ***
dnl **********************************
@@ -148,6 +143,5 @@
echo
echo "* Debug Support: $enable_debug"
echo "* Use keybinder: ${KEYBINDER_FOUND:-no}"
-echo "* Use IDO library: ${IDO_FOUND:-no}"
echo "* Default Mixer command: $DEFAULT_MIXER_COMMAND"
echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-pulseaudio-plugin-0.2.0/icons/48x48/Makefile.in
new/xfce4-pulseaudio-plugin-0.2.1/icons/48x48/Makefile.in
--- old/xfce4-pulseaudio-plugin-0.2.0/icons/48x48/Makefile.in 2015-03-05
22:13:06.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/icons/48x48/Makefile.in 2015-03-09
01:07:19.000000000 +0100
@@ -183,10 +183,6 @@
GTK_LIBS = @GTK_LIBS@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
GTK_VERSION = @GTK_VERSION@
-IDO_CFLAGS = @IDO_CFLAGS@
-IDO_LIBS = @IDO_LIBS@
-IDO_REQUIRED_VERSION = @IDO_REQUIRED_VERSION@
-IDO_VERSION = @IDO_VERSION@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-pulseaudio-plugin-0.2.0/icons/Makefile.in
new/xfce4-pulseaudio-plugin-0.2.1/icons/Makefile.in
--- old/xfce4-pulseaudio-plugin-0.2.0/icons/Makefile.in 2015-03-05
22:13:06.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/icons/Makefile.in 2015-03-09
01:07:19.000000000 +0100
@@ -213,10 +213,6 @@
GTK_LIBS = @GTK_LIBS@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
GTK_VERSION = @GTK_VERSION@
-IDO_CFLAGS = @IDO_CFLAGS@
-IDO_LIBS = @IDO_LIBS@
-IDO_REQUIRED_VERSION = @IDO_REQUIRED_VERSION@
-IDO_VERSION = @IDO_VERSION@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-pulseaudio-plugin-0.2.0/icons/scalable/Makefile.in
new/xfce4-pulseaudio-plugin-0.2.1/icons/scalable/Makefile.in
--- old/xfce4-pulseaudio-plugin-0.2.0/icons/scalable/Makefile.in
2015-03-05 22:13:06.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/icons/scalable/Makefile.in
2015-03-09 01:07:19.000000000 +0100
@@ -183,10 +183,6 @@
GTK_LIBS = @GTK_LIBS@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
GTK_VERSION = @GTK_VERSION@
-IDO_CFLAGS = @IDO_CFLAGS@
-IDO_LIBS = @IDO_LIBS@
-IDO_REQUIRED_VERSION = @IDO_REQUIRED_VERSION@
-IDO_VERSION = @IDO_VERSION@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/Makefile.am
new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/Makefile.am
--- old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/Makefile.am 2015-03-04
00:58:37.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/Makefile.am 2015-03-08
04:52:24.000000000 +0100
@@ -47,7 +47,6 @@
$(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
$(XFCONF_CFLAGS) \
- $(IDO_CFLAGS) \
$(KEYBINDER_CFLAGS) \
$(PLATFORM_CFLAGS)
@@ -66,7 +65,6 @@
$(LIBXFCE4UI_LIBS) \
$(LIBXFCE4PANEL_LIBS) \
$(XFCONF_LIBS) \
- $(IDO_LIBS) \
$(KEYBINDER_LIBS) \
$(LIBM)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/Makefile.in
new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/Makefile.in
--- old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/Makefile.in 2015-03-05
22:13:06.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/Makefile.in 2015-03-09
01:07:20.000000000 +0100
@@ -128,8 +128,7 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__objects_1 =
am_libpulseaudio_plugin_la_OBJECTS = $(am__objects_1) \
libpulseaudio_plugin_la-pulseaudio-debug.lo \
@@ -254,10 +253,6 @@
GTK_LIBS = @GTK_LIBS@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
GTK_VERSION = @GTK_VERSION@
-IDO_CFLAGS = @IDO_CFLAGS@
-IDO_LIBS = @IDO_LIBS@
-IDO_REQUIRED_VERSION = @IDO_REQUIRED_VERSION@
-IDO_VERSION = @IDO_VERSION@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -462,7 +457,6 @@
$(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
$(XFCONF_CFLAGS) \
- $(IDO_CFLAGS) \
$(KEYBINDER_CFLAGS) \
$(PLATFORM_CFLAGS)
@@ -481,7 +475,6 @@
$(LIBXFCE4UI_LIBS) \
$(LIBXFCE4PANEL_LIBS) \
$(XFCONF_LIBS) \
- $(IDO_LIBS) \
$(KEYBINDER_LIBS) \
$(LIBM)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/pulseaudio-button.c
new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/pulseaudio-button.c
--- old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/pulseaudio-button.c
2015-03-05 22:01:41.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/pulseaudio-button.c
2015-03-09 00:55:47.000000000 +0100
@@ -139,7 +139,7 @@
/* Preload icons */
button->pixbuf_idx = 0;
button->pixbufs = g_new0 (GdkPixbuf*, G_N_ELEMENTS (icons)-1);
- g_signal_connect (G_OBJECT (button), "style_updated", G_CALLBACK
(pulseaudio_button_update_icons), button);
+ g_signal_connect (G_OBJECT (button), "style-updated", G_CALLBACK
(pulseaudio_button_update_icons), button);
/* Setup Gtk style */
css_provider = gtk_css_provider_new ();
@@ -163,8 +163,6 @@
g_object_set (G_OBJECT (button), "has-tooltip", TRUE, NULL);
- pulseaudio_button_update (button, TRUE);
-
//button->align_box = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
//gtk_container_add (GTK_CONTAINER (button), button->align_box);
//gtk_widget_show (button->align_box);
@@ -201,22 +199,25 @@
{
PulseaudioButton *button = PULSEAUDIO_BUTTON (widget);
- if(event->button == 1) /* left button */
+ if(event->button == 1 && button->menu == NULL) /* left button */
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
- if (button->menu == NULL)
- button->menu = pulseaudio_menu_new (button->volume, button->config,
widget);
+ button->menu = pulseaudio_menu_new (button->volume, button->config,
widget);
+ gtk_menu_attach_to_widget (GTK_MENU (button->menu), widget, NULL);
+
if (button->deactivate_id == 0)
+ {
button->deactivate_id = g_signal_connect_swapped
(GTK_MENU_SHELL (button->menu), "deactivate",
G_CALLBACK (pulseaudio_button_menu_deactivate), button);
+ }
gtk_menu_popup (GTK_MENU (button->menu),
NULL, NULL,
xfce_panel_plugin_position_menu, button->plugin,
//NULL, NULL,
- 0,
- gtk_get_current_event_time ());
+ 1,
+ event->time);
return TRUE;
}
@@ -260,6 +261,13 @@
button->deactivate_id = 0;
}
+ if (button->menu != NULL)
+ {
+ gtk_menu_detach (GTK_MENU (button->menu));
+ gtk_menu_popdown (GTK_MENU (button->menu));
+ button->menu = NULL;
+ }
+
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
}
@@ -299,6 +307,7 @@
gchar *tip_text;
g_return_if_fail (IS_PULSEAUDIO_BUTTON (button));
+ g_return_if_fail (IS_PULSEAUDIO_VOLUME (button->volume));
volume = pulseaudio_volume_get_volume (button->volume);
muted = pulseaudio_volume_get_muted (button->volume);
@@ -338,6 +347,7 @@
gint width;
gint xthickness;
gint ythickness;
+ gint size_old;
g_return_if_fail (IS_PULSEAUDIO_BUTTON (button));
g_return_if_fail (size > 0);
@@ -352,6 +362,7 @@
width = size - 2* MAX (xthickness, ythickness);
/* Since symbolic icons are usually only provided in 16px we
* try to be clever and use size steps */
+ size_old = button->icon_size;
if (width <= 21)
button->icon_size = 16;
else if (width >=22 && width <= 29)
@@ -362,7 +373,8 @@
button->icon_size = width;
gtk_widget_set_size_request (GTK_WIDGET (button), size, size);
- pulseaudio_button_update_icons (button);
+ if (button->icon_size != size_old)
+ pulseaudio_button_update_icons (button);
}
@@ -398,6 +410,8 @@
g_signal_connect_swapped (G_OBJECT (button->volume), "volume-changed",
G_CALLBACK (pulseaudio_button_volume_changed),
button);
+ pulseaudio_button_update (button, TRUE);
+
return GTK_WIDGET (button);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/pulseaudio-menu.c
new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/pulseaudio-menu.c
--- old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/pulseaudio-menu.c
2015-03-05 09:03:45.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/pulseaudio-menu.c
2015-03-06 22:07:16.000000000 +0100
@@ -175,6 +175,7 @@
PulseaudioVolume *volume)
{
g_return_if_fail (IS_PULSEAUDIO_MENU (menu));
+ g_return_if_fail (IS_PULSEAUDIO_VOLUME (volume));
g_signal_handlers_block_by_func (G_OBJECT (menu->mute_output_item),
pulseaudio_menu_mute_output_item_toggled,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/scalemenuitem.c
new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/scalemenuitem.c
--- old/xfce4-pulseaudio-plugin-0.2.0/panel-plugin/scalemenuitem.c
2015-03-05 21:59:30.000000000 +0100
+++ new/xfce4-pulseaudio-plugin-0.2.1/panel-plugin/scalemenuitem.c
2015-03-09 00:21:41.000000000 +0100
@@ -89,7 +89,7 @@
scale_menu_item_scale_value_changed (GtkRange *range,
gpointer user_data)
{
- ScaleMenuItem *self = user_data;
+ ScaleMenuItem *self = SCALE_MENU_ITEM (user_data);
ScaleMenuItemPrivate *priv = GET_PRIVATE (self);
/* The signal is not sent when it was set through
@@ -165,8 +165,13 @@
static void
remove_children (GtkContainer *container)
{
- GList * children = gtk_container_get_children (container);
+ GList * children;
GList * l;
+
+ g_return_if_fail (GTK_IS_CONTAINER (container));
+
+ children = gtk_container_get_children (container);
+
for (l=children; l!=NULL; l=l->next)
gtk_container_remove (container, l->data);
g_list_free (children);
@@ -175,9 +180,15 @@
static void
update_packing (ScaleMenuItem *self)
{
- ScaleMenuItemPrivate *priv = GET_PRIVATE (self);
- GtkBox *hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0));
- GtkBox *vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
+ ScaleMenuItemPrivate *priv;
+ GtkBox *hbox;
+ GtkBox *vbox;
+
+ g_return_if_fail (IS_SCALE_MENU_ITEM (self));
+
+ priv = GET_PRIVATE (self);
+ hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0));
+ vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
TRACE("entering");
@@ -238,40 +249,32 @@
{
}
-
-static void
-scale_menu_item_get_scale_allocation (ScaleMenuItem *menuitem,
- GtkAllocation *allocation)
-{
- ScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
- GtkAllocation parent_allocation;
-
- gtk_widget_get_allocation (GTK_WIDGET (menuitem), &parent_allocation);
- gtk_widget_get_allocation (priv->scale, allocation);
-
- allocation->x -= parent_allocation.x;
- allocation->y -= parent_allocation.y;
-}
-
static gboolean
scale_menu_item_button_press_event (GtkWidget *menuitem,
GdkEventButton *event)
{
- ScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
- GtkAllocation alloc;
+ ScaleMenuItemPrivate *priv;
+ GtkAllocation alloc;
+ gint x, y;
TRACE("entering");
- scale_menu_item_get_scale_allocation (SCALE_MENU_ITEM (menuitem), &alloc);
+ g_return_val_if_fail (IS_SCALE_MENU_ITEM (menuitem), FALSE);
- event->x -= alloc.x;
- event->y -= alloc.y;
+ priv = GET_PRIVATE (menuitem);
- event->x_root -= alloc.x;
- event->y_root -= alloc.y;
+ gtk_widget_get_allocation (priv->scale, &alloc);
+ gtk_widget_translate_coordinates (menuitem, priv->scale, event->x, event->y,
&x, &y);
- gtk_widget_event (priv->scale,
- ((GdkEvent *)(void*)(event)));
+ if (x > 0 && x < alloc.width && y > 0 && y < alloc.height)
+ {
+#if !(GTK_CHECK_VERSION (3, 14, 0))
+ /* event coordinates are supposed to refer to GdkWindow but for some
reason in Gtk+-3.12(?) they refer to the widget */
+ event->x = (gdouble) x;
+ event->y = (gdouble) y;
+#endif
+ gtk_widget_event (priv->scale, (GdkEvent*) event);
+ }
if (!priv->grabbed)
{
@@ -283,13 +286,23 @@
}
static gboolean
-scale_menu_item_button_release_event (GtkWidget *menuitem,
+scale_menu_item_button_release_event (GtkWidget *menuitem,
GdkEventButton *event)
{
- ScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
+ ScaleMenuItemPrivate *priv;
+ gint x, y;
TRACE("entering");
+ g_return_val_if_fail (IS_SCALE_MENU_ITEM (menuitem), FALSE);
+
+ priv = GET_PRIVATE (menuitem);
+
+#if !(GTK_CHECK_VERSION (3, 14, 0))
+ gtk_widget_translate_coordinates (menuitem, priv->scale, event->x, event->y,
&x, &y);
+ event->x = (gdouble) x;
+ event->y = (gdouble) y;
+#endif
gtk_widget_event (priv->scale, (GdkEvent*)event);
if (priv->grabbed)
@@ -306,39 +319,55 @@
scale_menu_item_motion_notify_event (GtkWidget *menuitem,
GdkEventMotion *event)
{
- ScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
- GtkWidget *scale = priv->scale;
- GtkAllocation alloc;
+ ScaleMenuItemPrivate *priv;
+ GtkWidget *scale;
+ GtkAllocation alloc;
+ gint x, y;
- scale_menu_item_get_scale_allocation (SCALE_MENU_ITEM (menuitem), &alloc);
+ g_return_val_if_fail (IS_SCALE_MENU_ITEM (menuitem), FALSE);
- event->x -= alloc.x;
- event->y -= alloc.y;
+ priv = GET_PRIVATE (menuitem);
+ scale = priv->scale;
- event->x_root -= alloc.x;
- event->y_root -= alloc.y;
+ gtk_widget_get_allocation (priv->scale, &alloc);
+ gtk_widget_translate_coordinates (menuitem, priv->scale, event->x, event->y,
&x, &y);
- gtk_widget_event (scale, (GdkEvent*)event);
+ if (x > 0 && x < alloc.width && y > 0 && y < alloc.height)
+ {
+#if !(GTK_CHECK_VERSION (3, 14, 0))
+ event->x = (gdouble) x;
+ event->y = (gdouble) y;
+#endif
+ gtk_widget_event (scale, (GdkEvent*) event);
+ }
return TRUE;
}
static void
scale_menu_item_grab_notify (GtkWidget *menuitem,
- gboolean was_grabbed)
+ gboolean was_grabbed)
{
- ScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
+ ScaleMenuItemPrivate *priv;
TRACE("entering");
+ g_return_if_fail (IS_SCALE_MENU_ITEM (menuitem));
+
+ priv = GET_PRIVATE (menuitem);
+
GTK_WIDGET_GET_CLASS (priv->scale)->grab_notify (priv->scale, was_grabbed);
}
static gboolean
-scale_menu_item_grab_broken (GtkWidget *menuitem,
+scale_menu_item_grab_broken (GtkWidget *menuitem,
GdkEventGrabBroken *event)
{
- ScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
+ ScaleMenuItemPrivate *priv;
+
+ g_return_val_if_fail (IS_SCALE_MENU_ITEM (menuitem), FALSE);
+
+ priv = GET_PRIVATE (menuitem);
TRACE("entering");
@@ -348,10 +377,15 @@
}
static void
-menu_hidden (GtkWidget *menu,
+menu_hidden (GtkWidget *menu,
ScaleMenuItem *scale)
{
- ScaleMenuItemPrivate *priv = GET_PRIVATE (scale);
+ ScaleMenuItemPrivate *priv;
+
+ g_return_if_fail (IS_SCALE_MENU_ITEM (scale));
+ g_return_if_fail (GTK_IS_MENU (menu));
+
+ priv = GET_PRIVATE (scale);
if (priv->grabbed)
{
@@ -367,14 +401,16 @@
{
GtkWidget *parent;
- if (previous_parent)
+ g_return_if_fail (IS_SCALE_MENU_ITEM (item));
+
+ if (previous_parent != NULL)
{
g_signal_handlers_disconnect_by_func (previous_parent, menu_hidden,
item);
}
parent = gtk_widget_get_parent (item);
- if (parent)
+ if (parent != NULL)
{
g_signal_connect (parent, "hide", G_CALLBACK (menu_hidden), item);
}
@@ -387,7 +423,7 @@
gdouble max,
gdouble step)
{
- ScaleMenuItem *scale_item;
+ ScaleMenuItem *scale_item;
ScaleMenuItemPrivate *priv;
TRACE("entering");
@@ -483,7 +519,7 @@
**/
void
scale_menu_item_set_description_label (ScaleMenuItem *menuitem,
- const gchar *label)
+ const gchar *label)
{
ScaleMenuItemPrivate *priv;
@@ -527,7 +563,7 @@
**/
void
scale_menu_item_set_percentage_label (ScaleMenuItem *menuitem,
- const gchar *label)
+ const gchar *label)
{
ScaleMenuItemPrivate *priv;
@@ -569,7 +605,11 @@
scale_menu_item_set_value (ScaleMenuItem *item,
gdouble value)
{
- ScaleMenuItemPrivate *priv = GET_PRIVATE (item);
+ ScaleMenuItemPrivate *priv;
+
+ g_return_if_fail (IS_SCALE_MENU_ITEM (item));
+
+ priv = GET_PRIVATE (item);
/* set ignore_value_changed to signify to the scale menu item that it
* should not emit its own value-changed signal, as that should only
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]