Author: igor Date: Fri Jan 10 07:29:04 2014 New Revision: 2819 Log: file encoding fix
Modified: trunk/tint2/tint2-0.11-upstream_fixes-1.patch Modified: trunk/tint2/tint2-0.11-upstream_fixes-1.patch ============================================================================== --- trunk/tint2/tint2-0.11-upstream_fixes-1.patch Fri Jan 10 05:49:11 2014 (r2818) +++ trunk/tint2/tint2-0.11-upstream_fixes-1.patch Fri Jan 10 07:29:04 2014 (r2819) @@ -1,4 +1,4 @@ -Submitted by: Igor Živković <[email protected]> +Submitted By: Igor Zivkovic <[email protected]> Date: 2014-01-10 Initial Package Version: 0.11 Upstream Status: Fixed @@ -7,7 +7,7 @@ diff -Naur tint2-0.11/AUTHORS tint2-svn/AUTHORS --- tint2-0.11/AUTHORS 2009-11-05 20:48:26.000000000 +0100 -+++ tint2-svn/AUTHORS 2014-01-10 00:51:14.893082548 +0100 ++++ tint2-svn/AUTHORS 2014-01-10 16:11:02.863386346 +0100 @@ -1,6 +1,6 @@ tint2 is developped by : @@ -18,7 +18,7 @@ - Christian Ruppert <[email protected]> (autotools build system) diff -Naur tint2-0.11/ChangeLog tint2-svn/ChangeLog --- tint2-0.11/ChangeLog 2010-06-26 14:41:52.000000000 +0200 -+++ tint2-svn/ChangeLog 2014-01-10 00:51:14.976079202 +0100 ++++ tint2-svn/ChangeLog 2014-01-10 16:11:02.966388080 +0100 @@ -1,5 +1,6 @@ 2010-06-26 - unhide tint2 panel when dragging something @@ -28,7 +28,7 @@ - Set _NET_WM_ICON_GEOMETRY for every task diff -Naur tint2-0.11/CMakeLists.txt tint2-svn/CMakeLists.txt --- tint2-0.11/CMakeLists.txt 2010-06-15 23:38:14.000000000 +0200 -+++ tint2-svn/CMakeLists.txt 2014-01-10 00:51:15.085074809 +0100 ++++ tint2-svn/CMakeLists.txt 2014-01-10 16:11:03.227392515 +0100 @@ -3,18 +3,19 @@ include( FindPkgConfig ) @@ -141,7 +141,7 @@ endif( RT_LIBRARY ) diff -Naur tint2-0.11/get_svnrev.sh tint2-svn/get_svnrev.sh --- tint2-0.11/get_svnrev.sh 2010-06-26 14:41:58.000000000 +0200 -+++ tint2-svn/get_svnrev.sh 2014-01-10 00:51:15.085074809 +0100 ++++ tint2-svn/get_svnrev.sh 2014-01-10 16:11:03.227392515 +0100 @@ -1 +1,27 @@ -echo "#define VERSION_STRING \"0.11\"" > version.h +#!/bin/sh @@ -173,7 +173,7 @@ +fi diff -Naur tint2-0.11/make_release.sh tint2-svn/make_release.sh --- tint2-0.11/make_release.sh 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/make_release.sh 2014-01-10 00:51:14.976079202 +0100 ++++ tint2-svn/make_release.sh 2014-01-10 16:11:02.966388080 +0100 @@ -0,0 +1,23 @@ +#!/bin/bash + @@ -200,7 +200,7 @@ +rm -Rf ${DIR} diff -Naur tint2-0.11/sample/icon_and_text_1.tint2rc tint2-svn/sample/icon_and_text_1.tint2rc --- tint2-0.11/sample/icon_and_text_1.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/icon_and_text_1.tint2rc 2014-01-10 00:51:14.886082830 +0100 ++++ tint2-svn/sample/icon_and_text_1.tint2rc 2014-01-10 16:11:02.784384975 +0100 @@ -56,6 +56,7 @@ task_active_background_id = 2 task_urgent_background_id = 2 @@ -219,7 +219,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/icon_and_text_2.tint2rc tint2-svn/sample/icon_and_text_2.tint2rc --- tint2-0.11/sample/icon_and_text_2.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/icon_and_text_2.tint2rc 2014-01-10 00:51:14.886082830 +0100 ++++ tint2-svn/sample/icon_and_text_2.tint2rc 2014-01-10 16:11:02.784384975 +0100 @@ -56,6 +56,7 @@ task_active_background_id = 2 task_urgent_background_id = 2 @@ -238,7 +238,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/icon_and_text_3.tint2rc tint2-svn/sample/icon_and_text_3.tint2rc --- tint2-0.11/sample/icon_and_text_3.tint2rc 2010-05-15 16:43:01.000000000 +0200 -+++ tint2-svn/sample/icon_and_text_3.tint2rc 2014-01-10 00:51:14.886082830 +0100 ++++ tint2-svn/sample/icon_and_text_3.tint2rc 2014-01-10 16:11:02.784384975 +0100 @@ -62,6 +62,7 @@ task_active_background_id = 3 task_urgent_background_id = 4 @@ -257,7 +257,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/icon_and_text_4.tint2rc tint2-svn/sample/icon_and_text_4.tint2rc --- tint2-0.11/sample/icon_and_text_4.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/icon_and_text_4.tint2rc 2014-01-10 00:51:14.887082790 +0100 ++++ tint2-svn/sample/icon_and_text_4.tint2rc 2014-01-10 16:11:02.785384990 +0100 @@ -62,6 +62,7 @@ task_active_background_id = 1 task_urgent_background_id = 4 @@ -276,7 +276,7 @@ tooltip_hide_timeout = 0 diff -Naur tint2-0.11/sample/icon_only_1.tint2rc tint2-svn/sample/icon_only_1.tint2rc --- tint2-0.11/sample/icon_only_1.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/icon_only_1.tint2rc 2014-01-10 00:51:14.888082749 +0100 ++++ tint2-svn/sample/icon_only_1.tint2rc 2014-01-10 16:11:02.785384990 +0100 @@ -74,6 +74,7 @@ task_active_background_id = 5 task_urgent_background_id = 6 @@ -295,7 +295,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/icon_only_2.tint2rc tint2-svn/sample/icon_only_2.tint2rc --- tint2-0.11/sample/icon_only_2.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/icon_only_2.tint2rc 2014-01-10 00:51:14.888082749 +0100 ++++ tint2-svn/sample/icon_only_2.tint2rc 2014-01-10 16:11:02.786385004 +0100 @@ -62,6 +62,7 @@ task_active_background_id = 3 task_urgent_background_id = 3 @@ -314,7 +314,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/icon_only_3.tint2rc tint2-svn/sample/icon_only_3.tint2rc --- tint2-0.11/sample/icon_only_3.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/icon_only_3.tint2rc 2014-01-10 00:51:14.889082709 +0100 ++++ tint2-svn/sample/icon_only_3.tint2rc 2014-01-10 16:11:02.786385004 +0100 @@ -62,6 +62,7 @@ task_active_background_id = 2 task_urgent_background_id = 4 @@ -333,7 +333,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/icon_only_4.tint2rc tint2-svn/sample/icon_only_4.tint2rc --- tint2-0.11/sample/icon_only_4.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/icon_only_4.tint2rc 2014-01-10 00:51:14.889082709 +0100 ++++ tint2-svn/sample/icon_only_4.tint2rc 2014-01-10 16:11:02.786385004 +0100 @@ -62,6 +62,7 @@ task_active_background_id = 2 task_urgent_background_id = 4 @@ -352,7 +352,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/icon_only_6.tint2rc tint2-svn/sample/icon_only_6.tint2rc --- tint2-0.11/sample/icon_only_6.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/icon_only_6.tint2rc 2014-01-10 00:51:14.889082709 +0100 ++++ tint2-svn/sample/icon_only_6.tint2rc 2014-01-10 16:11:02.786385004 +0100 @@ -62,6 +62,7 @@ task_active_background_id = 2 task_urgent_background_id = 2 @@ -371,7 +371,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/icon_only_7.tint2rc tint2-svn/sample/icon_only_7.tint2rc --- tint2-0.11/sample/icon_only_7.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/icon_only_7.tint2rc 2014-01-10 00:51:14.889082709 +0100 ++++ tint2-svn/sample/icon_only_7.tint2rc 2014-01-10 16:11:02.786385004 +0100 @@ -56,6 +56,7 @@ task_active_background_id = 3 task_urgent_background_id = 0 @@ -390,7 +390,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/text_only_1.tint2rc tint2-svn/sample/text_only_1.tint2rc --- tint2-0.11/sample/text_only_1.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/text_only_1.tint2rc 2014-01-10 00:51:14.887082790 +0100 ++++ tint2-svn/sample/text_only_1.tint2rc 2014-01-10 16:11:02.785384990 +0100 @@ -68,6 +68,7 @@ task_active_background_id = 1 task_urgent_background_id = 0 @@ -409,7 +409,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/text_only_2.tint2rc tint2-svn/sample/text_only_2.tint2rc --- tint2-0.11/sample/text_only_2.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/text_only_2.tint2rc 2014-01-10 00:51:14.887082790 +0100 ++++ tint2-svn/sample/text_only_2.tint2rc 2014-01-10 16:11:02.785384990 +0100 @@ -68,6 +68,7 @@ task_active_background_id = 1 task_urgent_background_id = 0 @@ -428,7 +428,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/text_only_3.tint2rc tint2-svn/sample/text_only_3.tint2rc --- tint2-0.11/sample/text_only_3.tint2rc 2010-05-18 10:50:17.000000000 +0200 -+++ tint2-svn/sample/text_only_3.tint2rc 2014-01-10 00:51:14.887082790 +0100 ++++ tint2-svn/sample/text_only_3.tint2rc 2014-01-10 16:11:02.785384990 +0100 @@ -50,6 +50,7 @@ task_active_background_id = 2 task_urgent_background_id = 2 @@ -447,7 +447,7 @@ tooltip_hide_timeout = 1.2 diff -Naur tint2-0.11/sample/text_only_4.tint2rc tint2-svn/sample/text_only_4.tint2rc --- tint2-0.11/sample/text_only_4.tint2rc 2010-05-18 10:50:17.000000000 +0200 -+++ tint2-svn/sample/text_only_4.tint2rc 2014-01-10 00:51:14.888082749 +0100 ++++ tint2-svn/sample/text_only_4.tint2rc 2014-01-10 16:11:02.785384990 +0100 @@ -50,6 +50,7 @@ task_active_background_id = 2 task_urgent_background_id = 2 @@ -466,7 +466,7 @@ tooltip_hide_timeout = 0 diff -Naur tint2-0.11/sample/text_only_5.tint2rc tint2-svn/sample/text_only_5.tint2rc --- tint2-0.11/sample/text_only_5.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/text_only_5.tint2rc 2014-01-10 00:51:14.888082749 +0100 ++++ tint2-svn/sample/text_only_5.tint2rc 2014-01-10 16:11:02.785384990 +0100 @@ -56,6 +56,7 @@ task_active_background_id = 2 task_urgent_background_id = 2 @@ -485,7 +485,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/text_only_6.tint2rc tint2-svn/sample/text_only_6.tint2rc --- tint2-0.11/sample/text_only_6.tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/text_only_6.tint2rc 2014-01-10 00:51:14.888082749 +0100 ++++ tint2-svn/sample/text_only_6.tint2rc 2014-01-10 16:11:02.786385004 +0100 @@ -56,6 +56,7 @@ task_active_background_id = 2 task_urgent_background_id = 2 @@ -504,7 +504,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/sample/tint2rc tint2-svn/sample/tint2rc --- tint2-0.11/sample/tint2rc 2010-05-09 21:38:01.000000000 +0200 -+++ tint2-svn/sample/tint2rc 2014-01-10 00:51:14.886082830 +0100 ++++ tint2-svn/sample/tint2rc 2014-01-10 16:11:02.784384975 +0100 @@ -56,6 +56,7 @@ task_active_background_id = 2 task_urgent_background_id = 2 @@ -523,7 +523,7 @@ tooltip_hide_timeout = 0.3 diff -Naur tint2-0.11/src/battery/battery.c tint2-svn/src/battery/battery.c --- tint2-0.11/src/battery/battery.c 2010-06-11 20:47:26.000000000 +0200 -+++ tint2-svn/src/battery/battery.c 2014-01-10 00:51:15.044076461 +0100 ++++ tint2-svn/src/battery/battery.c 2014-01-10 16:11:03.117390642 +0100 @@ -24,20 +24,22 @@ #include <cairo-xlib.h> #include <pango/pangocairo.h> @@ -874,7 +874,7 @@ diff -Naur tint2-0.11/src/battery/battery.h tint2-svn/src/battery/battery.h --- tint2-0.11/src/battery/battery.h 2010-04-18 16:28:45.000000000 +0200 -+++ tint2-svn/src/battery/battery.h 2014-01-10 00:51:15.043076502 +0100 ++++ tint2-svn/src/battery/battery.h 2014-01-10 16:11:03.117390642 +0100 @@ -71,6 +71,6 @@ void draw_battery(void *obj, cairo_t *c); @@ -885,7 +885,7 @@ #endif diff -Naur tint2-0.11/src/clock/clock.c tint2-svn/src/clock/clock.c --- tint2-0.11/src/clock/clock.c 2010-06-11 20:47:26.000000000 +0200 -+++ tint2-svn/src/clock/clock.c 2014-01-10 00:51:15.050076220 +0100 ++++ tint2-svn/src/clock/clock.c 2014-01-10 16:11:03.134390932 +0100 @@ -2,7 +2,7 @@ * * Tint2 : clock @@ -1095,7 +1095,7 @@ diff -Naur tint2-0.11/src/clock/clock.h tint2-svn/src/clock/clock.h --- tint2-0.11/src/clock/clock.h 2010-04-18 16:28:45.000000000 +0200 -+++ tint2-svn/src/clock/clock.h 2014-01-10 00:51:15.049076260 +0100 ++++ tint2-svn/src/clock/clock.h 2014-01-10 16:11:03.134390932 +0100 @@ -49,7 +49,7 @@ void draw_clock (void *obj, cairo_t *c); @@ -1107,11 +1107,11 @@ diff -Naur tint2-0.11/src/config.c tint2-svn/src/config.c --- tint2-0.11/src/config.c 2010-06-12 14:25:21.000000000 +0200 -+++ tint2-svn/src/config.c 2014-01-10 00:51:15.023077308 +0100 ++++ tint2-svn/src/config.c 2014-01-10 16:11:03.032389193 +0100 @@ -3,7 +3,7 @@ * Tint2 : read/write config file * - * Copyright (C) 2007 PÃ¥l Staurland ([email protected]) + * Copyright (C) 2007 Pål Staurland ([email protected]) -* Modified (C) 2008 thierry lorthiois ([email protected]) +* Modified (C) 2008 thierry lorthiois ([email protected]) from Omega distribution * @@ -1449,7 +1449,7 @@ } diff -Naur tint2-0.11/src/launcher/launcher.c tint2-svn/src/launcher/launcher.c --- tint2-0.11/src/launcher/launcher.c 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/launcher/launcher.c 2014-01-10 00:51:14.978079122 +0100 ++++ tint2-svn/src/launcher/launcher.c 2014-01-10 16:11:02.966388080 +0100 @@ -0,0 +1,1101 @@ +/************************************************************************** +* Tint2 : launcher @@ -2554,7 +2554,7 @@ + diff -Naur tint2-0.11/src/launcher/launcher.h tint2-svn/src/launcher/launcher.h --- tint2-0.11/src/launcher/launcher.h 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/launcher/launcher.h 2014-01-10 00:51:14.979079081 +0100 ++++ tint2-svn/src/launcher/launcher.h 2014-01-10 16:11:02.967388096 +0100 @@ -0,0 +1,91 @@ +/************************************************************************** + * Copyright (C) 2010 ([email protected]) @@ -2649,10 +2649,10 @@ +#endif diff -Naur tint2-0.11/src/launcher/xsettings-client.c tint2-svn/src/launcher/xsettings-client.c --- tint2-0.11/src/launcher/xsettings-client.c 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/launcher/xsettings-client.c 2014-01-10 00:51:14.979079081 +0100 ++++ tint2-svn/src/launcher/xsettings-client.c 2014-01-10 16:11:02.967388096 +0100 @@ -0,0 +1,480 @@ +/* -+ * Copyright © 2001 Red Hat, Inc. ++ * Copyright © 2001 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that @@ -3133,10 +3133,10 @@ + diff -Naur tint2-0.11/src/launcher/xsettings-client.h tint2-svn/src/launcher/xsettings-client.h --- tint2-0.11/src/launcher/xsettings-client.h 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/launcher/xsettings-client.h 2014-01-10 00:51:14.979079081 +0100 ++++ tint2-svn/src/launcher/xsettings-client.h 2014-01-10 16:11:02.967388096 +0100 @@ -0,0 +1,57 @@ +/* -+ * Copyright © 2001 Red Hat, Inc. ++ * Copyright © 2001 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that @@ -3194,10 +3194,10 @@ +#endif /* XSETTINGS_CLIENT_H */ diff -Naur tint2-0.11/src/launcher/xsettings-common.c tint2-svn/src/launcher/xsettings-common.c --- tint2-0.11/src/launcher/xsettings-common.c 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/launcher/xsettings-common.c 2014-01-10 00:51:14.978079122 +0100 ++++ tint2-svn/src/launcher/xsettings-common.c 2014-01-10 16:11:02.966388080 +0100 @@ -0,0 +1,268 @@ +/* -+ * Copyright © 2001 Red Hat, Inc. ++ * Copyright © 2001 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that @@ -3466,10 +3466,10 @@ +} diff -Naur tint2-0.11/src/launcher/xsettings-common.h tint2-svn/src/launcher/xsettings-common.h --- tint2-0.11/src/launcher/xsettings-common.h 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/launcher/xsettings-common.h 2014-01-10 00:51:14.978079122 +0100 ++++ tint2-svn/src/launcher/xsettings-common.h 2014-01-10 16:11:02.966388080 +0100 @@ -0,0 +1,111 @@ +/* -+ * Copyright © 2001 Red Hat, Inc. ++ * Copyright © 2001 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that @@ -3581,11 +3581,11 @@ +#endif /* XSETTINGS_COMMON_H */ diff -Naur tint2-0.11/src/panel.c tint2-svn/src/panel.c --- tint2-0.11/src/panel.c 2010-06-26 14:35:35.000000000 +0200 -+++ tint2-svn/src/panel.c 2014-01-10 00:51:14.977079162 +0100 ++++ tint2-svn/src/panel.c 2014-01-10 16:11:02.966388080 +0100 @@ -1,7 +1,7 @@ /************************************************************************** * - * Copyright (C) 2008 PÃ¥l Staurland ([email protected]) + * Copyright (C) 2008 Pål Staurland ([email protected]) -* Modified (C) 2008 thierry lorthiois ([email protected]) +* Modified (C) 2008 thierry lorthiois ([email protected]) from Omega distribution * @@ -4034,7 +4034,7 @@ } diff -Naur tint2-0.11/src/panel.h tint2-svn/src/panel.h --- tint2-0.11/src/panel.h 2010-06-26 14:35:35.000000000 +0200 -+++ tint2-svn/src/panel.h 2014-01-10 00:51:15.023077308 +0100 ++++ tint2-svn/src/panel.h 2014-01-10 16:11:03.032389193 +0100 @@ -19,6 +19,7 @@ #include "task.h" #include "taskbar.h" @@ -4084,7 +4084,7 @@ Area* click_area(Panel *panel, int x, int y); diff -Naur tint2-0.11/src/server.c tint2-svn/src/server.c --- tint2-0.11/src/server.c 2010-06-26 14:35:35.000000000 +0200 -+++ tint2-svn/src/server.c 2014-01-10 00:51:15.039076663 +0100 ++++ tint2-svn/src/server.c 2014-01-10 16:11:03.094390247 +0100 @@ -36,8 +36,10 @@ void server_init_atoms () { @@ -4178,7 +4178,7 @@ server.nb_monitor = i; diff -Naur tint2-0.11/src/server.h tint2-svn/src/server.h --- tint2-0.11/src/server.h 2010-06-26 14:35:35.000000000 +0200 -+++ tint2-svn/src/server.h 2014-01-10 00:51:15.073075293 +0100 ++++ tint2-svn/src/server.h 2014-01-10 16:11:03.166391477 +0100 @@ -13,12 +13,19 @@ #include <X11/Xatom.h> #include <X11/extensions/Xinerama.h> @@ -4241,7 +4241,7 @@ diff -Naur tint2-0.11/src/systray/systraybar.c tint2-svn/src/systray/systraybar.c --- tint2-0.11/src/systray/systraybar.c 2010-06-09 17:31:18.000000000 +0200 -+++ tint2-svn/src/systray/systraybar.c 2014-01-10 00:51:15.079075051 +0100 ++++ tint2-svn/src/systray/systraybar.c 2014-01-10 16:11:03.206392156 +0100 @@ -1,7 +1,7 @@ /************************************************************************** * Tint2 : systraybar @@ -4562,7 +4562,7 @@ // We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and diff -Naur tint2-0.11/src/systray/systraybar.h tint2-svn/src/systray/systraybar.h --- tint2-0.11/src/systray/systraybar.h 2010-04-18 16:28:45.000000000 +0200 -+++ tint2-svn/src/systray/systraybar.h 2014-01-10 00:51:15.079075051 +0100 ++++ tint2-svn/src/systray/systraybar.h 2014-01-10 16:11:03.206392156 +0100 @@ -28,6 +28,7 @@ GSList *list_icons; int sort; @@ -4583,7 +4583,7 @@ // systray protocol diff -Naur tint2-0.11/src/taskbar/taskbar.c tint2-svn/src/taskbar/taskbar.c --- tint2-0.11/src/taskbar/taskbar.c 2010-06-16 17:00:48.000000000 +0200 -+++ tint2-svn/src/taskbar/taskbar.c 2014-01-10 00:51:15.040076623 +0100 ++++ tint2-svn/src/taskbar/taskbar.c 2014-01-10 16:11:03.095390264 +0100 @@ -2,7 +2,7 @@ * * Tint2 : taskbar @@ -5123,7 +5123,7 @@ + diff -Naur tint2-0.11/src/taskbar/taskbar.h tint2-svn/src/taskbar/taskbar.h --- tint2-0.11/src/taskbar/taskbar.h 2010-04-23 16:37:39.000000000 +0200 -+++ tint2-svn/src/taskbar/taskbar.h 2014-01-10 00:51:15.040076623 +0100 ++++ tint2-svn/src/taskbar/taskbar.h 2014-01-10 16:11:03.095390264 +0100 @@ -9,10 +9,23 @@ #define TASKBAR_H @@ -5199,7 +5199,7 @@ #endif diff -Naur tint2-0.11/src/taskbar/taskbarname.c tint2-svn/src/taskbar/taskbarname.c --- tint2-0.11/src/taskbar/taskbarname.c 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/taskbar/taskbarname.c 2014-01-10 00:51:15.040076623 +0100 ++++ tint2-svn/src/taskbar/taskbarname.c 2014-01-10 16:11:03.095390264 +0100 @@ -0,0 +1,161 @@ +/************************************************************************** +* @@ -5364,7 +5364,7 @@ + diff -Naur tint2-0.11/src/taskbar/taskbarname.h tint2-svn/src/taskbar/taskbarname.h --- tint2-0.11/src/taskbar/taskbarname.h 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/taskbar/taskbarname.h 2014-01-10 00:51:15.041076582 +0100 ++++ tint2-svn/src/taskbar/taskbarname.h 2014-01-10 16:11:03.095390264 +0100 @@ -0,0 +1,27 @@ +/************************************************************************** +* Copyright (C) 2008 thierry lorthiois ([email protected]) @@ -5395,11 +5395,11 @@ + diff -Naur tint2-0.11/src/taskbar/task.c tint2-svn/src/taskbar/task.c --- tint2-0.11/src/taskbar/task.c 2010-04-20 00:06:23.000000000 +0200 -+++ tint2-svn/src/taskbar/task.c 2014-01-10 00:51:15.039076663 +0100 ++++ tint2-svn/src/taskbar/task.c 2014-01-10 16:11:03.095390264 +0100 @@ -3,7 +3,7 @@ * Tint2 : task * - * Copyright (C) 2007 PÃ¥l Staurland ([email protected]) + * Copyright (C) 2007 Pål Staurland ([email protected]) -* Modified (C) 2008 thierry lorthiois ([email protected]) +* Modified (C) 2008 thierry lorthiois ([email protected]) from Omega distribution * @@ -5603,7 +5603,7 @@ } diff -Naur tint2-0.11/src/taskbar/task.h tint2-svn/src/taskbar/task.h --- tint2-0.11/src/taskbar/task.h 2010-04-19 23:44:40.000000000 +0200 -+++ tint2-svn/src/taskbar/task.h 2014-01-10 00:51:15.040076623 +0100 ++++ tint2-svn/src/taskbar/task.h 2014-01-10 16:11:03.095390264 +0100 @@ -44,6 +44,7 @@ PangoFontDescription *font_desc; Color font[TASK_STATE_COUNT]; @@ -5631,7 +5631,7 @@ diff -Naur tint2-0.11/src/tint2conf/CMakeLists.txt tint2-svn/src/tint2conf/CMakeLists.txt --- tint2-0.11/src/tint2conf/CMakeLists.txt 2010-06-14 08:20:41.000000000 +0200 -+++ tint2-svn/src/tint2conf/CMakeLists.txt 2014-01-10 00:51:15.027077147 +0100 ++++ tint2-svn/src/tint2conf/CMakeLists.txt 2014-01-10 16:11:03.034389230 +0100 @@ -20,6 +20,7 @@ set(SOURCES ../util/common.c main.c @@ -5661,7 +5661,7 @@ +install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" ) diff -Naur tint2-0.11/src/tint2conf/main.c tint2-svn/src/tint2conf/main.c --- tint2-0.11/src/tint2conf/main.c 2010-06-16 17:11:43.000000000 +0200 -+++ tint2-svn/src/tint2conf/main.c 2014-01-10 00:51:15.025077227 +0100 ++++ tint2-svn/src/tint2conf/main.c 2014-01-10 16:11:03.033389211 +0100 @@ -2,7 +2,7 @@ * * Tint2conf @@ -5772,7 +5772,7 @@ path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL); diff -Naur tint2-0.11/src/tint2conf/properties.c tint2-svn/src/tint2conf/properties.c --- tint2-0.11/src/tint2conf/properties.c 2010-06-16 17:11:43.000000000 +0200 -+++ tint2-svn/src/tint2conf/properties.c 2014-01-10 00:51:15.026077187 +0100 ++++ tint2-svn/src/tint2conf/properties.c 2014-01-10 16:11:03.034389230 +0100 @@ -1,3 +1,21 @@ +/************************************************************************** +* @@ -7658,7 +7658,7 @@ diff -Naur tint2-0.11/src/tint2conf/properties.h tint2-svn/src/tint2conf/properties.h --- tint2-0.11/src/tint2conf/properties.h 2010-06-13 00:20:03.000000000 +0200 -+++ tint2-svn/src/tint2conf/properties.h 2014-01-10 00:51:15.025077227 +0100 ++++ tint2-svn/src/tint2conf/properties.h 2014-01-10 16:11:03.033389211 +0100 @@ -4,6 +4,45 @@ #include <gtk/gtk.h> @@ -7707,7 +7707,7 @@ diff -Naur tint2-0.11/src/tint2conf/properties_rw.c tint2-svn/src/tint2conf/properties_rw.c --- tint2-0.11/src/tint2conf/properties_rw.c 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/tint2conf/properties_rw.c 2014-01-10 00:51:15.025077227 +0100 ++++ tint2-svn/src/tint2conf/properties_rw.c 2014-01-10 16:11:03.033389211 +0100 @@ -0,0 +1,565 @@ + +#include <stdio.h> @@ -8276,7 +8276,7 @@ + diff -Naur tint2-0.11/src/tint2conf/properties_rw.h tint2-svn/src/tint2conf/properties_rw.h --- tint2-0.11/src/tint2conf/properties_rw.h 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/tint2conf/properties_rw.h 2014-01-10 00:51:15.025077227 +0100 ++++ tint2-svn/src/tint2conf/properties_rw.h 2014-01-10 16:11:03.033389211 +0100 @@ -0,0 +1,11 @@ + +#ifndef PROPERTIES_RW @@ -8291,7 +8291,7 @@ + diff -Naur tint2-0.11/src/tint2conf/taskbar.svg tint2-svn/src/tint2conf/taskbar.svg --- tint2-0.11/src/tint2conf/taskbar.svg 1970-01-01 01:00:00.000000000 +0100 -+++ tint2-svn/src/tint2conf/taskbar.svg 2014-01-10 00:51:15.025077227 +0100 ++++ tint2-svn/src/tint2conf/taskbar.svg 2014-01-10 16:11:03.033389211 +0100 @@ -0,0 +1,436 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> @@ -8731,7 +8731,7 @@ +</svg> diff -Naur tint2-0.11/src/tint2conf/theme_view.c tint2-svn/src/tint2conf/theme_view.c --- tint2-0.11/src/tint2conf/theme_view.c 2010-06-14 17:08:51.000000000 +0200 -+++ tint2-svn/src/tint2conf/theme_view.c 2014-01-10 00:51:15.027077147 +0100 ++++ tint2-svn/src/tint2conf/theme_view.c 2014-01-10 16:11:03.034389230 +0100 @@ -1,3 +1,21 @@ +/************************************************************************** +* @@ -8808,7 +8808,7 @@ if (changeSize) diff -Naur tint2-0.11/src/tint2conf/theme_view.h tint2-svn/src/tint2conf/theme_view.h --- tint2-0.11/src/tint2conf/theme_view.h 2010-04-04 00:52:52.000000000 +0200 -+++ tint2-svn/src/tint2conf/theme_view.h 2014-01-10 00:51:15.023077308 +0100 ++++ tint2-svn/src/tint2conf/theme_view.h 2014-01-10 16:11:03.032389193 +0100 @@ -6,7 +6,7 @@ extern GtkWidget *g_theme_view; @@ -8820,10 +8820,10 @@ diff -Naur tint2-0.11/src/tint2conf/tint2conf.desktop tint2-svn/src/tint2conf/tint2conf.desktop --- tint2-0.11/src/tint2conf/tint2conf.desktop 2010-06-11 14:21:30.000000000 +0200 -+++ tint2-svn/src/tint2conf/tint2conf.desktop 2014-01-10 00:51:15.027077147 +0100 ++++ tint2-svn/src/tint2conf/tint2conf.desktop 2014-01-10 16:11:03.034389230 +0100 @@ -143,7 +143,7 @@ - Comment[ur_PK]=Ù¾ÛÙÙ Ú©Û ØªØ±ØªÛØ¨Ø§Øª - Comment[zh_CN]=èªå®ä¹é¢æ¿è®¾ç½® + Comment[ur_PK]=پینل کی ترتیبات + Comment[zh_CN]=自定义面板设置 Exec=tint2conf -Icon=tint2conf +Icon=taskbar @@ -8834,12 +8834,12 @@ --- tint2-0.11/src/tint2conf/tint2conf.png 2010-06-12 10:55:58.000000000 +0200 +++ tint2-svn/src/tint2conf/tint2conf.png 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ --PNG +-�PNG - -- IHDR 0 0 Wù sBIT|d pHYs × ×B(x tEXtSoftware www.inkscape.orgî< gIDAThí±jÂP¿$BÒÕ'pï*>àÜpíøP] --u¨Ð¥¥ÑDówЩh·'äC2d8çþ$gâÐ üN 4@h:Ðt¡éÇã>ðÇñ]à~.ï'õQß÷ ò<¿³Ù¬$I¸6/ iUUÕ¤W3{ôlfOif½ú¡áp¸Fe²×K° --IP»årÉQ@fFQ¡¼F|)ð ¬Ív»µ@]^D{ÌÌ ÐÀéÕfvbOíÊ@äM ð=F=n£Ë»mZã·æk\O@\gÀýiÔýaüg yò6³%ä}¾3`fîÜïB\%¢uÌ@EJÓôf>ç!;¼Bq¨ý'Æ --°,ËöÉ$Y,Sà6dWØ ëCNî×Ñ?_6¿âþG'N 4î¾ÊB*ß´×K IEND®B` +- IHDR 0 0 W�� sBIT|d� pHYs � �B(�x tEXtSoftware www.inkscape.org��< gIDATh�홱j�P��$B���'p�*>���p���P] +-u�Х��D���wЈ�h��'��C2d8����$��g�� ��N 4�@h:��t�����>���]�~.��'�Q�� �<��٬�$I�6/ iUU՛�W3{��lfOi�f����p��F�e��K� +-IP��r�Q@fFQ���F|)� ���v���@]^�D{�̝ М���fvbO��@�M �=�F�=n��ˀ�mZ������k\O@�\g��i��a�g�y�6��%�}�3`f���B�\%��u�@EJ��f>��!;�Bq���'� +-�,����$Y,S�6d�W� �C�N���?_6���G'�N 4���B�*ߴ�K IEND�B`� \ No newline at end of file diff -Naur tint2-0.11/src/tint2conf/tint2conf.svg tint2-svn/src/tint2conf/tint2conf.svg --- tint2-0.11/src/tint2conf/tint2conf.svg 2010-06-12 10:55:58.000000000 +0200 @@ -9196,7 +9196,7 @@ -</svg> diff -Naur tint2-0.11/src/tint2conf/tintwizard.py tint2-svn/src/tint2conf/tintwizard.py --- tint2-0.11/src/tint2conf/tintwizard.py 2010-05-09 21:00:13.000000000 +0200 -+++ tint2-svn/src/tint2conf/tintwizard.py 2014-01-10 00:51:15.025077227 +0100 ++++ tint2-svn/src/tint2conf/tintwizard.py 2014-01-10 16:11:03.033389211 +0100 @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -10498,11 +10498,11 @@ + diff -Naur tint2-0.11/src/tint.c tint2-svn/src/tint.c --- tint2-0.11/src/tint.c 2010-06-26 14:35:35.000000000 +0200 -+++ tint2-svn/src/tint.c 2014-01-10 00:51:14.977079162 +0100 ++++ tint2-svn/src/tint.c 2014-01-10 16:11:02.966388080 +0100 @@ -3,7 +3,7 @@ * Tint2 panel * - * Copyright (C) 2007 PÃ¥l Staurland ([email protected]) + * Copyright (C) 2007 Pål Staurland ([email protected]) -* Modified (C) 2008 thierry lorthiois ([email protected]) +* Modified (C) 2008 thierry lorthiois ([email protected]) from Omega distribution * @@ -11312,7 +11312,7 @@ // union needed to avoid strict-aliasing warnings by gcc diff -Naur tint2-0.11/src/tooltip/tooltip.c tint2-svn/src/tooltip/tooltip.c --- tint2-0.11/src/tooltip/tooltip.c 2010-04-20 00:06:23.000000000 +0200 -+++ tint2-svn/src/tooltip/tooltip.c 2014-01-10 00:51:15.047076341 +0100 ++++ tint2-svn/src/tooltip/tooltip.c 2014-01-10 16:11:03.119390677 +0100 @@ -62,6 +62,8 @@ { if (!g_tooltip.font_desc) @@ -11387,7 +11387,7 @@ else diff -Naur tint2-0.11/src/tooltip/tooltip.h tint2-svn/src/tooltip/tooltip.h --- tint2-0.11/src/tooltip/tooltip.h 2010-04-18 16:28:45.000000000 +0200 -+++ tint2-svn/src/tooltip/tooltip.h 2014-01-10 00:51:15.047076341 +0100 ++++ tint2-svn/src/tooltip/tooltip.h 2014-01-10 16:11:03.118390659 +0100 @@ -30,7 +30,6 @@ Window window; int show_timeout_msec; @@ -11407,7 +11407,7 @@ void tooltip_trigger_hide(); diff -Naur tint2-0.11/src/util/area.c tint2-svn/src/util/area.c --- tint2-0.11/src/util/area.c 2010-04-18 14:07:36.000000000 +0200 -+++ tint2-svn/src/util/area.c 2014-01-10 00:51:15.074075252 +0100 ++++ tint2-svn/src/util/area.c 2014-01-10 16:11:03.167391495 +0100 @@ -2,7 +2,7 @@ * * Tint2 : area @@ -11749,9 +11749,9 @@ draw_rect(c, a->bg->border.width/2.0, a->bg->border.width/2.0, a->width - a->bg->border.width, a->height - a->bg->border.width, a->bg->border.rounded); /* // convert : radian = degre * M_PI/180 -- // définir le dégradé dans un carré de (0,0) (100,100) -- // ensuite ce dégradé est extrapolé selon le ratio width/height -- // dans repère (0, 0) (100, 100) +- // définir le dégradé dans un carré de (0,0) (100,100) +- // ensuite ce dégradé est extrapolé selon le ratio width/height +- // dans repère (0, 0) (100, 100) + // definir le degrade dans un carre de (0,0) (100,100) + // ensuite ce degrade est extrapoler selon le ratio width/height + // dans repere (0, 0) (100, 100) @@ -11762,15 +11762,15 @@ X1 = 100; Y1 = 0; degre = 45; -- // et ensuite faire la changement d'unité du repère -- // car ce qui doit resté inchangée est les traits et pas la direction +- // et ensuite faire la changement d'unité du repère +- // car ce qui doit resté inchangée est les traits et pas la direction + // et ensuite faire la changement d'unite du repere + // car ce qui doit reste inchangee est les traits et pas la direction -- // il faut d'abord appliquer une rotation de 90° (et -180° si l'angle est supérieur à 180°) -- // ceci peut être appliqué une fois pour toute au départ -- // ensuite calculer l'angle dans le nouveau repère -- // puis faire une rotation de 90° +- // il faut d'abord appliquer une rotation de 90° (et -180° si l'angle est supérieur à 180°) +- // ceci peut être appliqué une fois pour toute au départ +- // ensuite calculer l'angle dans le nouveau repère +- // puis faire une rotation de 90° + // il faut d'abord appliquer une rotation de 90 (et -180 si l'angle est superieur a 180) + // ceci peut etre applique une fois pour toute au depart + // ensuite calculer l'angle dans le nouveau repare @@ -11789,7 +11789,7 @@ } diff -Naur tint2-0.11/src/util/area.h tint2-svn/src/util/area.h --- tint2-0.11/src/util/area.h 2010-01-09 01:11:01.000000000 +0100 -+++ tint2-svn/src/util/area.h 2014-01-10 00:51:15.075075212 +0100 ++++ tint2-svn/src/util/area.h 2014-01-10 16:11:03.167391495 +0100 @@ -47,6 +47,10 @@ } Background; @@ -11858,11 +11858,11 @@ void draw_background (Area *a, cairo_t *c); diff -Naur tint2-0.11/src/util/common.c tint2-svn/src/util/common.c --- tint2-0.11/src/util/common.c 2010-06-11 20:47:26.000000000 +0200 -+++ tint2-svn/src/util/common.c 2014-01-10 00:51:15.075075212 +0100 ++++ tint2-svn/src/util/common.c 2014-01-10 16:11:03.167391495 +0100 @@ -3,7 +3,7 @@ * Tint2 : common windows function * - * Copyright (C) 2007 PÃ¥l Staurland ([email protected]) + * Copyright (C) 2007 Pål Staurland ([email protected]) -* Modified (C) 2008 thierry lorthiois ([email protected]) +* Modified (C) 2008 thierry lorthiois ([email protected]) from Omega distribution * @@ -11916,7 +11916,7 @@ unsigned int x, y; diff -Naur tint2-0.11/src/util/common.h tint2-svn/src/util/common.h --- tint2-0.11/src/util/common.h 2010-06-11 20:47:26.000000000 +0200 -+++ tint2-svn/src/util/common.h 2014-01-10 00:51:15.075075212 +0100 ++++ tint2-svn/src/util/common.h 2014-01-10 16:11:03.167391495 +0100 @@ -49,6 +49,8 @@ int hex_to_rgb (char *hex, int *r, int *g, int *b); void get_color (char *hex, double *rgb); @@ -11928,7 +11928,7 @@ void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright); diff -Naur tint2-0.11/src/util/timer.c tint2-svn/src/util/timer.c --- tint2-0.11/src/util/timer.c 2010-04-23 19:27:34.000000000 +0200 -+++ tint2-svn/src/util/timer.c 2014-01-10 00:51:15.074075252 +0100 ++++ tint2-svn/src/util/timer.c 2014-01-10 16:11:03.166391477 +0100 @@ -77,6 +77,10 @@ free(t); timeout_list = g_slist_remove(timeout_list, t); @@ -11950,11 +11950,11 @@ g_hash_table_remove(multi_timeouts, last_timeout); diff -Naur tint2-0.11/src/util/window.c tint2-svn/src/util/window.c --- tint2-0.11/src/util/window.c 2010-02-08 23:44:56.000000000 +0100 -+++ tint2-svn/src/util/window.c 2014-01-10 00:51:15.074075252 +0100 ++++ tint2-svn/src/util/window.c 2014-01-10 16:11:03.166391477 +0100 @@ -3,7 +3,7 @@ * Tint2 : common windows function * - * Copyright (C) 2007 PÃ¥l Staurland ([email protected]) + * Copyright (C) 2007 Pål Staurland ([email protected]) -* Modified (C) 2008 thierry lorthiois ([email protected]) +* Modified (C) 2008 thierry lorthiois ([email protected]) from Omega distribution * @@ -12072,7 +12072,7 @@ XFreePixmap (server.dsp, pmap); diff -Naur tint2-0.11/src/util/window.h tint2-svn/src/util/window.h --- tint2-0.11/src/util/window.h 2009-09-07 23:41:21.000000000 +0200 -+++ tint2-svn/src/util/window.h 2014-01-10 00:51:15.075075212 +0100 ++++ tint2-svn/src/util/window.h 2014-01-10 16:11:03.167391495 +0100 @@ -9,6 +9,7 @@ #ifndef WINDOW_H #define WINDOW_H
-- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
