Ubuntu
lxpanel package

Merge lp:~noskcaj/ubuntu/utopic/lxpanel/0.6.2 into lp:ubuntu/utopic/lxpanel

  1. Utopic (14.10)
  2. 0.6.2
  3. Merge into utopic
Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp:~noskcaj/ubuntu/utopic/lxpanel/0.6.2
Merge into: lp:ubuntu/utopic/lxpanel
Diff against target: 1684 lines (+239/-904)
33 files modified
.pc/05-libtool-ppc64el.patch/configure (+10/-10)
ABOUT-NLS (+0/-768)
Makefile.in (+6/-5)
aclocal.m4 (+3/-4)
configure (+10/-10)
configure.ac (+1/-1)
data/Makefile.in (+1/-1)
data/ui/netstatus.ui (+2/-1)
debian/changelog (+6/-0)
debian/patches/02-desktop-number.patch (+8/-6)
man/Makefile.in (+1/-1)
src/Makefile.in (+1/-1)
src/misc.c (+35/-11)
src/plugins/Makefile.in (+1/-1)
src/plugins/batt/Makefile.in (+1/-1)
src/plugins/batt/batt.c (+21/-13)
src/plugins/batt/batt_sys.c (+36/-1)
src/plugins/batt/batt_sys.h (+3/-2)
src/plugins/cpu/Makefile.in (+1/-1)
src/plugins/cpufreq/Makefile.in (+1/-1)
src/plugins/deskno/Makefile.in (+1/-1)
src/plugins/indicator/Makefile.in (+1/-1)
src/plugins/kbled/Makefile.in (+1/-1)
src/plugins/menu.c (+13/-2)
src/plugins/monitors/Makefile.in (+1/-1)
src/plugins/monitors/monitors.c (+67/-52)
src/plugins/netstat/Makefile.in (+1/-1)
src/plugins/netstatus/Makefile.in (+1/-1)
src/plugins/thermal/Makefile.in (+1/-1)
src/plugins/volume/Makefile.in (+1/-1)
src/plugins/volumealsa/Makefile.in (+1/-1)
src/plugins/wnckpager/Makefile.in (+1/-1)
src/plugins/xkb/Makefile.in (+1/-1)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/utopic/lxpanel/0.6.2
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+221022@code.launchpad.net

Description of the change

New upstream bugfix release. Adds support for linux >3.14

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve
Reply

Unmerged revisions

43. By Jackson Doak

New upstream release.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/05-libtool-ppc64el.patch/configure'
2--- .pc/05-libtool-ppc64el.patch/configure 2014-01-30 22:32:55 +0000
3+++ .pc/05-libtool-ppc64el.patch/configure 2014-05-27 06:48:22 +0000
4@@ -1,6 +1,6 @@
5 #! /bin/sh
6 # Guess values for system-dependent variables and create Makefiles.
7-# Generated by GNU Autoconf 2.69 for lxpanel 0.6.1.
8+# Generated by GNU Autoconf 2.69 for lxpanel 0.6.2.
9 #
10 # Report bugs to <http://lxde.org/>.
11 #
12@@ -590,8 +590,8 @@
13 # Identity of this package.
14 PACKAGE_NAME='lxpanel'
15 PACKAGE_TARNAME='lxpanel'
16-PACKAGE_VERSION='0.6.1'
17-PACKAGE_STRING='lxpanel 0.6.1'
18+PACKAGE_VERSION='0.6.2'
19+PACKAGE_STRING='lxpanel 0.6.2'
20 PACKAGE_BUGREPORT='http://lxde.org/'
21 PACKAGE_URL=''
22
23@@ -1425,7 +1425,7 @@
24 # Omit some internal or obsolete options to make the list less imposing.
25 # This message is too long to be a string in the A/UX 3.1 sh.
26 cat <<_ACEOF
27-\`configure' configures lxpanel 0.6.1 to adapt to many kinds of systems.
28+\`configure' configures lxpanel 0.6.2 to adapt to many kinds of systems.
29
30 Usage: $0 [OPTION]... [VAR=VALUE]...
31
32@@ -1499,7 +1499,7 @@
33
34 if test -n "$ac_init_help"; then
35 case $ac_init_help in
36- short | recursive ) echo "Configuration of lxpanel 0.6.1:";;
37+ short | recursive ) echo "Configuration of lxpanel 0.6.2:";;
38 esac
39 cat <<\_ACEOF
40
41@@ -1652,7 +1652,7 @@
42 test -n "$ac_init_help" && exit $ac_status
43 if $ac_init_version; then
44 cat <<\_ACEOF
45-lxpanel configure 0.6.1
46+lxpanel configure 0.6.2
47 generated by GNU Autoconf 2.69
48
49 Copyright (C) 2012 Free Software Foundation, Inc.
50@@ -2021,7 +2021,7 @@
51 This file contains any messages produced by compilers while
52 running configure, to aid debugging if configure makes a mistake.
53
54-It was created by lxpanel $as_me 0.6.1, which was
55+It was created by lxpanel $as_me 0.6.2, which was
56 generated by GNU Autoconf 2.69. Invocation command line was
57
58 $ $0 $@
59@@ -2884,7 +2884,7 @@
60
61 # Define the identity of the package.
62 PACKAGE='lxpanel'
63- VERSION='0.6.1'
64+ VERSION='0.6.2'
65
66
67 cat >>confdefs.h <<_ACEOF
68@@ -17243,7 +17243,7 @@
69 # report actual input values of CONFIG_FILES etc. instead of their
70 # values after options handling.
71 ac_log="
72-This file was extended by lxpanel $as_me 0.6.1, which was
73+This file was extended by lxpanel $as_me 0.6.2, which was
74 generated by GNU Autoconf 2.69. Invocation command line was
75
76 CONFIG_FILES = $CONFIG_FILES
77@@ -17309,7 +17309,7 @@
78 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
79 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
80 ac_cs_version="\\
81-lxpanel config.status 0.6.1
82+lxpanel config.status 0.6.2
83 configured by $0, generated by GNU Autoconf 2.69,
84 with options \\"\$ac_cs_config\\"
85
86
87=== removed file 'ABOUT-NLS'
88--- ABOUT-NLS 2008-06-02 14:59:09 +0000
89+++ ABOUT-NLS 1970-01-01 00:00:00 +0000
90@@ -1,768 +0,0 @@
91-Notes on the Free Translation Project
92-*************************************
93-
94-Free software is going international! The Free Translation Project is
95-a way to get maintainers of free software, translators, and users all
96-together, so that will gradually become able to speak many languages.
97-A few packages already provide translations for their messages.
98-
99- If you found this `ABOUT-NLS' file inside a distribution, you may
100-assume that the distributed package does use GNU `gettext' internally,
101-itself available at your nearest GNU archive site. But you do _not_
102-need to install GNU `gettext' prior to configuring, installing or using
103-this package with messages translated.
104-
105- Installers will find here some useful hints. These notes also
106-explain how users should proceed for getting the programs to use the
107-available translations. They tell how people wanting to contribute and
108-work at translations should contact the appropriate team.
109-
110- When reporting bugs in the `intl/' directory or bugs which may be
111-related to internationalization, you should tell about the version of
112-`gettext' which is used. The information can be found in the
113-`intl/VERSION' file, in internationalized packages.
114-
115-Quick configuration advice
116-==========================
117-
118-If you want to exploit the full power of internationalization, you
119-should configure it using
120-
121- ./configure --with-included-gettext
122-
123-to force usage of internationalizing routines provided within this
124-package, despite the existence of internationalizing capabilities in the
125-operating system where this package is being installed. So far, only
126-the `gettext' implementation in the GNU C library version 2 provides as
127-many features (such as locale alias, message inheritance, automatic
128-charset conversion or plural form handling) as the implementation here.
129-It is also not possible to offer this additional functionality on top
130-of a `catgets' implementation. Future versions of GNU `gettext' will
131-very likely convey even more functionality. So it might be a good idea
132-to change to GNU `gettext' as soon as possible.
133-
134- So you need _not_ provide this option if you are using GNU libc 2 or
135-you have installed a recent copy of the GNU gettext package with the
136-included `libintl'.
137-
138-INSTALL Matters
139-===============
140-
141-Some packages are "localizable" when properly installed; the programs
142-they contain can be made to speak your own native language. Most such
143-packages use GNU `gettext'. Other packages have their own ways to
144-internationalization, predating GNU `gettext'.
145-
146- By default, this package will be installed to allow translation of
147-messages. It will automatically detect whether the system already
148-provides the GNU `gettext' functions. If not, the GNU `gettext' own
149-library will be used. This library is wholly contained within this
150-package, usually in the `intl/' subdirectory, so prior installation of
151-the GNU `gettext' package is _not_ required. Installers may use
152-special options at configuration time for changing the default
153-behaviour. The commands:
154-
155- ./configure --with-included-gettext
156- ./configure --disable-nls
157-
158-will respectively bypass any pre-existing `gettext' to use the
159-internationalizing routines provided within this package, or else,
160-_totally_ disable translation of messages.
161-
162- When you already have GNU `gettext' installed on your system and run
163-configure without an option for your new package, `configure' will
164-probably detect the previously built and installed `libintl.a' file and
165-will decide to use this. This might be not what is desirable. You
166-should use the more recent version of the GNU `gettext' library. I.e.
167-if the file `intl/VERSION' shows that the library which comes with this
168-package is more recent, you should use
169-
170- ./configure --with-included-gettext
171-
172-to prevent auto-detection.
173-
174- The configuration process will not test for the `catgets' function
175-and therefore it will not be used. The reason is that even an
176-emulation of `gettext' on top of `catgets' could not provide all the
177-extensions of the GNU `gettext' library.
178-
179- Internationalized packages have usually many `po/LL.po' files, where
180-LL gives an ISO 639 two-letter code identifying the language. Unless
181-translations have been forbidden at `configure' time by using the
182-`--disable-nls' switch, all available translations are installed
183-together with the package. However, the environment variable `LINGUAS'
184-may be set, prior to configuration, to limit the installed set.
185-`LINGUAS' should then contain a space separated list of two-letter
186-codes, stating which languages are allowed.
187-
188-Using This Package
189-==================
190-
191-As a user, if your language has been installed for this package, you
192-only have to set the `LANG' environment variable to the appropriate
193-`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
194-and `CC' is an ISO 3166 two-letter country code. For example, let's
195-suppose that you speak German and live in Germany. At the shell
196-prompt, merely execute `setenv LANG de_DE' (in `csh'),
197-`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
198-This can be done from your `.login' or `.profile' file, once and for
199-all.
200-
201- You might think that the country code specification is redundant.
202-But in fact, some languages have dialects in different countries. For
203-example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
204-country code serves to distinguish the dialects.
205-
206- The locale naming convention of `LL_CC', with `LL' denoting the
207-language and `CC' denoting the country, is the one use on systems based
208-on GNU libc. On other systems, some variations of this scheme are
209-used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
210-locales supported by your system for your country by running the command
211-`locale -a | grep '^LL''.
212-
213- Not all programs have translations for all languages. By default, an
214-English message is shown in place of a nonexistent translation. If you
215-understand other languages, you can set up a priority list of languages.
216-This is done through a different environment variable, called
217-`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
218-for the purpose of message handling, but you still need to have `LANG'
219-set to the primary language; this is required by other parts of the
220-system libraries. For example, some Swedish users who would rather
221-read translations in German than English for when Swedish is not
222-available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
223-
224- Special advice for Norwegian users: The language code for Norwegian
225-bokma*l changed from `no' to `nb' recently (in 2003). During the
226-transition period, while some message catalogs for this language are
227-installed under `nb' and some older ones under `no', it's recommended
228-for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
229-older translations are used.
230-
231- In the `LANGUAGE' environment variable, but not in the `LANG'
232-environment variable, `LL_CC' combinations can be abbreviated as `LL'
233-to denote the language's main dialect. For example, `de' is equivalent
234-to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
235-(Portuguese as spoken in Portugal) in this context.
236-
237-Translating Teams
238-=================
239-
240-For the Free Translation Project to be a success, we need interested
241-people who like their own language and write it well, and who are also
242-able to synergize with other translators speaking the same language.
243-Each translation team has its own mailing list. The up-to-date list of
244-teams can be found at the Free Translation Project's homepage,
245-`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
246-area.
247-
248- If you'd like to volunteer to _work_ at translating messages, you
249-should become a member of the translating team for your own language.
250-The subscribing address is _not_ the same as the list itself, it has
251-`-request' appended. For example, speakers of Swedish can send a
252-message to `sv-request@li.org', having this message body:
253-
254- subscribe
255-
256- Keep in mind that team members are expected to participate
257-_actively_ in translations, or at solving translational difficulties,
258-rather than merely lurking around. If your team does not exist yet and
259-you want to start one, or if you are unsure about what to do or how to
260-get started, please write to `translation@iro.umontreal.ca' to reach the
261-coordinator for all translator teams.
262-
263- The English team is special. It works at improving and uniformizing
264-the terminology in use. Proven linguistic skill are praised more than
265-programming skill, here.
266-
267-Available Packages
268-==================
269-
270-Languages are not equally supported in all packages. The following
271-matrix shows the current state of internationalization, as of January
272-2004. The matrix shows, in regard of each package, for which languages
273-PO files have been submitted to translation coordination, with a
274-translation percentage of at least 50%.
275-
276- Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es
277- +----------------------------------------------------+
278- a2ps | [] [] [] [] |
279- aegis | () |
280- ant-phone | () |
281- anubis | |
282- ap-utils | |
283- aspell | [] |
284- bash | [] [] [] [] |
285- batchelor | |
286- bfd | [] [] |
287- binutils | [] [] |
288- bison | [] [] [] |
289- bluez-pin | [] [] [] |
290- clisp | |
291- clisp | [] [] [] |
292- console-tools | [] [] |
293- coreutils | [] [] [] [] |
294- cpio | [] [] [] |
295- darkstat | [] () [] |
296- diffutils | [] [] [] [] [] [] [] |
297- e2fsprogs | [] [] [] |
298- enscript | [] [] [] [] |
299- error | [] [] [] [] [] |
300- fetchmail | [] () [] [] [] [] |
301- fileutils | [] [] [] |
302- findutils | [] [] [] [] [] [] [] |
303- flex | [] [] [] [] |
304- fslint | |
305- gas | [] |
306- gawk | [] [] [] [] |
307- gbiff | [] |
308- gcal | [] |
309- gcc | [] [] |
310- gettext | [] [] [] [] [] |
311- gettext-examples | [] [] [] [] |
312- gettext-runtime | [] [] [] [] [] |
313- gettext-tools | [] [] [] |
314- gimp-print | [] [] [] [] [] |
315- gliv | |
316- glunarclock | [] [] |
317- gnubiff | [] |
318- gnucash | [] () [] [] |
319- gnucash-glossary | [] () [] |
320- gnupg | [] () [] [] [] [] |
321- gpe-aerial | [] |
322- gpe-beam | [] [] |
323- gpe-calendar | [] [] |
324- gpe-clock | [] [] |
325- gpe-conf | [] [] |
326- gpe-contacts | [] [] |
327- gpe-edit | [] |
328- gpe-go | [] |
329- gpe-login | [] [] |
330- gpe-ownerinfo | [] [] |
331- gpe-sketchbook | [] [] |
332- gpe-su | [] [] |
333- gpe-taskmanager | [] [] |
334- gpe-timesheet | [] |
335- gpe-today | [] [] |
336- gpe-todo | [] [] |
337- gphoto2 | [] [] [] [] |
338- gprof | [] [] [] |
339- gpsdrive | () () () |
340- gramadoir | [] |
341- grep | [] [] [] [] [] [] |
342- gretl | [] |
343- gtick | [] () |
344- hello | [] [] [] [] [] [] |
345- id-utils | [] [] |
346- indent | [] [] [] [] |
347- iso_3166 | [] [] [] [] [] [] [] [] [] [] |
348- iso_3166_1 | [] [] [] [] [] [] |
349- iso_3166_2 | |
350- iso_3166_3 | [] |
351- iso_4217 | [] [] [] [] |
352- iso_639 | |
353- jpilot | [] [] [] |
354- jtag | |
355- jwhois | [] |
356- kbd | [] [] [] [] [] |
357- latrine | () |
358- ld | [] [] |
359- libc | [] [] [] [] [] [] |
360- libgpewidget | [] [] |
361- libiconv | [] [] [] [] [] |
362- lifelines | [] () |
363- lilypond | [] |
364- lingoteach | |
365- lingoteach_lessons | () () |
366- lynx | [] [] [] [] |
367- m4 | [] [] [] [] |
368- mailutils | [] [] |
369- make | [] [] [] |
370- man-db | [] () [] [] () |
371- minicom | [] [] [] |
372- mysecretdiary | [] [] [] |
373- nano | [] () [] [] [] |
374- nano_1_0 | [] () [] [] [] |
375- opcodes | [] |
376- parted | [] [] [] [] [] |
377- ptx | [] [] [] [] [] |
378- python | |
379- radius | [] |
380- recode | [] [] [] [] [] [] [] |
381- rpm | [] [] |
382- screem | |
383- scrollkeeper | [] [] [] [] [] [] |
384- sed | [] [] [] [] [] [] |
385- sh-utils | [] [] [] |
386- shared-mime-info | |
387- sharutils | [] [] [] [] [] [] |
388- silky | () |
389- skencil | [] () [] |
390- sketch | [] () [] |
391- soundtracker | [] [] [] |
392- sp | [] |
393- tar | [] [] [] [] |
394- texinfo | [] [] [] |
395- textutils | [] [] [] [] |
396- tin | () () |
397- tp-robot | |
398- tuxpaint | [] [] [] [] [] [] [] |
399- unicode-han-tra... | |
400- unicode-transla... | |
401- util-linux | [] [] [] [] [] |
402- vorbis-tools | [] [] [] [] |
403- wastesedge | () |
404- wdiff | [] [] [] [] |
405- wget | [] [] [] [] [] [] |
406- xchat | [] [] [] [] |
407- xfree86_xkb_xml | [] [] |
408- xpad | [] |
409- +----------------------------------------------------+
410- af am ar az be bg bs ca cs da de el en en_GB eo es
411- 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68
412-
413- et eu fa fi fr ga gl he hr hu id is it ja ko lg
414- +-------------------------------------------------+
415- a2ps | [] [] [] () () |
416- aegis | |
417- ant-phone | [] |
418- anubis | [] |
419- ap-utils | [] |
420- aspell | [] [] |
421- bash | [] [] |
422- batchelor | [] [] |
423- bfd | [] |
424- binutils | [] [] |
425- bison | [] [] [] [] |
426- bluez-pin | [] [] [] [] [] |
427- clisp | |
428- clisp | [] |
429- console-tools | |
430- coreutils | [] [] [] [] [] [] |
431- cpio | [] [] [] [] |
432- darkstat | () [] [] [] |
433- diffutils | [] [] [] [] [] [] [] |
434- e2fsprogs | |
435- enscript | [] [] |
436- error | [] [] [] [] |
437- fetchmail | [] |
438- fileutils | [] [] [] [] [] [] |
439- findutils | [] [] [] [] [] [] [] [] [] [] [] |
440- flex | [] [] [] |
441- fslint | [] |
442- gas | [] |
443- gawk | [] [] [] |
444- gbiff | [] |
445- gcal | [] |
446- gcc | [] |
447- gettext | [] [] [] |
448- gettext-examples | [] [] |
449- gettext-runtime | [] [] [] [] [] |
450- gettext-tools | [] [] [] |
451- gimp-print | [] [] |
452- gliv | () |
453- glunarclock | [] [] [] [] |
454- gnubiff | [] |
455- gnucash | () [] |
456- gnucash-glossary | [] |
457- gnupg | [] [] [] [] [] [] [] |
458- gpe-aerial | [] |
459- gpe-beam | [] |
460- gpe-calendar | [] [] [] |
461- gpe-clock | [] |
462- gpe-conf | [] |
463- gpe-contacts | [] [] |
464- gpe-edit | [] [] |
465- gpe-go | [] |
466- gpe-login | [] [] |
467- gpe-ownerinfo | [] [] [] |
468- gpe-sketchbook | [] |
469- gpe-su | [] |
470- gpe-taskmanager | [] |
471- gpe-timesheet | [] [] [] |
472- gpe-today | [] [] |
473- gpe-todo | [] [] |
474- gphoto2 | [] [] [] |
475- gprof | [] [] |
476- gpsdrive | () () () |
477- gramadoir | [] [] |
478- grep | [] [] [] [] [] [] [] [] [] [] [] |
479- gretl | [] [] |
480- gtick | [] [] [] |
481- hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
482- id-utils | [] [] [] [] |
483- indent | [] [] [] [] [] [] [] [] [] |
484- iso_3166 | [] [] [] [] [] [] [] |
485- iso_3166_1 | [] [] [] [] [] |
486- iso_3166_2 | |
487- iso_3166_3 | |
488- iso_4217 | [] [] [] [] [] [] |
489- iso_639 | |
490- jpilot | [] () |
491- jtag | [] |
492- jwhois | [] [] [] [] |
493- kbd | [] |
494- latrine | [] |
495- ld | [] |
496- libc | [] [] [] [] [] [] |
497- libgpewidget | [] [] [] [] |
498- libiconv | [] [] [] [] [] [] [] [] [] |
499- lifelines | () |
500- lilypond | [] |
501- lingoteach | [] [] |
502- lingoteach_lessons | |
503- lynx | [] [] [] [] |
504- m4 | [] [] [] [] |
505- mailutils | |
506- make | [] [] [] [] [] [] |
507- man-db | () () |
508- minicom | [] [] [] [] |
509- mysecretdiary | [] [] |
510- nano | [] [] [] [] |
511- nano_1_0 | [] [] [] [] |
512- opcodes | [] |
513- parted | [] [] [] |
514- ptx | [] [] [] [] [] [] [] |
515- python | |
516- radius | [] |
517- recode | [] [] [] [] [] [] |
518- rpm | [] [] |
519- screem | |
520- scrollkeeper | [] |
521- sed | [] [] [] [] [] [] [] [] [] |
522- sh-utils | [] [] [] [] [] [] [] |
523- shared-mime-info | [] [] [] |
524- sharutils | [] [] [] [] [] |
525- silky | () [] () () |
526- skencil | [] |
527- sketch | [] |
528- soundtracker | [] [] |
529- sp | [] () |
530- tar | [] [] [] [] [] [] [] [] [] |
531- texinfo | [] [] [] [] |
532- textutils | [] [] [] [] [] [] |
533- tin | [] () |
534- tp-robot | [] |
535- tuxpaint | [] [] [] [] [] [] [] [] [] |
536- unicode-han-tra... | |
537- unicode-transla... | [] [] |
538- util-linux | [] [] [] [] () [] |
539- vorbis-tools | [] |
540- wastesedge | () |
541- wdiff | [] [] [] [] [] [] |
542- wget | [] [] [] [] [] [] [] |
543- xchat | [] [] [] |
544- xfree86_xkb_xml | [] [] |
545- xpad | [] [] |
546- +-------------------------------------------------+
547- et eu fa fi fr ga gl he hr hu id is it ja ko lg
548- 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0
549-
550- lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
551- +-----------------------------------------------------+
552- a2ps | [] [] () () [] [] [] |
553- aegis | () () () |
554- ant-phone | [] [] |
555- anubis | [] [] [] [] [] [] |
556- ap-utils | [] () [] |
557- aspell | [] |
558- bash | [] [] [] |
559- batchelor | [] |
560- bfd | [] |
561- binutils | [] |
562- bison | [] [] [] [] [] |
563- bluez-pin | [] [] [] |
564- clisp | |
565- clisp | [] |
566- console-tools | [] |
567- coreutils | [] [] |
568- cpio | [] [] [] [] [] |
569- darkstat | [] [] [] [] |
570- diffutils | [] [] [] [] [] [] |
571- e2fsprogs | [] |
572- enscript | [] [] [] [] |
573- error | [] [] [] |
574- fetchmail | [] [] () [] |
575- fileutils | [] [] [] |
576- findutils | [] [] [] [] [] |
577- flex | [] [] [] [] |
578- fslint | [] [] |
579- gas | |
580- gawk | [] [] [] |
581- gbiff | [] [] |
582- gcal | |
583- gcc | |
584- gettext | [] [] [] |
585- gettext-examples | [] [] [] |
586- gettext-runtime | [] [] [] [] |
587- gettext-tools | [] [] |
588- gimp-print | [] |
589- gliv | [] [] [] |
590- glunarclock | [] [] [] [] |
591- gnubiff | [] |
592- gnucash | [] [] () [] |
593- gnucash-glossary | [] [] |
594- gnupg | [] |
595- gpe-aerial | [] [] [] [] |
596- gpe-beam | [] [] [] [] |
597- gpe-calendar | [] [] [] [] |
598- gpe-clock | [] [] [] [] |
599- gpe-conf | [] [] [] [] |
600- gpe-contacts | [] [] [] [] |
601- gpe-edit | [] [] [] [] |
602- gpe-go | [] [] [] |
603- gpe-login | [] [] [] [] |
604- gpe-ownerinfo | [] [] [] [] |
605- gpe-sketchbook | [] [] [] [] |
606- gpe-su | [] [] [] [] |
607- gpe-taskmanager | [] [] [] [] |
608- gpe-timesheet | [] [] [] [] |
609- gpe-today | [] [] [] [] |
610- gpe-todo | [] [] [] [] |
611- gphoto2 | [] |
612- gprof | [] [] |
613- gpsdrive | () () [] |
614- gramadoir | () [] |
615- grep | [] [] [] [] [] |
616- gretl | |
617- gtick | [] [] [] |
618- hello | [] [] [] [] [] [] [] [] [] [] |
619- id-utils | [] [] [] [] |
620- indent | [] [] [] [] |
621- iso_3166 | [] [] [] |
622- iso_3166_1 | [] [] |
623- iso_3166_2 | |
624- iso_3166_3 | [] |
625- iso_4217 | [] [] [] [] [] [] [] [] |
626- iso_639 | [] |
627- jpilot | () () |
628- jtag | |
629- jwhois | [] [] [] [] () |
630- kbd | [] [] [] |
631- latrine | [] |
632- ld | |
633- libc | [] [] [] [] |
634- libgpewidget | [] [] [] |
635- libiconv | [] [] [] [] [] |
636- lifelines | |
637- lilypond | |
638- lingoteach | |
639- lingoteach_lessons | |
640- lynx | [] [] [] |
641- m4 | [] [] [] [] [] |
642- mailutils | [] [] [] |
643- make | [] [] [] [] |
644- man-db | [] |
645- minicom | [] [] [] [] |
646- mysecretdiary | [] [] [] |
647- nano | [] [] [] [] [] |
648- nano_1_0 | [] [] [] [] [] [] |
649- opcodes | [] [] |
650- parted | [] [] [] [] |
651- ptx | [] [] [] [] [] [] [] [] |
652- python | |
653- radius | [] [] |
654- recode | [] [] [] [] |
655- rpm | [] [] [] |
656- screem | |
657- scrollkeeper | [] [] [] [] [] |
658- sed | [] [] [] |
659- sh-utils | [] [] |
660- shared-mime-info | [] [] |
661- sharutils | [] [] |
662- silky | () |
663- skencil | [] [] |
664- sketch | [] [] |
665- soundtracker | |
666- sp | |
667- tar | [] [] [] [] [] [] |
668- texinfo | [] [] [] [] |
669- textutils | [] [] |
670- tin | |
671- tp-robot | [] |
672- tuxpaint | [] [] [] [] [] [] [] [] |
673- unicode-han-tra... | |
674- unicode-transla... | |
675- util-linux | [] [] [] |
676- vorbis-tools | [] [] [] |
677- wastesedge | |
678- wdiff | [] [] [] [] [] |
679- wget | [] [] [] |
680- xchat | [] [] [] |
681- xfree86_xkb_xml | [] [] |
682- xpad | [] [] |
683- +-----------------------------------------------------+
684- lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
685- 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63
686-
687- sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
688- +-----------------------------------------------------+
689- a2ps | [] [] [] [] | 16
690- aegis | | 0
691- ant-phone | | 3
692- anubis | [] [] | 9
693- ap-utils | () | 3
694- aspell | | 4
695- bash | | 9
696- batchelor | | 3
697- bfd | [] [] | 6
698- binutils | [] [] [] | 8
699- bison | [] [] | 14
700- bluez-pin | [] [] [] | 14
701- clisp | | 0
702- clisp | | 5
703- console-tools | | 3
704- coreutils | [] [] [] [] | 16
705- cpio | [] [] | 14
706- darkstat | [] [] [] () () | 12
707- diffutils | [] [] [] | 23
708- e2fsprogs | [] [] | 6
709- enscript | [] [] | 12
710- error | [] [] [] | 15
711- fetchmail | [] [] | 11
712- fileutils | [] [] [] [] [] | 17
713- findutils | [] [] [] [] [] [] | 29
714- flex | [] [] | 13
715- fslint | | 3
716- gas | [] | 3
717- gawk | [] [] | 12
718- gbiff | | 4
719- gcal | [] [] | 4
720- gcc | [] | 4
721- gettext | [] [] [] [] [] | 16
722- gettext-examples | [] [] [] [] [] | 14
723- gettext-runtime | [] [] [] [] [] [] [] [] | 22
724- gettext-tools | [] [] [] [] [] [] | 14
725- gimp-print | [] [] | 10
726- gliv | | 3
727- glunarclock | [] [] [] | 13
728- gnubiff | | 3
729- gnucash | [] [] | 9
730- gnucash-glossary | [] [] [] | 8
731- gnupg | [] [] [] [] | 17
732- gpe-aerial | [] | 7
733- gpe-beam | [] | 8
734- gpe-calendar | [] [] [] [] | 13
735- gpe-clock | [] [] [] | 10
736- gpe-conf | [] [] | 9
737- gpe-contacts | [] [] [] | 11
738- gpe-edit | [] [] [] [] [] | 12
739- gpe-go | | 5
740- gpe-login | [] [] [] [] [] | 13
741- gpe-ownerinfo | [] [] [] [] | 13
742- gpe-sketchbook | [] [] | 9
743- gpe-su | [] [] [] | 10
744- gpe-taskmanager | [] [] [] | 10
745- gpe-timesheet | [] [] [] [] | 12
746- gpe-today | [] [] [] [] [] | 13
747- gpe-todo | [] [] [] [] | 12
748- gphoto2 | [] [] [] | 11
749- gprof | [] [] | 9
750- gpsdrive | [] [] | 3
751- gramadoir | [] | 5
752- grep | [] [] [] [] | 26
753- gretl | | 3
754- gtick | | 7
755- hello | [] [] [] [] [] | 34
756- id-utils | [] [] | 12
757- indent | [] [] [] [] | 21
758- iso_3166 | [] [] [] [] [] [] [] | 27
759- iso_3166_1 | [] [] [] | 16
760- iso_3166_2 | | 0
761- iso_3166_3 | | 2
762- iso_4217 | [] [] [] [] [] [] | 24
763- iso_639 | | 1
764- jpilot | [] [] [] [] [] | 9
765- jtag | [] | 2
766- jwhois | () [] [] | 11
767- kbd | [] [] | 11
768- latrine | | 2
769- ld | [] [] | 5
770- libc | [] [] [] [] | 20
771- libgpewidget | [] [] [] [] | 13
772- libiconv | [] [] [] [] [] [] [] [] | 27
773- lifelines | [] | 2
774- lilypond | [] | 3
775- lingoteach | | 2
776- lingoteach_lessons | () | 0
777- lynx | [] [] [] | 14
778- m4 | [] [] | 15
779- mailutils | | 5
780- make | [] [] [] | 16
781- man-db | [] | 5
782- minicom | | 11
783- mysecretdiary | [] [] | 10
784- nano | [] [] [] [] | 17
785- nano_1_0 | [] [] [] | 17
786- opcodes | [] [] | 6
787- parted | [] [] [] | 15
788- ptx | [] [] | 22
789- python | | 0
790- radius | | 4
791- recode | [] [] [] | 20
792- rpm | [] [] | 9
793- screem | [] [] | 2
794- scrollkeeper | [] [] [] | 15
795- sed | [] [] [] [] [] [] | 24
796- sh-utils | [] [] | 14
797- shared-mime-info | [] [] | 7
798- sharutils | [] [] [] [] | 17
799- silky | () | 3
800- skencil | [] | 6
801- sketch | [] | 6
802- soundtracker | [] [] | 7
803- sp | [] | 3
804- tar | [] [] [] [] [] | 24
805- texinfo | [] [] [] | 14
806- textutils | [] [] [] [] | 16
807- tin | | 1
808- tp-robot | | 2
809- tuxpaint | [] [] [] [] [] | 29
810- unicode-han-tra... | | 0
811- unicode-transla... | | 2
812- util-linux | [] [] | 15
813- vorbis-tools | | 8
814- wastesedge | | 0
815- wdiff | [] [] [] | 18
816- wget | [] [] [] [] [] [] [] [] | 24
817- xchat | [] [] [] [] [] | 15
818- xfree86_xkb_xml | [] [] [] [] [] | 11
819- xpad | | 5
820- +-----------------------------------------------------+
821- 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
822- 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0 1373
823-
824- Some counters in the preceding matrix are higher than the number of
825-visible blocks let us expect. This is because a few extra PO files are
826-used for implementing regional variants of languages, or language
827-dialects.
828-
829- For a PO file in the matrix above to be effective, the package to
830-which it applies should also have been internationalized and
831-distributed as such by its maintainer. There might be an observable
832-lag between the mere existence a PO file and its wide availability in a
833-distribution.
834-
835- If January 2004 seems to be old, you may fetch a more recent copy of
836-this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
837-matrix with full percentage details can be found at
838-`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
839-
840-Using `gettext' in new packages
841-===============================
842-
843-If you are writing a freely available program and want to
844-internationalize it you are welcome to use GNU `gettext' in your
845-package. Of course you have to respect the GNU Library General Public
846-License which covers the use of the GNU `gettext' library. This means
847-in particular that even non-free programs can use `libintl' as a shared
848-library, whereas only free software can use `libintl' as a static
849-library or use modified versions of `libintl'.
850-
851- Once the sources are changed appropriately and the setup can handle
852-the use of `gettext' the only thing missing are the translations. The
853-Free Translation Project is also available for packages which are not
854-developed inside the GNU project. Therefore the information given above
855-applies also for every other Free Software Project. Contact
856-`translation@iro.umontreal.ca' to make the `.pot' files available to
857-the translation teams.
858-
859
860=== modified file 'Makefile.in'
861--- Makefile.in 2013-08-29 01:07:11 +0000
862+++ Makefile.in 2014-05-27 06:48:22 +0000
863@@ -1,4 +1,4 @@
864-# Makefile.in generated by automake 1.14 from Makefile.am.
865+# Makefile.in generated by automake 1.14.1 from Makefile.am.
866 # @configure_input@
867
868 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
869@@ -84,9 +84,9 @@
870 $(srcdir)/config.h.in mkinstalldirs $(srcdir)/lxpanel.pc.in \
871 $(top_srcdir)/data/default/panels/panel.in \
872 $(top_srcdir)/data/two_panels/panels/top.in \
873- $(top_srcdir)/data/two_panels/panels/bottom.in ABOUT-NLS \
874- AUTHORS COPYING ChangeLog README ar-lib compile config.guess \
875- config.rpath config.sub depcomp install-sh missing ltmain.sh
876+ $(top_srcdir)/data/two_panels/panels/bottom.in AUTHORS COPYING \
877+ ChangeLog README ar-lib compile config.guess config.rpath \
878+ config.sub depcomp install-sh missing ltmain.sh
879 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
880 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
881 $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intltool.m4 \
882@@ -749,9 +749,10 @@
883 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
884 && am__cwd=`pwd` \
885 && $(am__cd) $(distdir)/_build \
886- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
887+ && ../configure \
888 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
889 $(DISTCHECK_CONFIGURE_FLAGS) \
890+ --srcdir=.. --prefix="$$dc_install_base" \
891 && $(MAKE) $(AM_MAKEFLAGS) \
892 && $(MAKE) $(AM_MAKEFLAGS) dvi \
893 && $(MAKE) $(AM_MAKEFLAGS) check \
894
895=== modified file 'aclocal.m4'
896--- aclocal.m4 2013-08-29 01:07:11 +0000
897+++ aclocal.m4 2014-05-27 06:48:22 +0000
898@@ -1,4 +1,4 @@
899-# generated automatically by aclocal 1.14 -*- Autoconf -*-
900+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
901
902 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
903
904@@ -337,7 +337,6 @@
905 dnl
906 glib_DEFUN([GLIB_GNU_GETTEXT],
907 [AC_REQUIRE([AC_PROG_CC])dnl
908- AC_REQUIRE([AC_HEADER_STDC])dnl
909
910 GLIB_LC_MESSAGES
911 GLIB_WITH_NLS
912@@ -687,7 +686,7 @@
913 [am__api_version='1.14'
914 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
915 dnl require some minimum version. Point them to the right macro.
916-m4_if([$1], [1.14], [],
917+m4_if([$1], [1.14.1], [],
918 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
919 ])
920
921@@ -703,7 +702,7 @@
922 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
923 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
924 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
925-[AM_AUTOMAKE_VERSION([1.14])dnl
926+[AM_AUTOMAKE_VERSION([1.14.1])dnl
927 m4_ifndef([AC_AUTOCONF_VERSION],
928 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
929 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
930
931=== modified file 'configure'
932--- configure 2014-01-30 22:32:55 +0000
933+++ configure 2014-05-27 06:48:22 +0000
934@@ -1,6 +1,6 @@
935 #! /bin/sh
936 # Guess values for system-dependent variables and create Makefiles.
937-# Generated by GNU Autoconf 2.69 for lxpanel 0.6.1.
938+# Generated by GNU Autoconf 2.69 for lxpanel 0.6.2.
939 #
940 # Report bugs to <http://lxde.org/>.
941 #
942@@ -590,8 +590,8 @@
943 # Identity of this package.
944 PACKAGE_NAME='lxpanel'
945 PACKAGE_TARNAME='lxpanel'
946-PACKAGE_VERSION='0.6.1'
947-PACKAGE_STRING='lxpanel 0.6.1'
948+PACKAGE_VERSION='0.6.2'
949+PACKAGE_STRING='lxpanel 0.6.2'
950 PACKAGE_BUGREPORT='http://lxde.org/'
951 PACKAGE_URL=''
952
953@@ -1425,7 +1425,7 @@
954 # Omit some internal or obsolete options to make the list less imposing.
955 # This message is too long to be a string in the A/UX 3.1 sh.
956 cat <<_ACEOF
957-\`configure' configures lxpanel 0.6.1 to adapt to many kinds of systems.
958+\`configure' configures lxpanel 0.6.2 to adapt to many kinds of systems.
959
960 Usage: $0 [OPTION]... [VAR=VALUE]...
961
962@@ -1499,7 +1499,7 @@
963
964 if test -n "$ac_init_help"; then
965 case $ac_init_help in
966- short | recursive ) echo "Configuration of lxpanel 0.6.1:";;
967+ short | recursive ) echo "Configuration of lxpanel 0.6.2:";;
968 esac
969 cat <<\_ACEOF
970
971@@ -1652,7 +1652,7 @@
972 test -n "$ac_init_help" && exit $ac_status
973 if $ac_init_version; then
974 cat <<\_ACEOF
975-lxpanel configure 0.6.1
976+lxpanel configure 0.6.2
977 generated by GNU Autoconf 2.69
978
979 Copyright (C) 2012 Free Software Foundation, Inc.
980@@ -2021,7 +2021,7 @@
981 This file contains any messages produced by compilers while
982 running configure, to aid debugging if configure makes a mistake.
983
984-It was created by lxpanel $as_me 0.6.1, which was
985+It was created by lxpanel $as_me 0.6.2, which was
986 generated by GNU Autoconf 2.69. Invocation command line was
987
988 $ $0 $@
989@@ -2884,7 +2884,7 @@
990
991 # Define the identity of the package.
992 PACKAGE='lxpanel'
993- VERSION='0.6.1'
994+ VERSION='0.6.2'
995
996
997 cat >>confdefs.h <<_ACEOF
998@@ -17249,7 +17249,7 @@
999 # report actual input values of CONFIG_FILES etc. instead of their
1000 # values after options handling.
1001 ac_log="
1002-This file was extended by lxpanel $as_me 0.6.1, which was
1003+This file was extended by lxpanel $as_me 0.6.2, which was
1004 generated by GNU Autoconf 2.69. Invocation command line was
1005
1006 CONFIG_FILES = $CONFIG_FILES
1007@@ -17315,7 +17315,7 @@
1008 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1009 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1010 ac_cs_version="\\
1011-lxpanel config.status 0.6.1
1012+lxpanel config.status 0.6.2
1013 configured by $0, generated by GNU Autoconf 2.69,
1014 with options \\"\$ac_cs_config\\"
1015
1016
1017=== modified file 'configure.ac'
1018--- configure.ac 2014-01-30 22:32:55 +0000
1019+++ configure.ac 2014-05-27 06:48:22 +0000
1020@@ -1,5 +1,5 @@
1021 AC_PREREQ(2.53)
1022-AC_INIT(lxpanel, 0.6.1, http://lxde.org/)
1023+AC_INIT(lxpanel, 0.6.2, http://lxde.org/)
1024 AM_INIT_AUTOMAKE([-Wall foreign])
1025 AC_CONFIG_HEADER([config.h])
1026 AC_CONFIG_MACRO_DIR([m4])
1027
1028=== modified file 'data/Makefile.in'
1029--- data/Makefile.in 2013-08-29 01:07:11 +0000
1030+++ data/Makefile.in 2014-05-27 06:48:22 +0000
1031@@ -1,4 +1,4 @@
1032-# Makefile.in generated by automake 1.14 from Makefile.am.
1033+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1034 # @configure_input@
1035
1036 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1037
1038=== modified file 'data/ui/netstatus.ui'
1039--- data/ui/netstatus.ui 2012-04-20 17:01:48 +0000
1040+++ data/ui/netstatus.ui 2014-05-27 06:48:22 +0000
1041@@ -1,1 +1,2 @@
1042-<?xml version="1.0"?><interface><requires lib="gtk+" version="2.16"/><object class="GtkDialog" id="network_status_dialog"><property name="border_width">5</property><property name="resizable">False</property><property name="window_position">center</property><property name="default_width">300</property><property name="type_hint">dialog</property><property name="has_separator">False</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox2"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkNotebook" id="notebook1"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">5</property><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="border_width">12</property><property name="spacing">18</property><child><object class="GtkVBox" id="connection_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label3"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Connection&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox6"><property name="visible">True</property><child><object class="GtkLabel" id="label43"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="connection_hbox"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkTable" id="connection_table"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="label5"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Status:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="status_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label16"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">_Name:</property><property name="use_underline">True</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkComboBoxEntry" id="name_combo"><property name="visible">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child></object><packing><property name="position">0</property></packing></child><child><placeholder/></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="activity_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label4"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Activity&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox8"><property name="visible">True</property><child><object class="GtkLabel" id="label44"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table2"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="received_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="sent_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label11"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Received:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label12"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Sent:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkVBox" id="signal_strength_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label48"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Signal Strength&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox14"><property name="visible">True</property><child><object class="GtkLabel" id="label49"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox15"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkProgressBar" id="signal_strength_bar"><property name="visible">True</property><property name="pulse_step">0.10000000149</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkLabel" id="signal_strength_label"><property name="visible">True</property><property name="label" translatable="yes">0%</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object></child><child type="tab"><object class="GtkLabel" id="label1"><property name="visible">True</property><property name="label" translatable="yes">General</property></object><packing><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="vbox2"><property name="visible">True</property><property name="border_width">12</property><property name="spacing">18</property><child><object class="GtkVBox" id="inet4_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label25"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv4)&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox11"><property name="visible">True</property><child><object class="GtkLabel" id="label45"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="inet4_table"><property name="visible">True</property><property name="n_rows">4</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="inet4_addr_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_dest_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Destination:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_bcast_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Broadcast:</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_mask_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Subnet Mask:</property></object><packing><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_dest_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_bcast_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_mask_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="inet6_frame"><property name="spacing">6</property><child><object class="GtkLabel" id="label26"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv6)&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox12"><property name="visible">True</property><child><object class="GtkLabel" id="label46"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table5"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="label39"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label40"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Scope:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet6_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet6_scope_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkVBox" id="dev_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="dev_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Network Device&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox13"><property name="visible">True</property><child><object class="GtkLabel" id="label47"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table6"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="dev_addr_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_type_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_type_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Type:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object><packing><property name="position">1</property></packing></child><child type="tab"><object class="GtkLabel" id="label2"><property name="visible">True</property><property name="label" translatable="yes">Support</property></object><packing><property name="position">1</property><property name="tab_fill">False</property></packing></child></object><packing><property name="position">1</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area2"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="helpbutton1"><property name="label">gtk-help</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="configure_button"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="receives_default">False</property><child><object class="GtkAlignment" id="alignment2"><property name="visible">True</property><property name="xscale">0</property><property name="yscale">0</property><child><object class="GtkHBox" id="hbox5"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkImage" id="image2"><property name="visible">True</property><property name="stock">gtk-preferences</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkLabel" id="label42"><property name="visible">True</property><property name="label" translatable="yes">Con_figure</property><property name="use_underline">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><object class="GtkButton" id="close_button"><property name="label">gtk-close</property><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-11">helpbutton1</action-widget><action-widget response="0">configure_button</action-widget><action-widget response="-7">close_button</action-widget></action-widgets></object></interface>
1043+<?xml version="1.0"?><interface><requires lib="gtk+" version="2.16"/>
1044+<object class="GtkDialog" id="network_status_dialog"><property name="border_width">5</property><property name="resizable">False</property><property name="window_position">center</property><property name="default_width">300</property><property name="type_hint">dialog</property><property name="has_separator">False</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox2"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkNotebook" id="notebook1"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">5</property><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="border_width">12</property><property name="spacing">18</property><child><object class="GtkVBox" id="connection_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label3"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Connection&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox6"><property name="visible">True</property><child><object class="GtkLabel" id="label43"><property name="visible">True</property><property name="label"> </property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="connection_hbox"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkTable" id="connection_table"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="label5"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Status:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="status_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label16"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">_Name:</property><property name="use_underline">True</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkComboBoxEntry" id="name_combo"><property name="visible">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child></object><packing><property name="position">0</property></packing></child><child><placeholder/></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="activity_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label4"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Activity&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox8"><property name="visible">True</property><child><object class="GtkLabel" id="label44"><property name="visible">True</property><property name="label"> </property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table2"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="received_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="sent_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label11"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Received:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label12"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Sent:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkVBox" id="signal_strength_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label48"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Signal Strength&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox14"><property name="visible">True</property><child><object class="GtkLabel" id="label49"><property name="visible">True</property><property name="label"> </property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox15"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkProgressBar" id="signal_strength_bar"><property name="visible">True</property><property name="pulse_step">0.10000000149</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkLabel" id="signal_strength_label"><property name="visible">True</property><property name="label" translatable="yes">0%</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object></child><child type="tab"><object class="GtkLabel" id="label1"><property name="visible">True</property><property name="label" translatable="yes">General</property></object><packing><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="vbox2"><property name="visible">True</property><property name="border_width">12</property><property name="spacing">18</property><child><object class="GtkVBox" id="inet4_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label25"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv4)&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox11"><property name="visible">True</property><child><object class="GtkLabel" id="label45"><property name="visible">True</property><property name="label"> </property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="inet4_table"><property name="visible">True</property><property name="n_rows">4</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="inet4_addr_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_dest_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Destination:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_bcast_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Broadcast:</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_mask_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Subnet Mask:</property></object><packing><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_dest_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_bcast_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_mask_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="inet6_frame"><property name="spacing">6</property><child><object class="GtkLabel" id="label26"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv6)&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox12"><property name="visible">True</property><child><object class="GtkLabel" id="label46"><property name="visible">True</property><property name="label"> </property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table5"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="label39"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label40"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Scope:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet6_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet6_scope_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkVBox" id="dev_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="dev_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Network Device&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox13"><property name="visible">True</property><child><object class="GtkLabel" id="label47"><property name="visible">True</property><property name="label"> </property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table6"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="dev_addr_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_type_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_type_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Type:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object><packing><property name="position">1</property></packing></child><child type="tab"><object class="GtkLabel" id="label2"><property name="visible">True</property><property name="label" translatable="yes">Support</property></object><packing><property name="position">1</property><property name="tab_fill">False</property></packing></child></object><packing><property name="position">1</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area2"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="helpbutton1"><property name="label">gtk-help</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="configure_button"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="receives_default">False</property><child><object class="GtkAlignment" id="alignment2"><property name="visible">True</property><property name="xscale">0</property><property name="yscale">0</property><child><object class="GtkHBox" id="hbox5"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkImage" id="image2"><property name="visible">True</property><property name="stock">gtk-preferences</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkLabel" id="label42"><property name="visible">True</property><property name="label" translatable="yes">Con_figure</property><property name="use_underline">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><object class="GtkButton" id="close_button"><property name="label">gtk-close</property><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-11">helpbutton1</action-widget><action-widget response="0">configure_button</action-widget><action-widget response="-7">close_button</action-widget></action-widgets></object></interface>
1045
1046=== modified file 'debian/changelog'
1047--- debian/changelog 2014-01-30 22:32:55 +0000
1048+++ debian/changelog 2014-05-27 06:48:22 +0000
1049@@ -1,3 +1,9 @@
1050+lxpanel (0.6.2-0ubuntu1) utopic; urgency=medium
1051+
1052+ * New upstream release.
1053+
1054+ -- Jackson Doak <noskcaj@ubuntu.com> Tue, 27 May 2014 09:12:41 +1000
1055+
1056 lxpanel (0.6.1-0ubuntu3) trusty; urgency=medium
1057
1058 * Reverted the changes in 0.6.1-0ubuntu2 as a preventative measure. Removing
1059
1060=== modified file 'debian/patches/02-desktop-number.patch'
1061--- debian/patches/02-desktop-number.patch 2012-07-15 13:00:20 +0000
1062+++ debian/patches/02-desktop-number.patch 2014-05-27 06:48:22 +0000
1063@@ -1,11 +1,13 @@
1064 Author: Julien Lavergne <gilir@ubuntu.com>
1065 Description: Add configuration for desktop number for the pager plugin.
1066
1067-Index: lxpanel/src/plugins/pager.c
1068-===================================================================
1069---- lxpanel.orig/src/plugins/pager.c 2012-07-15 13:03:42.000000000 +0200
1070-+++ lxpanel/src/plugins/pager.c 2012-07-15 13:03:45.000000000 +0200
1071-@@ -815,6 +815,80 @@
1072+---
1073+ src/plugins/pager.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1074+ 1 file changed, 75 insertions(+), 1 deletion(-)
1075+
1076+--- a/src/plugins/pager.c
1077++++ b/src/plugins/pager.c
1078+@@ -820,6 +820,80 @@ static void pager_destructor(Plugin * p)
1079 g_free(pg);
1080 }
1081
1082@@ -86,7 +88,7 @@
1083 /* Callback when panel configuration changes. */
1084 static void pager_panel_configuration_changed(Plugin * p)
1085 {
1086-@@ -840,7 +914,7 @@
1087+@@ -845,7 +919,7 @@ PluginClass pager_plugin_class = {
1088
1089 constructor : pager_constructor,
1090 destructor : pager_destructor,
1091
1092=== modified file 'man/Makefile.in'
1093--- man/Makefile.in 2013-08-29 01:07:11 +0000
1094+++ man/Makefile.in 2014-05-27 06:48:22 +0000
1095@@ -1,4 +1,4 @@
1096-# Makefile.in generated by automake 1.14 from Makefile.am.
1097+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1098 # @configure_input@
1099
1100 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1101
1102=== modified file 'src/Makefile.in'
1103--- src/Makefile.in 2013-08-29 01:07:11 +0000
1104+++ src/Makefile.in 2014-05-27 06:48:22 +0000
1105@@ -1,4 +1,4 @@
1106-# Makefile.in generated by automake 1.14 from Makefile.am.
1107+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1108 # @configure_input@
1109
1110 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1111
1112=== modified file 'src/misc.c'
1113--- src/misc.c 2013-08-29 01:07:11 +0000
1114+++ src/misc.c 2014-05-27 06:48:22 +0000
1115@@ -1361,8 +1361,25 @@
1116 {
1117 if (g_path_is_absolute(name))
1118 {
1119- /* Absolute path. */
1120- icon = gdk_pixbuf_new_from_file_at_scale(name, width, height, TRUE, NULL);
1121+ /* Absolute path.
1122+ * To prevent the ugly icon, try to search icon from icon theme first,
1123+ * instead of loading icon from pixmaps dir */
1124+ GtkIconTheme * theme = gtk_icon_theme_get_default();
1125+ char *sub_suffix = strrchr(name, '.');
1126+ char *sub_deli = strrchr(name, '/');
1127+ int sub_len = sub_suffix - sub_deli - 1;
1128+ if (sub_len > 0) {
1129+ char *icon_name = g_strndup(&sub_deli[1], sub_len);
1130+ //LOG(LOG_ALL, "lxpanel: icon_name:%s\n", icon_name);
1131+ icon = load_icon_from_theme(theme, icon_name, width, height);
1132+ g_free(icon_name);
1133+ }
1134+
1135+ if (icon == NULL) {
1136+ /* Still not found... */
1137+ //LOG(LOG_ALL, "lxpanel: icon from theme not found\n");
1138+ icon = gdk_pixbuf_new_from_file_at_scale(name, width, height, TRUE, NULL);
1139+ }
1140 }
1141 else
1142 {
1143@@ -1374,21 +1391,27 @@
1144 || (g_ascii_strcasecmp(&suffix[1], "svg") == 0)
1145 || (g_ascii_strcasecmp(&suffix[1], "xpm") == 0)))
1146 {
1147- /* The file extension indicates it could be in the system pixmap directories. */
1148- icon = load_icon_file(name, width, height);
1149+ /* The file extension indicates it could be in the system pixmap directories.
1150+ * But in order to keep the icons in line with the icon theme, it's better to check
1151+ * the icon in the current icon theme. Remove the suffix first. */
1152+ char * icon_name = g_strndup(name, suffix - name);
1153+ //LOG(LOG_ALL, "lxpanel: icon_name.suffix:%s.%s\n", icon_name, suffix);
1154+ icon = load_icon_from_theme(theme, icon_name, width, height);
1155+ g_free(icon_name);
1156+
1157+ /* Check the icon can be found in icon theme */
1158 if (icon == NULL)
1159 {
1160- /* Not found.
1161- * Let's remove the suffix, and see if this name can match an icon in the current icon theme. */
1162- char * icon_name = g_strndup(name, suffix - name);
1163- icon = load_icon_from_theme(theme, icon_name, width, height);
1164- g_free(icon_name);
1165+ /* Not found in icon theme, try to load from file directly */
1166+ //LOG(LOG_ALL, "lxpanel: icon from theme not found\n");
1167+ icon = load_icon_file(name, width, height);
1168 }
1169 }
1170 else
1171 {
1172- /* No file extension. It could be an icon name in the icon theme. */
1173- icon = load_icon_from_theme(theme, name, width, height);
1174+ /* No file extension. It could be an icon name in the icon theme. */
1175+ //LOG(LOG_ALL, "lxpanel: icon has name:%s\n", name);
1176+ icon = load_icon_from_theme(theme, name, width, height);
1177 }
1178 }
1179 }
1180@@ -1396,6 +1419,7 @@
1181 /* Fall back to generic icons. */
1182 if ((icon == NULL) && (use_fallback))
1183 {
1184+ LOG(LOG_ALL, "lxpanel: using fallback icon for '%s'\n", name);
1185 GtkIconTheme * theme = gtk_icon_theme_get_default();
1186 icon = load_icon_from_theme(theme, "application-x-executable", width, height);
1187 if (icon == NULL)
1188
1189=== modified file 'src/plugins/Makefile.in'
1190--- src/plugins/Makefile.in 2013-08-29 01:07:11 +0000
1191+++ src/plugins/Makefile.in 2014-05-27 06:48:22 +0000
1192@@ -1,4 +1,4 @@
1193-# Makefile.in generated by automake 1.14 from Makefile.am.
1194+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1195 # @configure_input@
1196
1197 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1198
1199=== modified file 'src/plugins/batt/Makefile.in'
1200--- src/plugins/batt/Makefile.in 2013-08-29 01:07:11 +0000
1201+++ src/plugins/batt/Makefile.in 2014-05-27 06:48:22 +0000
1202@@ -1,4 +1,4 @@
1203-# Makefile.in generated by automake 1.14 from Makefile.am.
1204+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1205 # @configure_input@
1206
1207 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1208
1209=== modified file 'src/plugins/batt/batt.c'
1210--- src/plugins/batt/batt.c 2012-08-23 00:46:05 +0000
1211+++ src/plugins/batt/batt.c 2014-05-27 06:48:22 +0000
1212@@ -127,18 +127,18 @@
1213 cr = cairo_create(lx_b->pixmap);
1214 cairo_set_line_width (cr, 1.0);
1215
1216- /* no battery is found */
1217- if( b == NULL )
1218- {
1219- gtk_widget_set_tooltip_text( lx_b->drawingArea, _("No batteries found") );
1220- return;
1221- }
1222-
1223 /* draw background */
1224 gdk_cairo_set_source_color(cr, &lx_b->background);
1225 cairo_rectangle(cr, 0, 0, lx_b->width, lx_b->height);
1226 cairo_fill(cr);
1227
1228+ /* no battery is found */
1229+ if( b == NULL )
1230+ {
1231+ gtk_widget_set_tooltip_text( lx_b->drawingArea, _("No batteries found") );
1232+ goto update_done;
1233+ }
1234+
1235 /* fixme: only one battery supported */
1236
1237 rate = lx_b->b->current_now;
1238@@ -236,6 +236,8 @@
1239 cairo_fill(cr);
1240
1241 }
1242+
1243+update_done:
1244 if( repaint )
1245 gtk_widget_queue_draw( lx_b->drawingArea );
1246
1247@@ -245,12 +247,19 @@
1248
1249 /* This callback is called every 3 seconds */
1250 static int update_timout(lx_battery *lx_b) {
1251+ battery *bat;
1252 GDK_THREADS_ENTER();
1253 lx_b->state_elapsed_time++;
1254 lx_b->info_elapsed_time++;
1255
1256- /* check the batteries every 3 seconds */
1257- battery_update( lx_b->b );
1258+ bat = battery_update( lx_b->b );
1259+ if (bat == NULL)
1260+ {
1261+ battery_free(lx_b->b);
1262+
1263+ /* maybe in the mean time a battery has been inserted. */
1264+ lx_b->b = battery_get();
1265+ }
1266
1267 update_display( lx_b, TRUE );
1268
1269@@ -337,10 +346,6 @@
1270 /* get available battery */
1271 lx_b->b = battery_get ();
1272
1273- /* no battery available */
1274- if ( lx_b->b == NULL )
1275- goto error;
1276-
1277 p->pwid = gtk_event_box_new();
1278 GTK_WIDGET_SET_FLAGS( p->pwid, GTK_NO_WINDOW );
1279 gtk_container_set_border_width( GTK_CONTAINER(p->pwid), 1 );
1280@@ -472,6 +477,9 @@
1281
1282 lx_battery *b = (lx_battery *) p->priv;
1283
1284+ if (b->b != NULL)
1285+ battery_free(b->b);
1286+
1287 if (b->pixmap)
1288 cairo_surface_destroy(b->pixmap);
1289
1290
1291=== modified file 'src/plugins/batt/batt_sys.c'
1292--- src/plugins/batt/batt_sys.c 2013-08-29 01:07:11 +0000
1293+++ src/plugins/batt/batt_sys.c 2014-05-27 06:48:22 +0000
1294@@ -143,10 +143,34 @@
1295 }
1296
1297
1298-void battery_update(battery *b)
1299+static gboolean battery_inserted(gchar* path)
1300+{
1301+ if (path == NULL)
1302+ return FALSE;
1303+
1304+ GString *dirname = g_string_new(ACPI_PATH_SYS_POWER_SUPPY);
1305+ GDir *dir;
1306+
1307+ g_string_append_printf (dirname, "/%s/", path);
1308+ dir = g_dir_open(dirname->str, 0, NULL);
1309+ if (dir)
1310+ g_dir_close(dir);
1311+ g_string_free(dirname, TRUE);
1312+
1313+ return dir ? TRUE : FALSE;
1314+}
1315+
1316+
1317+battery* battery_update(battery *b)
1318 {
1319 gchar *gctmp;
1320
1321+ if (b == NULL)
1322+ return NULL;
1323+
1324+ if (!battery_inserted(b->path))
1325+ return NULL;
1326+
1327 /* read from sysfs */
1328 b->charge_now = get_gint_from_infofile(b, "charge_now");
1329 b->energy_now = get_gint_from_infofile(b, "energy_now");
1330@@ -255,6 +279,8 @@
1331 b->poststr = NULL;
1332 b->seconds = -1;
1333 }
1334+
1335+ return b;
1336 }
1337
1338
1339@@ -285,6 +311,14 @@
1340 return b;
1341 }
1342
1343+void battery_free(battery* bat)
1344+{
1345+ if (bat) {
1346+ g_free(bat->path);
1347+ g_free(bat);
1348+ }
1349+}
1350+
1351 gboolean battery_is_charging( battery *b )
1352 {
1353 if (!b->state)
1354@@ -300,3 +334,4 @@
1355 }
1356
1357
1358+/* vim: set sw=4 et sts=4 : */
1359
1360=== modified file 'src/plugins/batt/batt_sys.h'
1361--- src/plugins/batt/batt_sys.h 2012-05-04 19:33:50 +0000
1362+++ src/plugins/batt/batt_sys.h 2014-05-27 06:48:22 +0000
1363@@ -35,7 +35,7 @@
1364 typedef struct battery {
1365 int battery_num;
1366 /* path to battery dir */
1367- const gchar *path;
1368+ gchar *path;
1369 /* sysfs file contents */
1370 int charge_now;
1371 int energy_now;
1372@@ -55,9 +55,10 @@
1373 } battery;
1374
1375 battery *battery_get();
1376-void battery_update( battery *b );
1377+battery *battery_update( battery *b );
1378 void battery_print(battery *b, int show_capacity);
1379 gboolean battery_is_charging( battery *b );
1380 gint battery_get_remaining( battery *b );
1381+void battery_free(battery* bat);
1382
1383 #endif
1384
1385=== modified file 'src/plugins/cpu/Makefile.in'
1386--- src/plugins/cpu/Makefile.in 2013-08-29 01:07:11 +0000
1387+++ src/plugins/cpu/Makefile.in 2014-05-27 06:48:22 +0000
1388@@ -1,4 +1,4 @@
1389-# Makefile.in generated by automake 1.14 from Makefile.am.
1390+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1391 # @configure_input@
1392
1393 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1394
1395=== modified file 'src/plugins/cpufreq/Makefile.in'
1396--- src/plugins/cpufreq/Makefile.in 2013-08-29 01:07:11 +0000
1397+++ src/plugins/cpufreq/Makefile.in 2014-05-27 06:48:22 +0000
1398@@ -1,4 +1,4 @@
1399-# Makefile.in generated by automake 1.14 from Makefile.am.
1400+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1401 # @configure_input@
1402
1403 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1404
1405=== modified file 'src/plugins/deskno/Makefile.in'
1406--- src/plugins/deskno/Makefile.in 2013-08-29 01:07:11 +0000
1407+++ src/plugins/deskno/Makefile.in 2014-05-27 06:48:22 +0000
1408@@ -1,4 +1,4 @@
1409-# Makefile.in generated by automake 1.14 from Makefile.am.
1410+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1411 # @configure_input@
1412
1413 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1414
1415=== modified file 'src/plugins/indicator/Makefile.in'
1416--- src/plugins/indicator/Makefile.in 2013-08-29 01:07:11 +0000
1417+++ src/plugins/indicator/Makefile.in 2014-05-27 06:48:22 +0000
1418@@ -1,4 +1,4 @@
1419-# Makefile.in generated by automake 1.14 from Makefile.am.
1420+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1421 # @configure_input@
1422
1423 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1424
1425=== modified file 'src/plugins/kbled/Makefile.in'
1426--- src/plugins/kbled/Makefile.in 2013-08-29 01:07:11 +0000
1427+++ src/plugins/kbled/Makefile.in 2014-05-27 06:48:22 +0000
1428@@ -1,4 +1,4 @@
1429-# Makefile.in generated by automake 1.14 from Makefile.am.
1430+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1431 # @configure_input@
1432
1433 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1434
1435=== modified file 'src/plugins/menu.c'
1436--- src/plugins/menu.c 2013-08-29 01:07:11 +0000
1437+++ src/plugins/menu.c 2014-05-27 06:48:22 +0000
1438@@ -198,8 +198,16 @@
1439
1440 static void on_menu_item( GtkMenuItem* mi, MenuCacheItem* item )
1441 {
1442- lxpanel_launch_app( menu_cache_app_get_exec(MENU_CACHE_APP(item)),
1443- NULL, menu_cache_app_get_use_terminal(MENU_CACHE_APP(item)));
1444+ char * exec;
1445+ /* handle %c, %i field codes */
1446+ exec = translate_exec_to_cmd(
1447+ menu_cache_app_get_exec(MENU_CACHE_APP(item)),
1448+ menu_cache_item_get_icon(item),
1449+ menu_cache_item_get_name(item),
1450+ NULL );
1451+ lxpanel_launch_app(exec, NULL,
1452+ menu_cache_app_get_use_terminal(MENU_CACHE_APP(item)));
1453+ g_free(exec);
1454 }
1455
1456 /* load icon when mapping the menu item to speed up */
1457@@ -214,7 +222,10 @@
1458 int w, h;
1459 /* FIXME: this is inefficient */
1460 gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h);
1461+ //LOG(LOG_ALL, "menu: size lookup -- w:%d, h:%d\n", w, h);
1462 item = g_object_get_qdata(G_OBJECT(mi), SYS_MENU_ITEM_ID);
1463+ /* There may be some stupid icon name... */
1464+ //LOG(LOG_ALL, "menu: item name:%s\n", menu_cache_item_get_name(item));
1465 icon = lxpanel_load_icon(menu_cache_item_get_icon(item), w, h, TRUE);
1466 if (icon)
1467 {
1468
1469=== modified file 'src/plugins/monitors/Makefile.in'
1470--- src/plugins/monitors/Makefile.in 2013-08-29 01:07:11 +0000
1471+++ src/plugins/monitors/Makefile.in 2014-05-27 06:48:22 +0000
1472@@ -1,4 +1,4 @@
1473-# Makefile.in generated by automake 1.14 from Makefile.am.
1474+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1475 # @configure_input@
1476
1477 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1478
1479=== modified file 'src/plugins/monitors/monitors.c'
1480--- src/plugins/monitors/monitors.c 2013-08-29 01:07:11 +0000
1481+++ src/plugins/monitors/monitors.c 2014-05-27 06:48:22 +0000
1482@@ -67,6 +67,7 @@
1483
1484 #include <stdlib.h>
1485 #include <glib/gi18n.h>
1486+#include <errno.h>
1487
1488 #include "plugin.h"
1489 #include "panel.h"
1490@@ -294,58 +295,72 @@
1491 ENTER;
1492
1493 FILE *meminfo;
1494- int mem_total = 0;
1495- int mem_free = 0;
1496- int mem_buffers = 0;
1497- int mem_cached = 0;
1498-
1499- if (m->stats && m->pixmap)
1500- {
1501- meminfo = fopen("/proc/meminfo", "r");
1502- if (!meminfo)
1503- RET(FALSE);
1504-
1505- if (fscanf(meminfo, "MemTotal: %d kB\n", &mem_total) != 1) {
1506- fclose (meminfo);
1507- RET(FALSE);
1508- }
1509- if (fscanf(meminfo, "MemFree: %d kB\n", &mem_free) != 1) {
1510- fclose (meminfo);
1511- RET(FALSE);
1512- }
1513- if (fscanf(meminfo, "Buffers: %d kB\n", &mem_buffers) != 1) {
1514- fclose (meminfo);
1515- RET(FALSE);
1516- }
1517- if (fscanf(meminfo, "Cached: %d kB\n", &mem_cached) != 1) {
1518- fclose (meminfo);
1519- RET(FALSE);
1520- }
1521-
1522- fclose(meminfo);
1523-
1524- m->total = mem_total;
1525-
1526- /* Adding stats to the buffer:
1527- * It is debatable if 'mem_buffers' counts as free or not. I'll go with
1528- * 'free', because it can be flushed fairly quickly, and generally
1529- * isn't necessary to keep in memory.
1530- * It is hard to draw the line, which caches should be counted as free,
1531- * and which not. Pagecaches, dentry, and inode caches are quickly
1532- * filled up again for almost any use case. Hence I would not count
1533- * them as 'free'.
1534- * 'mem_cached' definitely counts as 'free' because it is immediately
1535- * released should any application need it. */
1536- m->stats[m->ring_cursor] = (mem_total - mem_buffers - mem_free -
1537- mem_cached) / (float)mem_total; m->ring_cursor++;
1538-
1539- if (m->ring_cursor >= m->pixmap_width)
1540- m->ring_cursor = 0;
1541-
1542-
1543- /* Redraw the pixmap, with the new sample */
1544- redraw_pixmap (m);
1545- }
1546+ int const buflen = 80;
1547+ char buf[buflen];
1548+ long int mem_total = 0;
1549+ long int mem_free = 0;
1550+ long int mem_buffers = 0;
1551+ long int mem_cached = 0;
1552+ unsigned int readmask = 0x8 | 0x4 | 0x2 | 0x1;
1553+
1554+ if (!m->stats || !m->pixmap)
1555+ RET(TRUE);
1556+
1557+ meminfo = fopen("/proc/meminfo", "r");
1558+ if (!meminfo) {
1559+ ERR("monitors: Could not open /proc/meminfo: %d, %s\n",
1560+ errno, strerror(errno));
1561+ RET(FALSE);
1562+ }
1563+
1564+ while (readmask && fgets(buf, buflen, meminfo)) {
1565+ if (sscanf(buf, "MemTotal: %ld kB\n", &mem_total) == 1) {
1566+ readmask ^= 0x1;
1567+ continue;
1568+ }
1569+ if (sscanf(buf, "MemFree: %ld kB\n", &mem_free) == 1) {
1570+ readmask ^= 0x2;
1571+ continue;
1572+ }
1573+ if (sscanf(buf, "Buffers: %ld kB\n", &mem_buffers) == 1) {
1574+ readmask ^= 0x4;
1575+ continue;
1576+ }
1577+ if (sscanf(buf, "Cached: %ld kB\n", &mem_cached) == 1) {
1578+ readmask ^= 0x8;
1579+ continue;
1580+ }
1581+ }
1582+
1583+ fclose(meminfo);
1584+
1585+ if (readmask) {
1586+ ERR("monitors: Couldn't read all values from /proc/meminfo: "
1587+ "readmask %x\n", readmask);
1588+ RET(FALSE);
1589+ }
1590+
1591+ m->total = mem_total;
1592+
1593+ /* Adding stats to the buffer:
1594+ * It is debatable if 'mem_buffers' counts as free or not. I'll go with
1595+ * 'free', because it can be flushed fairly quickly, and generally
1596+ * isn't necessary to keep in memory.
1597+ * It is hard to draw the line, which caches should be counted as free,
1598+ * and which not. Pagecaches, dentry, and inode caches are quickly
1599+ * filled up again for almost any use case. Hence I would not count
1600+ * them as 'free'.
1601+ * 'mem_cached' definitely counts as 'free' because it is immediately
1602+ * released should any application need it. */
1603+ m->stats[m->ring_cursor] = (mem_total - mem_buffers - mem_free -
1604+ mem_cached) / (float)mem_total;
1605+
1606+ m->ring_cursor++;
1607+ if (m->ring_cursor >= m->pixmap_width)
1608+ m->ring_cursor = 0;
1609+
1610+ /* Redraw the pixmap, with the new sample */
1611+ redraw_pixmap (m);
1612
1613 RET(TRUE);
1614 }
1615
1616=== modified file 'src/plugins/netstat/Makefile.in'
1617--- src/plugins/netstat/Makefile.in 2013-08-29 01:07:11 +0000
1618+++ src/plugins/netstat/Makefile.in 2014-05-27 06:48:22 +0000
1619@@ -1,4 +1,4 @@
1620-# Makefile.in generated by automake 1.14 from Makefile.am.
1621+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1622 # @configure_input@
1623
1624 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1625
1626=== modified file 'src/plugins/netstatus/Makefile.in'
1627--- src/plugins/netstatus/Makefile.in 2013-08-29 01:07:11 +0000
1628+++ src/plugins/netstatus/Makefile.in 2014-05-27 06:48:22 +0000
1629@@ -1,4 +1,4 @@
1630-# Makefile.in generated by automake 1.14 from Makefile.am.
1631+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1632 # @configure_input@
1633
1634 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1635
1636=== modified file 'src/plugins/thermal/Makefile.in'
1637--- src/plugins/thermal/Makefile.in 2013-08-29 01:07:11 +0000
1638+++ src/plugins/thermal/Makefile.in 2014-05-27 06:48:22 +0000
1639@@ -1,4 +1,4 @@
1640-# Makefile.in generated by automake 1.14 from Makefile.am.
1641+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1642 # @configure_input@
1643
1644 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1645
1646=== modified file 'src/plugins/volume/Makefile.in'
1647--- src/plugins/volume/Makefile.in 2013-08-29 01:07:11 +0000
1648+++ src/plugins/volume/Makefile.in 2014-05-27 06:48:22 +0000
1649@@ -1,4 +1,4 @@
1650-# Makefile.in generated by automake 1.14 from Makefile.am.
1651+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1652 # @configure_input@
1653
1654 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1655
1656=== modified file 'src/plugins/volumealsa/Makefile.in'
1657--- src/plugins/volumealsa/Makefile.in 2013-08-29 01:07:11 +0000
1658+++ src/plugins/volumealsa/Makefile.in 2014-05-27 06:48:22 +0000
1659@@ -1,4 +1,4 @@
1660-# Makefile.in generated by automake 1.14 from Makefile.am.
1661+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1662 # @configure_input@
1663
1664 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1665
1666=== modified file 'src/plugins/wnckpager/Makefile.in'
1667--- src/plugins/wnckpager/Makefile.in 2013-08-29 01:07:11 +0000
1668+++ src/plugins/wnckpager/Makefile.in 2014-05-27 06:48:22 +0000
1669@@ -1,4 +1,4 @@
1670-# Makefile.in generated by automake 1.14 from Makefile.am.
1671+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1672 # @configure_input@
1673
1674 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1675
1676=== modified file 'src/plugins/xkb/Makefile.in'
1677--- src/plugins/xkb/Makefile.in 2013-08-29 01:07:11 +0000
1678+++ src/plugins/xkb/Makefile.in 2014-05-27 06:48:22 +0000
1679@@ -1,4 +1,4 @@
1680-# Makefile.in generated by automake 1.14 from Makefile.am.
1681+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1682 # @configure_input@
1683
1684 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

Subscribers

People subscribed via source and target branches

to all changes: