Hello community, here is the log from the commit of package libwnck for openSUSE:Factory checked in at 2013-08-30 16:33:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwnck (Old) and /work/SRC/openSUSE:Factory/.libwnck.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwnck" Changes: -------- --- /work/SRC/openSUSE:Factory/libwnck/libwnck.changes 2013-08-10 11:41:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libwnck.new/libwnck.changes 2013-08-30 16:33:29.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Aug 20 15:49:10 UTC 2013 - [email protected] + +- Update to version 3.4.7: + + Add wnck_set_default_icon_size and + wnck_set_default_mini_icon_size functions to allow clients to + define the size of the icons to be used for windows and + applications. + +------------------------------------------------------------------- Old: ---- libwnck-3.4.6.tar.xz New: ---- libwnck-3.4.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwnck.spec ++++++ --- /var/tmp/diff_new_pack.6IwvWU/_old 2013-08-30 16:33:30.000000000 +0200 +++ /var/tmp/diff_new_pack.6IwvWU/_new 2013-08-30 16:33:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: libwnck -Version: 3.4.6 +Version: 3.4.7 Release: 0 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: #%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libwnck-1) ++++++ libwnck-3.4.6.tar.xz -> libwnck-3.4.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/ChangeLog new/libwnck-3.4.7/ChangeLog --- old/libwnck-3.4.6/ChangeLog 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/ChangeLog 2013-08-20 17:12:24.000000000 +0200 @@ -1,5 +1,105 @@ # Generated by Makefile. Do not edit. +commit 2743beb84474425ffdd19a5a2230dd58f898b319 +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 20 17:10:52 2013 +0200 + + Release: 3.4.7 + +M NEWS + +commit 9e16bba626e52c96e66a9ae51fc130ea3c62a263 +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 20 16:56:48 2013 +0200 + + WnckUtil: add icons section to docs + +M doc/libwnck-docs.sgml +M doc/libwnck-sections.txt +M libwnck/util.c + +commit 63e4670d37a24d2bc0b7b4db044788e780fff73a +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 20 16:29:42 2013 +0200 + + TestTasklist, TestWnck: added cmdline options to set the icons size + +M libwnck/private.h +M libwnck/test-tasklist.c +M libwnck/test-wnck.c + +commit c1f6cab67aa84196351a257afc068ae25019b03b +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 20 16:29:06 2013 +0200 + + WnckUtil: make applications and windows to reload icons if size has changed + +M libwnck/util.c + +commit 1cf648d3fd83d1c15eb27509c58ade29a5320203 +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 20 16:21:01 2013 +0200 + + WnckWindow: Add private function to load an icon and emit signal + +M libwnck/private.h +M libwnck/window.c + +commit 25f4fb1c6b073569e4561427ae737f0b6fa9da63 +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 20 16:20:27 2013 +0200 + + WnckApplication: Add private function to load an icon and emit signal + +M libwnck/application.c +M libwnck/private.h + +commit 7b9f3a31edc12fdb8c30711ed2615031bf0b0135 +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 20 13:19:38 2013 +0200 + + Utils: allow to set the default icon sizes and use these values + +M doc/libwnck-sections.txt +M libwnck/application.c +M libwnck/class-group.c +M libwnck/private.h +M libwnck/tasklist.c +M libwnck/util.c +M libwnck/util.h +M libwnck/window.c +M libwnck/xutils.c + +commit 2142cd2c7714d235975cf1f1b05459becfcdc4bd +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 20 12:47:56 2013 +0200 + + private: just use DEFAULT_{ICON,MINI_ICON}_SIZE + +M doc/libwnck-sections.txt +M libwnck/application.c +M libwnck/class-group.c +M libwnck/private.h +M libwnck/tasklist.c +M libwnck/window.c +M libwnck/xutils.c + +commit f5855b6e6388999580ddce4a00755eea5438b017 +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 6 13:10:38 2013 +0200 + + Release: post-release bump to 3.4.7 + +M configure.ac + +commit a99fd722aab40b6520da50bcbc800c452e330748 +Author: Marco Trevisan (Treviño) <[email protected]> +Date: Tue Aug 6 13:10:03 2013 +0200 + + Release: 3.4.6 + +M NEWS + commit 9c782b18f5dfb1c5f0b61b9fa950944d09c69b68 Author: Marco Trevisan (Treviño) <[email protected]> Date: Tue Aug 6 13:01:53 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/Makefile.in new/libwnck-3.4.7/Makefile.in --- old/libwnck-3.4.6/Makefile.in 2013-08-06 13:06:13.000000000 +0200 +++ new/libwnck-3.4.7/Makefile.in 2013-08-20 16:46:15.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/NEWS new/libwnck-3.4.7/NEWS --- old/libwnck-3.4.6/NEWS 2013-08-06 12:50:26.000000000 +0200 +++ new/libwnck-3.4.7/NEWS 2013-08-20 16:35:43.000000000 +0200 @@ -1,4 +1,14 @@ ============= +Version 3.4.7 +============= + + Features + + * Add wnck_set_default_icon_size and wnck_set_default_mini_icon_size functions + to allow clients to define the size of the icons to be used for windows + and applications. + +============= Version 3.4.6 ============= @@ -12,7 +22,7 @@ * ClassGroup: fix class signal signature (Marco Trevisan) * Get rid of the deprecated code in TaskList, Selector and Pager (Marco Trevisan) - + Translators * Andika Triwidada (id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/aclocal.m4 new/libwnck-3.4.7/aclocal.m4 --- old/libwnck-3.4.6/aclocal.m4 2013-08-06 13:06:11.000000000 +0200 +++ new/libwnck-3.4.7/aclocal.m4 2013-08-20 16:46:14.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.2 -*- Autoconf -*- +# generated automatically by aclocal 1.13.3 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -983,7 +983,7 @@ [am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.2], [], +m4_if([$1], [1.13.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -999,7 +999,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.2])dnl +[AM_AUTOMAKE_VERSION([1.13.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/configure new/libwnck-3.4.7/configure --- old/libwnck-3.4.6/configure 2013-08-06 13:06:12.000000000 +0200 +++ new/libwnck-3.4.7/configure 2013-08-20 16:46:14.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libwnck 3.4.6. +# Generated by GNU Autoconf 2.69 for libwnck 3.4.7. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libwnck>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='libwnck' PACKAGE_TARNAME='libwnck' -PACKAGE_VERSION='3.4.6' -PACKAGE_STRING='libwnck 3.4.6' +PACKAGE_VERSION='3.4.7' +PACKAGE_STRING='libwnck 3.4.7' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libwnck' PACKAGE_URL='' @@ -1443,7 +1443,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 libwnck 3.4.6 to adapt to many kinds of systems. +\`configure' configures libwnck 3.4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1517,7 +1517,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libwnck 3.4.6:";; + short | recursive ) echo "Configuration of libwnck 3.4.7:";; esac cat <<\_ACEOF @@ -1661,7 +1661,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libwnck configure 3.4.6 +libwnck configure 3.4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2030,7 +2030,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libwnck $as_me 3.4.6, which was +It was created by libwnck $as_me 3.4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2897,7 +2897,7 @@ # Define the identity of the package. PACKAGE='libwnck' - VERSION='3.4.6' + VERSION='3.4.7' cat >>confdefs.h <<_ACEOF @@ -3155,7 +3155,7 @@ WNCK_MAJOR_VERSION=3 WNCK_MINOR_VERSION=4 -WNCK_MICRO_VERSION=6 +WNCK_MICRO_VERSION=7 @@ -16747,7 +16747,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libwnck $as_me 3.4.6, which was +This file was extended by libwnck $as_me 3.4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16813,7 +16813,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libwnck config.status 3.4.6 +libwnck config.status 3.4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/configure.ac new/libwnck-3.4.7/configure.ac --- old/libwnck-3.4.6/configure.ac 2013-08-06 13:04:35.000000000 +0200 +++ new/libwnck-3.4.7/configure.ac 2013-08-06 13:10:10.000000000 +0200 @@ -2,7 +2,7 @@ m4_define([wnck_major_version], [3]) m4_define([wnck_minor_version], [4]) -m4_define([wnck_micro_version], [6]) +m4_define([wnck_micro_version], [7]) m4_define([wnck_version], [wnck_major_version.wnck_minor_version.wnck_micro_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/Makefile.in new/libwnck-3.4.7/doc/Makefile.in --- old/libwnck-3.4.6/doc/Makefile.in 2013-08-06 13:06:13.000000000 +0200 +++ new/libwnck-3.4.7/doc/Makefile.in 2013-08-20 16:46:15.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. Files old/libwnck-3.4.6/doc/html/home.png and new/libwnck-3.4.7/doc/html/home.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/html/index.html new/libwnck-3.4.7/doc/html/index.html --- old/libwnck-3.4.6/doc/html/index.html 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/doc/html/index.html 2013-08-20 17:12:24.000000000 +0200 @@ -61,6 +61,9 @@ <span class="refentrytitle"><a href="libwnck-Resource-Usage-of-X-Clients.html">Resource Usage of X Clients</a></span><span class="refpurpose"> — reading resource usage of X clients.</span> </dt> <dt> +<span class="refentrytitle"><a href="libwnck-Icons-Functions.html">Icon Files</a></span><span class="refpurpose"> — icons related functions.</span> +</dt> +<dt> <span class="refentrytitle"><a href="libwnck-Miscellaneous-Functions.html">Miscellaneous Functions</a></span><span class="refpurpose"> — other additional features.</span> </dt> <dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/html/index.sgml new/libwnck-3.4.7/doc/html/index.sgml --- old/libwnck-3.4.6/doc/html/index.sgml 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/doc/html/index.sgml 2013-08-20 17:12:24.000000000 +0200 @@ -358,6 +358,15 @@ <ANCHOR id="wnck-xid-read-resource-usage" href="libwnck/libwnck-Resource-Usage-of-X-Clients.html#wnck-xid-read-resource-usage"> <ANCHOR id="wnck-pid-read-resource-usage" href="libwnck/libwnck-Resource-Usage-of-X-Clients.html#wnck-pid-read-resource-usage"> <ANCHOR id="libwnck-Resource-Usage-of-X-Clients.see-also" href="libwnck/libwnck-Resource-Usage-of-X-Clients.html#libwnck-Resource-Usage-of-X-Clients.see-also"> +<ANCHOR id="libwnck-Icons-Functions" href="libwnck/libwnck-Icons-Functions.html"> +<ANCHOR id="libwnck-Icons-Functions.stability-level" href="libwnck/libwnck-Icons-Functions.html#libwnck-Icons-Functions.stability-level"> +<ANCHOR id="libwnck-Icons-Functions.synopsis" href="libwnck/libwnck-Icons-Functions.html#libwnck-Icons-Functions.synopsis"> +<ANCHOR id="libwnck-Icons-Functions.description" href="libwnck/libwnck-Icons-Functions.html#libwnck-Icons-Functions.description"> +<ANCHOR id="libwnck-Icons-Functions.details" href="libwnck/libwnck-Icons-Functions.html#libwnck-Icons-Functions.details"> +<ANCHOR id="WNCK-DEFAULT-ICON-SIZE:CAPS" href="libwnck/libwnck-Icons-Functions.html#WNCK-DEFAULT-ICON-SIZE:CAPS"> +<ANCHOR id="WNCK-DEFAULT-MINI-ICON-SIZE:CAPS" href="libwnck/libwnck-Icons-Functions.html#WNCK-DEFAULT-MINI-ICON-SIZE:CAPS"> +<ANCHOR id="wnck-set-default-icon-size" href="libwnck/libwnck-Icons-Functions.html#wnck-set-default-icon-size"> +<ANCHOR id="wnck-set-default-mini-icon-size" href="libwnck/libwnck-Icons-Functions.html#wnck-set-default-mini-icon-size"> <ANCHOR id="libwnck-Miscellaneous-Functions" href="libwnck/libwnck-Miscellaneous-Functions.html"> <ANCHOR id="libwnck-Miscellaneous-Functions.stability-level" href="libwnck/libwnck-Miscellaneous-Functions.html#libwnck-Miscellaneous-Functions.stability-level"> <ANCHOR id="libwnck-Miscellaneous-Functions.synopsis" href="libwnck/libwnck-Miscellaneous-Functions.html#libwnck-Miscellaneous-Functions.synopsis"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/html/ix01.html new/libwnck-3.4.7/doc/html/ix01.html --- old/libwnck-3.4.6/doc/html/ix01.html 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/doc/html/ix01.html 2013-08-20 17:12:24.000000000 +0200 @@ -173,6 +173,10 @@ </dt> <dt>wnck_class_group_get_windows, <a class="indexterm" href="WnckClassGroup.html#wnck-class-group-get-windows">wnck_class_group_get_windows ()</a> </dt> +<dt>WNCK_DEFAULT_ICON_SIZE, <a class="indexterm" href="libwnck-Icons-Functions.html#WNCK-DEFAULT-ICON-SIZE:CAPS">WNCK_DEFAULT_ICON_SIZE</a> +</dt> +<dt>WNCK_DEFAULT_MINI_ICON_SIZE, <a class="indexterm" href="libwnck-Icons-Functions.html#WNCK-DEFAULT-MINI-ICON-SIZE:CAPS">WNCK_DEFAULT_MINI_ICON_SIZE</a> +</dt> <dt>WNCK_MAJOR_VERSION, <a class="indexterm" href="libwnck-Version-Information.html#WNCK-MAJOR-VERSION:CAPS">WNCK_MAJOR_VERSION</a> </dt> <dt>WNCK_MICRO_VERSION, <a class="indexterm" href="libwnck-Version-Information.html#WNCK-MICRO-VERSION:CAPS">WNCK_MICRO_VERSION</a> @@ -249,6 +253,10 @@ </dt> <dt>wnck_set_client_type, <a class="indexterm" href="libwnck-Miscellaneous-Functions.html#wnck-set-client-type">wnck_set_client_type ()</a> </dt> +<dt>wnck_set_default_icon_size, <a class="indexterm" href="libwnck-Icons-Functions.html#wnck-set-default-icon-size">wnck_set_default_icon_size ()</a> +</dt> +<dt>wnck_set_default_mini_icon_size, <a class="indexterm" href="libwnck-Icons-Functions.html#wnck-set-default-mini-icon-size">wnck_set_default_mini_icon_size ()</a> +</dt> <dt>wnck_shutdown, <a class="indexterm" href="libwnck-Miscellaneous-Functions.html#wnck-shutdown">wnck_shutdown ()</a> </dt> <dt>wnck_tasklist_get_size_hint_list, <a class="indexterm" href="WnckTasklist.html#wnck-tasklist-get-size-hint-list">wnck_tasklist_get_size_hint_list ()</a> Files old/libwnck-3.4.6/doc/html/left.png and new/libwnck-3.4.7/doc/html/left.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/html/libwnck-Icons-Functions.html new/libwnck-3.4.7/doc/html/libwnck-Icons-Functions.html --- old/libwnck-3.4.6/doc/html/libwnck-Icons-Functions.html 1970-01-01 01:00:00.000000000 +0100 +++ new/libwnck-3.4.7/doc/html/libwnck-Icons-Functions.html 2013-08-20 17:12:24.000000000 +0200 @@ -0,0 +1,123 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Icon Files</title> +<meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> +<link rel="home" href="index.html" title="Libwnck Reference Manual"> +<link rel="up" href="utils.html" title="Part V. Libwnck Utilities"> +<link rel="prev" href="libwnck-Resource-Usage-of-X-Clients.html" title="Resource Usage of X Clients"> +<link rel="next" href="libwnck-Miscellaneous-Functions.html" title="Miscellaneous Functions"> +<meta name="generator" content="GTK-Doc V1.19 (XML mode)"> +<link rel="stylesheet" href="style.css" type="text/css"> +</head> +<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> +<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> +<tr valign="middle"> +<td><a accesskey="p" href="libwnck-Resource-Usage-of-X-Clients.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td><a accesskey="u" href="utils.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> +<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> +<th width="100%" align="center">Libwnck Reference Manual</th> +<td><a accesskey="n" href="libwnck-Miscellaneous-Functions.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> +</tr> +<tr><td colspan="5" class="shortcuts"> +<a href="#libwnck-Icons-Functions.synopsis" class="shortcut">Top</a> + | + <a href="#libwnck-Icons-Functions.description" class="shortcut">Description</a> +</td></tr> +</table> +<div class="refentry"> +<a name="libwnck-Icons-Functions"></a><div class="titlepage"></div> +<div class="refnamediv"><table width="100%"><tr> +<td valign="top"> +<h2><span class="refentrytitle"><a name="libwnck-Icons-Functions.top_of_page"></a>Icon Files</span></h2> +<p>Icon Files — icons related functions.</p> +</td> +<td valign="top" align="right"></td> +</tr></table></div> +<div class="refsect1"> +<a name="libwnck-Icons-Functions.stability-level"></a><h2>Stability Level</h2> +Unstable, unless otherwise indicated +</div> +<div class="refsynopsisdiv"> +<a name="libwnck-Icons-Functions.synopsis"></a><h2>Synopsis</h2> +<pre class="synopsis"> +#include <libwnck/libwnck.h> + +#define <a class="link" href="libwnck-Icons-Functions.html#WNCK-DEFAULT-ICON-SIZE:CAPS" title="WNCK_DEFAULT_ICON_SIZE">WNCK_DEFAULT_ICON_SIZE</a> +#define <a class="link" href="libwnck-Icons-Functions.html#WNCK-DEFAULT-MINI-ICON-SIZE:CAPS" title="WNCK_DEFAULT_MINI_ICON_SIZE">WNCK_DEFAULT_MINI_ICON_SIZE</a> +<span class="returnvalue">void</span> <a class="link" href="libwnck-Icons-Functions.html#wnck-set-default-icon-size" title="wnck_set_default_icon_size ()">wnck_set_default_icon_size</a> (<em class="parameter"><code><span class="type">gsize</span> size</code></em>); +<span class="returnvalue">void</span> <a class="link" href="libwnck-Icons-Functions.html#wnck-set-default-mini-icon-size" title="wnck_set_default_mini_icon_size ()">wnck_set_default_mini_icon_size</a> (<em class="parameter"><code><span class="type">gsize</span> size</code></em>); +</pre> +</div> +<div class="refsect1"> +<a name="libwnck-Icons-Functions.description"></a><h2>Description</h2> +<p> +These functions are utility functions to manage icons for <a class="link" href="WnckWindow.html" title="WnckWindow"><span class="type">WnckWindow</span></a> and +<a class="link" href="WnckApplication.html" title="WnckApplication"><span class="type">WnckApplication</span></a>. +</p> +</div> +<div class="refsect1"> +<a name="libwnck-Icons-Functions.details"></a><h2>Details</h2> +<div class="refsect2"> +<a name="WNCK-DEFAULT-ICON-SIZE:CAPS"></a><h3>WNCK_DEFAULT_ICON_SIZE</h3> +<pre class="programlisting">#define WNCK_DEFAULT_ICON_SIZE 32 +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="WNCK-DEFAULT-MINI-ICON-SIZE:CAPS"></a><h3>WNCK_DEFAULT_MINI_ICON_SIZE</h3> +<pre class="programlisting">#define WNCK_DEFAULT_MINI_ICON_SIZE 16 +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="wnck-set-default-icon-size"></a><h3>wnck_set_default_icon_size ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> wnck_set_default_icon_size (<em class="parameter"><code><span class="type">gsize</span> size</code></em>);</pre> +<p> +The default main icon size is <a class="link" href="libwnck-Icons-Functions.html#WNCK-DEFAULT-ICON-SIZE:CAPS" title="WNCK_DEFAULT_ICON_SIZE"><code class="literal">WNCK_DEFAULT_ICON_SIZE</code></a>. This function allows +to change this value. +</p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody><tr> +<td><p><span class="term"><em class="parameter"><code>size</code></em> :</span></p></td> +<td>the default size for windows and application standard icons.</td> +</tr></tbody> +</table></div> +<p class="since">Since 2.4.6</p> +</div> +<hr> +<div class="refsect2"> +<a name="wnck-set-default-mini-icon-size"></a><h3>wnck_set_default_mini_icon_size ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> wnck_set_default_mini_icon_size (<em class="parameter"><code><span class="type">gsize</span> size</code></em>);</pre> +<p> +The default main icon size is <a class="link" href="libwnck-Icons-Functions.html#WNCK-DEFAULT-MINI-ICON-SIZE:CAPS" title="WNCK_DEFAULT_MINI_ICON_SIZE"><code class="literal">WNCK_DEFAULT_MINI_ICON_SIZE</code></a>. This function +allows to change this value. +</p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody><tr> +<td><p><span class="term"><em class="parameter"><code>size</code></em> :</span></p></td> +<td>the default size for windows and application mini icons.</td> +</tr></tbody> +</table></div> +<p class="since">Since 2.4.6</p> +</div> +</div> +</div> +<div class="footer"> +<hr> + Generated by GTK-Doc V1.19</div> +</body> +</html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/html/libwnck-Miscellaneous-Functions.html new/libwnck-3.4.7/doc/html/libwnck-Miscellaneous-Functions.html --- old/libwnck-3.4.6/doc/html/libwnck-Miscellaneous-Functions.html 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/doc/html/libwnck-Miscellaneous-Functions.html 2013-08-20 17:12:24.000000000 +0200 @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> <link rel="home" href="index.html" title="Libwnck Reference Manual"> <link rel="up" href="utils.html" title="Part V. Libwnck Utilities"> -<link rel="prev" href="libwnck-Resource-Usage-of-X-Clients.html" title="Resource Usage of X Clients"> +<link rel="prev" href="libwnck-Icons-Functions.html" title="Icon Files"> <link rel="next" href="libwnck-Version-Information.html" title="Version Information"> <meta name="generator" content="GTK-Doc V1.19 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> @@ -14,7 +14,7 @@ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> <tr valign="middle"> -<td><a accesskey="p" href="libwnck-Resource-Usage-of-X-Clients.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td><a accesskey="p" href="libwnck-Icons-Functions.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> <td><a accesskey="u" href="utils.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">Libwnck Reference Manual</th> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/html/libwnck-Resource-Usage-of-X-Clients.html new/libwnck-3.4.7/doc/html/libwnck-Resource-Usage-of-X-Clients.html --- old/libwnck-3.4.6/doc/html/libwnck-Resource-Usage-of-X-Clients.html 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/doc/html/libwnck-Resource-Usage-of-X-Clients.html 2013-08-20 17:12:24.000000000 +0200 @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="Libwnck Reference Manual"> <link rel="up" href="utils.html" title="Part V. Libwnck Utilities"> <link rel="prev" href="utils.html" title="Part V. Libwnck Utilities"> -<link rel="next" href="libwnck-Miscellaneous-Functions.html" title="Miscellaneous Functions"> +<link rel="next" href="libwnck-Icons-Functions.html" title="Icon Files"> <meta name="generator" content="GTK-Doc V1.19 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> @@ -18,7 +18,7 @@ <td><a accesskey="u" href="utils.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">Libwnck Reference Manual</th> -<td><a accesskey="n" href="libwnck-Miscellaneous-Functions.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> +<td><a accesskey="n" href="libwnck-Icons-Functions.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> <tr><td colspan="5" class="shortcuts"> <a href="#libwnck-Resource-Usage-of-X-Clients.synopsis" class="shortcut">Top</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/html/libwnck-Version-Information.html new/libwnck-3.4.7/doc/html/libwnck-Version-Information.html --- old/libwnck-3.4.6/doc/html/libwnck-Version-Information.html 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/doc/html/libwnck-Version-Information.html 2013-08-20 17:12:24.000000000 +0200 @@ -104,7 +104,7 @@ <hr> <div class="refsect2"> <a name="WNCK-MICRO-VERSION:CAPS"></a><h3>WNCK_MICRO_VERSION</h3> -<pre class="programlisting">#define WNCK_MICRO_VERSION (6) +<pre class="programlisting">#define WNCK_MICRO_VERSION (7) </pre> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/html/libwnck.devhelp2 new/libwnck-3.4.7/doc/html/libwnck.devhelp2 --- old/libwnck-3.4.6/doc/html/libwnck.devhelp2 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/doc/html/libwnck.devhelp2 2013-08-20 17:12:24.000000000 +0200 @@ -19,6 +19,7 @@ </sub> <sub name="Libwnck Utilities" link="utils.html"> <sub name="Resource Usage of X Clients" link="libwnck-Resource-Usage-of-X-Clients.html"/> + <sub name="Icon Files" link="libwnck-Icons-Functions.html"/> <sub name="Miscellaneous Functions" link="libwnck-Miscellaneous-Functions.html"/> <sub name="Version Information" link="libwnck-Version-Information.html"/> </sub> @@ -246,6 +247,10 @@ <keyword type="struct" name="struct WnckResourceUsage" link="libwnck-Resource-Usage-of-X-Clients.html#WnckResourceUsage" since="2.6"/> <keyword type="function" name="wnck_xid_read_resource_usage ()" link="libwnck-Resource-Usage-of-X-Clients.html#wnck-xid-read-resource-usage" since="2.6"/> <keyword type="function" name="wnck_pid_read_resource_usage ()" link="libwnck-Resource-Usage-of-X-Clients.html#wnck-pid-read-resource-usage" since="2.6"/> + <keyword type="macro" name="WNCK_DEFAULT_ICON_SIZE" link="libwnck-Icons-Functions.html#WNCK-DEFAULT-ICON-SIZE:CAPS"/> + <keyword type="macro" name="WNCK_DEFAULT_MINI_ICON_SIZE" link="libwnck-Icons-Functions.html#WNCK-DEFAULT-MINI-ICON-SIZE:CAPS"/> + <keyword type="function" name="wnck_set_default_icon_size ()" link="libwnck-Icons-Functions.html#wnck-set-default-icon-size" since="2.4.6"/> + <keyword type="function" name="wnck_set_default_mini_icon_size ()" link="libwnck-Icons-Functions.html#wnck-set-default-mini-icon-size" since="2.4.6"/> <keyword type="enum" name="enum WnckClientType" link="libwnck-Miscellaneous-Functions.html#WnckClientType" since="2.14"/> <keyword type="function" name="wnck_set_client_type ()" link="libwnck-Miscellaneous-Functions.html#wnck-set-client-type" since="2.14"/> <keyword type="function" name="wnck_shutdown ()" link="libwnck-Miscellaneous-Functions.html#wnck-shutdown" since="3.4"/> Files old/libwnck-3.4.6/doc/html/up.png and new/libwnck-3.4.7/doc/html/up.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/html/utils.html new/libwnck-3.4.7/doc/html/utils.html --- old/libwnck-3.4.6/doc/html/utils.html 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/doc/html/utils.html 2013-08-20 17:12:24.000000000 +0200 @@ -29,6 +29,9 @@ <span class="refentrytitle"><a href="libwnck-Resource-Usage-of-X-Clients.html">Resource Usage of X Clients</a></span><span class="refpurpose"> — reading resource usage of X clients.</span> </dt> <dt> +<span class="refentrytitle"><a href="libwnck-Icons-Functions.html">Icon Files</a></span><span class="refpurpose"> — icons related functions.</span> +</dt> +<dt> <span class="refentrytitle"><a href="libwnck-Miscellaneous-Functions.html">Miscellaneous Functions</a></span><span class="refpurpose"> — other additional features.</span> </dt> <dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/libwnck-docs.sgml new/libwnck-3.4.7/doc/libwnck-docs.sgml --- old/libwnck-3.4.6/doc/libwnck-docs.sgml 2013-01-09 14:39:35.000000000 +0100 +++ new/libwnck-3.4.7/doc/libwnck-docs.sgml 2013-08-20 16:55:50.000000000 +0200 @@ -158,6 +158,7 @@ <part id="utils"> <title>Libwnck Utilities</title> <xi:include href="xml/resource.xml"/> + <xi:include href="xml/icons.xml"/> <xi:include href="xml/misc.xml"/> <xi:include href="xml/version.xml"/> </part> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/libwnck-sections.txt new/libwnck-3.4.7/doc/libwnck-sections.txt --- old/libwnck-3.4.6/doc/libwnck-sections.txt 2013-08-06 13:08:05.000000000 +0200 +++ new/libwnck-3.4.7/doc/libwnck-sections.txt 2013-08-20 17:12:24.000000000 +0200 @@ -333,6 +333,15 @@ </SECTION> <SECTION> +<FILE>icons</FILE> +<TITLE>Icons Functions</TITLE> +WNCK_DEFAULT_ICON_SIZE +WNCK_DEFAULT_MINI_ICON_SIZE +wnck_set_default_icon_size +wnck_set_default_mini_icon_size +</SECTION> + +<SECTION> <FILE>misc</FILE> <TITLE>Miscellaneous Functions</TITLE> WnckClientType @@ -424,10 +433,6 @@ #<FILE>private</FILE> <SUBSECTION Private> WNCK_ACTIVATE_TIMEOUT -DEFAULT_ICON_WIDTH -DEFAULT_ICON_HEIGHT -DEFAULT_MINI_ICON_WIDTH -DEFAULT_MINI_ICON_HEIGHT WNCK_SCREEN_XSCREEN #</SECTION> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/doc/tmpl/icons.sgml new/libwnck-3.4.7/doc/tmpl/icons.sgml --- old/libwnck-3.4.6/doc/tmpl/icons.sgml 1970-01-01 01:00:00.000000000 +0100 +++ new/libwnck-3.4.7/doc/tmpl/icons.sgml 2013-08-20 17:12:24.000000000 +0200 @@ -0,0 +1,52 @@ +<!-- ##### SECTION Title ##### --> +Icon Files + +<!-- ##### SECTION Short_Description ##### --> + + +<!-- ##### SECTION Long_Description ##### --> +<para> + +</para> + +<!-- ##### SECTION See_Also ##### --> +<para> + +</para> + +<!-- ##### SECTION Stability_Level ##### --> + + +<!-- ##### SECTION Image ##### --> + + +<!-- ##### MACRO WNCK_DEFAULT_ICON_SIZE ##### --> +<para> + +</para> + + + +<!-- ##### MACRO WNCK_DEFAULT_MINI_ICON_SIZE ##### --> +<para> + +</para> + + + +<!-- ##### FUNCTION wnck_set_default_icon_size ##### --> +<para> + +</para> + +@size: + + +<!-- ##### FUNCTION wnck_set_default_mini_icon_size ##### --> +<para> + +</para> + +@size: + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/Makefile.in new/libwnck-3.4.7/libwnck/Makefile.in --- old/libwnck-3.4.6/libwnck/Makefile.in 2013-08-06 13:06:13.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/Makefile.in 2013-08-20 16:46:16.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.13.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/application.c new/libwnck-3.4.7/libwnck/application.c --- old/libwnck-3.4.6/libwnck/application.c 2013-07-20 16:46:11.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/application.c 2013-08-20 16:03:09.000000000 +0200 @@ -337,18 +337,19 @@ { GdkPixbuf *icon; GdkPixbuf *mini_icon; + gsize normal_size; + gsize mini_size; icon = NULL; mini_icon = NULL; + normal_size = _wnck_get_default_icon_size (); + mini_size = _wnck_get_default_mini_icon_size (); if (_wnck_read_icons (WNCK_SCREEN_XSCREEN (app->priv->screen), app->priv->xwindow, app->priv->icon_cache, - &icon, - DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT, - &mini_icon, - DEFAULT_MINI_ICON_WIDTH, - DEFAULT_MINI_ICON_HEIGHT)) + &icon, normal_size, normal_size, + &mini_icon, mini_size, mini_size)) { app->priv->need_emit_icon_changed = TRUE; app->priv->icon_from_leader = TRUE; @@ -373,6 +374,16 @@ !(app->priv->icon || app->priv->mini_icon)); } +void +_wnck_application_load_icons (WnckApplication *app) +{ + g_return_if_fail (WNCK_IS_APPLICATION (app)); + + get_icons (app); + if (app->priv->need_emit_icon_changed) + emit_icon_changed (app); +} + /* Prefer to get group icon from a window of type "normal" */ static WnckWindow* find_icon_window (WnckApplication *app) @@ -413,9 +424,7 @@ { g_return_val_if_fail (WNCK_IS_APPLICATION (app), NULL); - get_icons (app); - if (app->priv->need_emit_icon_changed) - emit_icon_changed (app); + _wnck_application_load_icons (app); if (app->priv->icon) return app->priv->icon; @@ -446,9 +455,7 @@ { g_return_val_if_fail (WNCK_IS_APPLICATION (app), NULL); - get_icons (app); - if (app->priv->need_emit_icon_changed) - emit_icon_changed (app); + _wnck_application_load_icons (app); if (app->priv->mini_icon) return app->priv->mini_icon; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/class-group.c new/libwnck-3.4.7/libwnck/class-group.c --- old/libwnck-3.4.6/libwnck/class-group.c 2013-07-20 16:46:40.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/class-group.c 2013-08-20 13:08:48.000000000 +0200 @@ -423,11 +423,11 @@ if (!icon || !mini_icon) { _wnck_get_fallback_icons (&icon, - DEFAULT_ICON_WIDTH, - DEFAULT_ICON_HEIGHT, + _wnck_get_default_icon_size (), + _wnck_get_default_icon_size (), &mini_icon, - DEFAULT_MINI_ICON_WIDTH, - DEFAULT_MINI_ICON_HEIGHT); + _wnck_get_default_mini_icon_size (), + _wnck_get_default_mini_icon_size ()); icons_reffed = TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/private.h new/libwnck-3.4.7/libwnck/private.h --- old/libwnck-3.4.6/libwnck/private.h 2013-06-20 13:26:32.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/private.h 2013-08-20 16:01:58.000000000 +0200 @@ -42,6 +42,9 @@ WnckClientType _wnck_get_client_type (void); +gsize _wnck_get_default_icon_size (void); +gsize _wnck_get_default_mini_icon_size (void); + void _wnck_application_process_property_notify (WnckApplication *app, XEvent *xevent); void _wnck_window_process_property_notify (WnckWindow *window, @@ -56,6 +59,8 @@ gint sort_order); void _wnck_window_destroy (WnckWindow *window); +void _wnck_window_load_icons (WnckWindow *window); + char* _wnck_window_get_name_for_display (WnckWindow *window, gboolean use_icon_name, gboolean use_state_decorations); @@ -66,8 +71,8 @@ void _wnck_window_shutdown_all (void); -WnckWorkspace* _wnck_workspace_create (int number, - WnckScreen *screen); +WnckWorkspace* _wnck_workspace_create (int number, + WnckScreen *screen); void _wnck_workspace_destroy (WnckWorkspace *space); void _wnck_window_set_application (WnckWindow *window, @@ -77,10 +82,9 @@ WnckClassGroup *class_group); /* this one is in pager.c since it needs code from there to draw the icon */ -void -_wnck_window_set_as_drag_icon (WnckWindow *window, - GdkDragContext *context, - GtkWidget *drag_source); +void _wnck_window_set_as_drag_icon (WnckWindow *window, + GdkDragContext *context, + GtkWidget *drag_source); void _wnck_application_add_window (WnckApplication *app, WnckWindow *window); @@ -90,6 +94,7 @@ WnckApplication* _wnck_application_create (Window xwindow, WnckScreen *screen); void _wnck_application_destroy (WnckApplication *app); +void _wnck_application_load_icons (WnckApplication *app); void _wnck_application_shutdown_all (void); @@ -115,11 +120,6 @@ void _wnck_init (void); Display *_wnck_get_default_display (void); -#define DEFAULT_ICON_WIDTH 32 -#define DEFAULT_ICON_HEIGHT 32 -#define DEFAULT_MINI_ICON_WIDTH 16 -#define DEFAULT_MINI_ICON_HEIGHT 16 - #define WNCK_SCREEN_XSCREEN(screen) (_wnck_screen_get_xscreen (screen)) Screen *_wnck_screen_get_xscreen (WnckScreen *screen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/tasklist.c new/libwnck-3.4.7/libwnck/tasklist.c --- old/libwnck-3.4.6/libwnck/tasklist.c 2013-07-20 01:12:59.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/tasklist.c 2013-08-20 13:12:56.000000000 +0200 @@ -91,7 +91,7 @@ #define DEFAULT_GROUPING_LIMIT 80 -#define MINI_ICON_SIZE DEFAULT_MINI_ICON_WIDTH +#define MINI_ICON_SIZE _wnck_get_default_mini_icon_size () #define TASKLIST_BUTTON_PADDING 4 #define TASKLIST_TEXT_MAX_WIDTH 25 /* maximum width in characters */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/test-tasklist.c new/libwnck-3.4.7/libwnck/test-tasklist.c --- old/libwnck-3.4.6/libwnck/test-tasklist.c 2013-07-20 01:16:36.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/test-tasklist.c 2013-08-20 16:21:49.000000000 +0200 @@ -10,11 +10,13 @@ static gboolean skip_tasklist = FALSE; static gboolean transparent = FALSE; static gboolean vertical = FALSE; +static gint icon_size = WNCK_DEFAULT_MINI_ICON_SIZE; static GOptionEntry entries[] = { {"always-group", 'g', 0, G_OPTION_ARG_NONE, &always_group, "Always group windows", NULL}, {"never-group", 'n', 0, G_OPTION_ARG_NONE, &never_group, "Never group windows", NULL}, {"display-all", 'a', 0, G_OPTION_ARG_NONE, &display_all, "Display windows from all workspaces", NULL}, + {"icon-size", 'i', 0, G_OPTION_ARG_INT, &icon_size, "Icon size for tasklist", NULL}, {"rtl", 'r', 0, G_OPTION_ARG_NONE, &rtl, "Use RTL as default direction", NULL}, {"skip-tasklist", 's', 0, G_OPTION_ARG_NONE, &skip_tasklist, "Don't show window in tasklist", NULL}, {"vertical", 'v', 0, G_OPTION_ARG_NONE, &vertical, "Show in vertical mode", NULL}, @@ -66,6 +68,7 @@ if (rtl) gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL); + wnck_set_default_mini_icon_size (icon_size); screen = wnck_screen_get_default (); /* because the pager doesn't respond to signals at the moment */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/test-wnck.c new/libwnck-3.4.7/libwnck/test-wnck.c --- old/libwnck-3.4.6/libwnck/test-wnck.c 2013-06-20 13:39:09.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/test-wnck.c 2013-08-20 16:18:19.000000000 +0200 @@ -58,13 +58,30 @@ WnckWindow *window); static void queue_refill_model (void); +static gint icon_size = WNCK_DEFAULT_MINI_ICON_SIZE; + +static GOptionEntry entries[] = { + {"icon-size", 'i', 0, G_OPTION_ARG_INT, &icon_size, "Icon size for tasklist", NULL}, + {NULL } +}; + + int main (int argc, char **argv) { WnckScreen *screen; GtkWidget *sw; GtkWidget *win; - + GOptionContext *ctxt; + + ctxt = g_option_context_new (""); + g_option_context_add_main_entries (ctxt, entries, NULL); + g_option_context_add_group (ctxt, gtk_get_option_group (TRUE)); + g_option_context_parse (ctxt, &argc, &argv, NULL); + g_clear_pointer (&ctxt, g_option_context_free); + + wnck_set_default_mini_icon_size (icon_size); + gtk_init (&argc, &argv); screen = wnck_screen_get (0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/util.c new/libwnck-3.4.7/libwnck/util.c --- old/libwnck-3.4.6/libwnck/util.c 2013-01-09 14:39:35.000000000 +0100 +++ new/libwnck-3.4.7/libwnck/util.c 2013-08-20 16:53:45.000000000 +0200 @@ -54,6 +54,15 @@ * libwnck users. */ +/** + * SECTION:icons + * @short_description: icons related functions. + * @stability: Unstable + * + * These functions are utility functions to manage icons for #WnckWindow and + * #WnckApplication. + */ + typedef enum { WNCK_EXT_UNKNOWN = 0, @@ -657,6 +666,74 @@ return client_type; } +static gsize default_icon_size = WNCK_DEFAULT_ICON_SIZE; + +/** + * wnck_set_default_icon_size: + * @size: the default size for windows and application standard icons. + * + * The default main icon size is %WNCK_DEFAULT_ICON_SIZE. This function allows + * to change this value. + * + * Since: 2.4.6 + */ +void +wnck_set_default_icon_size (gsize size) +{ + default_icon_size = size; +} + +gsize +_wnck_get_default_icon_size (void) +{ + return default_icon_size; +} + +static gsize default_mini_icon_size = WNCK_DEFAULT_MINI_ICON_SIZE; + +/** + * wnck_set_default_mini_icon_size: + * @size: the default size for windows and application mini icons. + * + * The default main icon size is %WNCK_DEFAULT_MINI_ICON_SIZE. This function + * allows to change this value. + * + * Since: 2.4.6 + */ +void +wnck_set_default_mini_icon_size (gsize size) +{ + int default_screen; + WnckScreen *screen; + GList *l; + + default_mini_icon_size = size; + + default_screen = DefaultScreen (_wnck_get_default_display ()); + screen = _wnck_screen_get_existing (default_screen); + + if (WNCK_IS_SCREEN (screen)) + { + /* Make applications and icons to reload their icons */ + for (l = wnck_screen_get_windows (screen); l; l = l->next) + { + WnckWindow *window = WNCK_WINDOW (l->data); + WnckApplication *application = wnck_window_get_application (window); + + _wnck_window_load_icons (window); + + if (WNCK_IS_APPLICATION (application)) + _wnck_application_load_icons (application); + } + } +} + +gsize +_wnck_get_default_mini_icon_size (void) +{ + return default_mini_icon_size; +} + /** * _make_gtk_label_bold: * @label: The label. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/util.h new/libwnck-3.4.7/libwnck/util.h --- old/libwnck-3.4.6/libwnck/util.h 2013-01-09 14:39:35.000000000 +0100 +++ new/libwnck-3.4.7/libwnck/util.h 2013-08-20 13:03:15.000000000 +0200 @@ -104,6 +104,12 @@ void wnck_set_client_type (WnckClientType ewmh_sourceindication_client_type); +#define WNCK_DEFAULT_ICON_SIZE 32 +#define WNCK_DEFAULT_MINI_ICON_SIZE 16 + +void wnck_set_default_icon_size (gsize size); +void wnck_set_default_mini_icon_size (gsize size); + void wnck_shutdown (void); void wnck_xid_read_resource_usage (GdkDisplay *gdk_display, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/version.h new/libwnck-3.4.7/libwnck/version.h --- old/libwnck-3.4.6/libwnck/version.h 2013-08-06 13:06:44.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/version.h 2013-08-20 16:46:22.000000000 +0200 @@ -74,7 +74,7 @@ * * Since: 3.0 */ -#define WNCK_MICRO_VERSION (6) +#define WNCK_MICRO_VERSION (7) /** * WNCK_CHECK_VERSION: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/window.c new/libwnck-3.4.7/libwnck/window.c --- old/libwnck-3.4.6/libwnck/window.c 2013-07-20 16:42:40.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/window.c 2013-08-20 16:05:00.000000000 +0200 @@ -2100,18 +2100,19 @@ { GdkPixbuf *icon; GdkPixbuf *mini_icon; + gsize normal_size; + gsize mini_size; icon = NULL; mini_icon = NULL; + normal_size = _wnck_get_default_icon_size (); + mini_size = _wnck_get_default_mini_icon_size (); if (_wnck_read_icons (WNCK_SCREEN_XSCREEN (window->priv->screen), window->priv->xwindow, window->priv->icon_cache, - &icon, - DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT, - &mini_icon, - DEFAULT_MINI_ICON_WIDTH, - DEFAULT_MINI_ICON_HEIGHT)) + &icon, normal_size, normal_size, + &mini_icon, mini_size, mini_size)) { window->priv->need_emit_icon_changed = TRUE; @@ -2129,6 +2130,18 @@ !(window->priv->icon || window->priv->mini_icon)); } +void +_wnck_window_load_icons (WnckWindow *window) +{ + g_return_if_fail (WNCK_IS_WINDOW (window)); + + get_icons (window); + if (window->priv->need_emit_icon_changed) + queue_update (window); /* not done in get_icons since we call that from + * the update + */ +} + /** * wnck_window_get_icon: * @window: a #WnckWindow. @@ -2146,11 +2159,7 @@ { g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL); - get_icons (window); - if (window->priv->need_emit_icon_changed) - queue_update (window); /* not done in get_icons since we call that from - * the update - */ + _wnck_window_load_icons (window); return window->priv->icon; } @@ -2172,11 +2181,7 @@ { g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL); - get_icons (window); - if (window->priv->need_emit_icon_changed) - queue_update (window); /* not done in get_icons since we call that from - * the update - */ + _wnck_window_load_icons (window); return window->priv->mini_icon; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwnck-3.4.6/libwnck/xutils.c new/libwnck-3.4.7/libwnck/xutils.c --- old/libwnck-3.4.6/libwnck/xutils.c 2013-08-06 12:32:54.000000000 +0200 +++ new/libwnck-3.4.7/libwnck/xutils.c 2013-08-20 13:14:45.000000000 +0200 @@ -2303,15 +2303,15 @@ { if (iconp) *iconp = default_icon_at_size (ideal_width > 0 ? ideal_width : - DEFAULT_ICON_WIDTH, + _wnck_get_default_icon_size (), ideal_height > 0 ? ideal_height : - DEFAULT_ICON_HEIGHT); + _wnck_get_default_icon_size ()); if (mini_iconp) *mini_iconp = default_icon_at_size (ideal_mini_width > 0 ? ideal_mini_width : - DEFAULT_MINI_ICON_WIDTH, + _wnck_get_default_mini_icon_size (), ideal_mini_height > 0 ? ideal_mini_height : - DEFAULT_MINI_ICON_HEIGHT); + _wnck_get_default_mini_icon_size ()); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
