[Xfce4-commits] l10n: Updates for Croatian (hr) translation
Updating branch refs/heads/master to 6d950c0df0cf80871a22536395dadaf8b69d59d7 (commit) from dfddd7ce0a1822c2bbc44b9339939c2de805e1ce (commit) commit 6d950c0df0cf80871a22536395dadaf8b69d59d7 Author: Ivica Kolić Date: Fri May 14 02:14:56 2010 +0200 l10n: Updates for Croatian (hr) translation New status: 253 messages complete with 1 fuzzy and 357 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 494 +++-- 1 files changed, 251 insertions(+), 243 deletions(-) diff --git a/po/hr.po b/po/hr.po index 76667d6..2ca21bc 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 16:06+\n" -"PO-Revision-Date: 2010-05-12 17:40+0200\n" +"POT-Creation-Date: 2010-05-13 22:07+\n" +"PO-Revision-Date: 2010-05-14 02:13+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" @@ -19,17 +19,17 @@ msgstr "" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "" +msgstr "Lagan web preglednik" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 #: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "" +msgstr "Web preglednik" #: ../midori/main.c:102 #, c-format @@ -39,38 +39,38 @@ msgstr "" #: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "" +msgstr "Vrijednost '% s' nije za % s" #: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" -msgstr "" +msgstr "Neispravna vrijednost konfiguracije '% s'" #: ../midori/main.c:370 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" -msgstr "" +msgstr "Nisam uspio otvoriti bazu podataka %s\n" #. i18n: Couldn't remove items that are older than n days #: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "Nisam uspio maknuti stare stavke povijesti:% s\n" #: ../midori/main.c:445 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Konfiguracija ne može biti spremljena %s" +msgstr "Konfiguracija ne može biti spremljena. % s" #: ../midori/main.c:483 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Tražilice ne mogu biti spremljene %s" +msgstr "Tražilice ne mogu biti spremljene. % s" #: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Zabilješke na mogu biti spremljene %s" +msgstr "Bilješke ne mogu biti spremljeni. % s" #. i18n: Trash, or wastebin, containing closed tabs #: ../midori/main.c:602 ../midori/main.c:625 @@ -93,10 +93,13 @@ msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" +"Midori se da je srušio posljednji put to je bio otvoren. Ako se to dogodilo " +"nekoliko puta, pokušajte jednu od sljedećih mogućnosti za rješavanje " +"problema." #: ../midori/main.c:973 msgid "Modify _preferences" -msgstr "Izmjeni_osobitosti" +msgstr "Promijeni _osobitosti" #: ../midori/main.c:977 msgid "Reset the last _session" @@ -117,16 +120,16 @@ msgstr "" #: ../midori/main.c:1355 msgid "An unknown error occured." -msgstr "" +msgstr "Nepoznata pogreška." #: ../midori/main.c:1386 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "" +msgstr "Snimak spremljen u:% s\\\n" #: ../midori/main.c:1557 msgid "Run ADDRESS as a web application" -msgstr "" +msgstr "Pokreni ADRESU kao web aplikaciju" #: ../midori/main.c:1557 msgid "ADDRESS" @@ -146,7 +149,7 @@ msgstr "" #: ../midori/main.c:1565 msgid "Run the specified filename as javascript" -msgstr "" +msgstr "Pokreni navedeno ime datoteke kao javascript" #: ../midori/main.c:1568 msgid "Take a snapshot of the specified URI" @@ -332,7 +335,7 @@ msgstr "" msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "" @@ -359,7 +362,7 @@ msgid "New feed" msgstr "" #: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 -#: ../panels/midori-bookmarks.c:242 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" @@ -384,18 +387,18 @@ msgstr "" msgid "Failed to insert new history item: %s\n" msgstr "" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-h
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 67%
Updating branch refs/heads/master to 1b2d79ea579bec816d57b4c1ef072f86c3004ded (commit) from 29062c5d17cf926f70d9d8cd77460a9144c1406e (commit) commit 1b2d79ea579bec816d57b4c1ef072f86c3004ded Author: Ivica Kolić Date: Fri May 14 01:55:53 2010 +0200 l10n: Updated Croatian (hr) translation to 67% New status: 181 messages complete with 0 fuzzies and 89 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/hr.po b/po/hr.po index 9860fcc..d4afb65 100644 --- a/po/hr.po +++ b/po/hr.po @@ -787,7 +787,7 @@ msgstr "Naredba" #: ../Terminal.glade.h:17 msgid "Compatibility" -msgstr "" +msgstr "Kompatibilnost" #: ../Terminal.glade.h:18 msgid "" @@ -797,7 +797,7 @@ msgstr "" #: ../Terminal.glade.h:20 msgid "Control-H" -msgstr "" +msgstr "Control-H" #: ../Terminal.glade.h:21 msgid "Cu_rsor color:" @@ -825,7 +825,7 @@ msgstr "Prikaži _alatne trake u novim prozorima" #: ../Terminal.glade.h:28 msgid "Double Click" -msgstr "" +msgstr "Dvostruki Klik" #: ../Terminal.glade.h:29 msgid "Enab_le anti-aliasing for the terminal font" @@ -849,7 +849,7 @@ msgstr "Omogućite" #: ../Terminal.glade.h:34 msgid "Enable this option to show the toolbars in newly created terminal windows." -msgstr "" +msgstr "Omogućite ovu opciju za prikaz alatne trake na novo stvorenom prozoru terminala." #: ../Terminal.glade.h:35 msgid "Enable this option to show window decorations around newly created terminal windows." ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 65%
Updating branch refs/heads/master to 29062c5d17cf926f70d9d8cd77460a9144c1406e (commit) from 62f5b9e6055daaf1f707ff8ad3736fa41c011bda (commit) commit 29062c5d17cf926f70d9d8cd77460a9144c1406e Author: Ivica Kolić Date: Fri May 14 01:48:44 2010 +0200 l10n: Updated Croatian (hr) translation to 65% New status: 177 messages complete with 0 fuzzies and 93 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 135 +- 1 files changed, 37 insertions(+), 98 deletions(-) diff --git a/po/hr.po b/po/hr.po index 8a421ee..9860fcc 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,15 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: Terminal 0.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-12 22:00+\n" +"POT-Creation-Date: 2010-05-13 22:00+\n" "PO-Revision-Date: 2010-05-13 22:13+0200\n" -"Last-Translator: <>\n" +"Last-Translator: <>\n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../terminal/main.c:52 msgid "Usage:" @@ -165,9 +164,7 @@ msgstr "%s korisnički priručnik nije instaliran na vaše računalo" #: ../terminal/terminal-dialogs.c:218 #, c-format -msgid "" -"You can read the user manual online. This manual may however not exactly " -"match your %s version." +msgid "You can read the user manual online. This manual may however not exactly match your %s version." msgstr "" #: ../terminal/terminal-dialogs.c:220 @@ -185,48 +182,28 @@ msgstr "" #: ../terminal/terminal-options.c:210 #, c-format -msgid "" -"Option \"--default-display\" requires specifying the default X display as " -"its parameter" -msgstr "" -"Opcija \"--zadani-zaslon\" zahtjeva određivanje zadanog X zaslona kao njen " -"parametra" +msgid "Option \"--default-display\" requires specifying the default X display as its parameter" +msgstr "Opcija \"--zadani-zaslon\" zahtjeva određivanje zadanog X zaslona kao njen parametra" #: ../terminal/terminal-options.c:225 #, c-format -msgid "" -"Option \"--default-working-directory\" requires specifying the default " -"working directory as its parameter" -msgstr "" -"Opcija \"zadani-radni-direktorij\" zahtjeva određivanje zadanog radnog " -"direktorija kao njen parametra" +msgid "Option \"--default-working-directory\" requires specifying the default working directory as its parameter" +msgstr "Opcija \"zadani-radni-direktorij\" zahtjeva određivanje zadanog radnog direktorija kao njen parametra" #: ../terminal/terminal-options.c:241 #, c-format -msgid "" -"Option \"--execute/-x\" requires specifying the command to run on the rest " -"of the command line" -msgstr "" -"Opcija \"izvrši/-x\"zahtjeva određivanje naredbe za pokretanje ostatka " -"naredbenog retka" +msgid "Option \"--execute/-x\" requires specifying the command to run on the rest of the command line" +msgstr "Opcija \"izvrši/-x\"zahtjeva određivanje naredbe za pokretanje ostatka naredbenog retka" #: ../terminal/terminal-options.c:258 #, c-format -msgid "" -"Option \"--command/-e\" requires specifying the command to run as its " -"parameter" -msgstr "" -"Opcija \"--naredba/-e\" zahtjeva određivanje naredne za pokretanje kao njen " -"parametar" +msgid "Option \"--command/-e\" requires specifying the command to run as its parameter" +msgstr "Opcija \"--naredba/-e\" zahtjeva određivanje naredne za pokretanje kao njen parametar" #: ../terminal/terminal-options.c:275 #, c-format -msgid "" -"Option \"--working-directory\" requires specifying the working directory as " -"its parameter" -msgstr "" -"Opcija \"--radni direktorij\" zahtjeva određivanje radnog direktorija kao " -"njen parametar" +msgid "Option \"--working-directory\" requires specifying the working directory as its parameter" +msgstr "Opcija \"--radni direktorij\" zahtjeva određivanje radnog direktorija kao njen parametar" #: ../terminal/terminal-options.c:290 #, c-format @@ -235,15 +212,12 @@ msgstr "Opcija \"--naslov/-T\" zahtjeva određivanje naslova kao njen parametar" #: ../terminal/terminal-options.c:309 #, c-format -msgid "" -"Option \"--display\" requires specifying the X display as its parameters" +msgid "Option \"--display\" requires specifying the X display as its parameters" msgstr "Opcija \"--zaslon\" zahtjeva određivanje X zaslona kao njen parametar" #: ../terminal/terminal-options.c:324 #, c-format -msgid "" -"Option \"--geometry\" requires specifying the window geometry as its " -"parameter" +msgid "Option \"--geometry\" requires specifying the window geometry as its parameter" msgstr "" #: ../terminal/terminal-options.c:339 @@ -253,18 +227,13 @@ ms
[Xfce4-commits] switch back to dev mode
Updating branch refs/heads/master to 77d2f38bb35b6ba7d9e5e06a517ef5cc480bd48c (commit) from 8776e8dc12bc8649f2756c305501c7138f60d011 (commit) commit 77d2f38bb35b6ba7d9e5e06a517ef5cc480bd48c Author: Landry Breuil Date: Tue Nov 3 22:25:11 2009 +0100 switch back to dev mode configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 1c113c4..29cf8eb 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -6,7 +6,7 @@ dnl m4_define([mpc_version_major], [0]) m4_define([mpc_version_minor], [3]) m4_define([mpc_version_micro], [4]) -m4_define([mpc_version_tag], []) # Leave empty for releases +m4_define([mpc_version_tag], [git]) # Leave empty for releases m4_define([mpc_version_build], [...@revision@]) m4_define([mpc_version], [mpc_version_major().mpc_version_minor().mpc_version_micro()ifelse(mpc_version_tag(), [], [], [mpc_version_tag()-mpc_version_build()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin
Updating branch refs/heads/master
to d652109b6c91a31285e9fc479f1c7a7ca3106b03 (commit)
from 77d2f38bb35b6ba7d9e5e06a517ef5cc480bd48c (commit)
commit d652109b6c91a31285e9fc479f1c7a7ca3106b03
Merge: 77d2f38bb35b6ba7d9e5e06a517ef5cc480bd48c
d2d820b382dbf2d8fdd9b6cfdf4408b9f181ba3a
Author: Landry Breuil
Date: Mon May 10 22:17:21 2010 +0200
Merge branch 'master' of
ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin
commit d2d820b382dbf2d8fdd9b6cfdf4408b9f181ba3a
Author: Fabian Nowak
Date: Sat Mar 27 20:11:23 2010 +0100
l10n: Updated German (de) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit d77c46f8afc0f81ac3ebaa0f039b67d5fe747ad1
Author: Fabian Nowak
Date: Sat Mar 27 20:09:08 2010 +0100
l10n: Updated German (de) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 78516bc366444298319bbd196cd48447f64cae88
Author: Fabian Nowak
Date: Sat Mar 27 20:07:21 2010 +0100
l10n: Updated German (de) translation to 95%
New status: 23 messages complete with 1 fuzzy and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 39e77746c55fed338237425aa0e4689cff7fe102
Author: Dmitry Nikitin
Date: Wed Mar 17 12:51:25 2010 +0100
l10n: Updated Ukrainian (uk) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit d342474db4707c8a30d78340214b733defa72a5b
Author: Dmitrij Smirnov
Date: Tue Mar 9 19:50:07 2010 +0100
l10n: Updated Russian (ru) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 6d4fcf13bf266865836e6e4c461b57d7900f2758
Author: Andres Kovtunos
Date: Tue Mar 9 18:42:26 2010 +0100
l10n: Initial Russian translation.
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 7eddcd7088d7b70d22c3889f6d9df49c84096b77
Author: Robert Hartl
Date: Mon Mar 8 10:47:47 2010 +0100
l10n: Updated Slovak (sk) translation to 95%
New status: 23 messages complete with 0 fuzzies and 1 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 66228766267df6a12aaeb0ec2df2816dea1c920a
Author: Paul Seyfert
Date: Sat Feb 27 21:37:14 2010 +0100
l10n: Updated German (de) translation to 87%
New status: 21 messages complete with 1 fuzzy and 2 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 002e0ff37121f66135dd4b0a8a819d43f65d71f0
Author: Michal Várady
Date: Mon Jan 4 17:51:10 2010 +
l10n: Updates to Czech (cs) translation
Transmitted-via: Transifex (translations.xfce.org)
commit b8c969205ed4e397aaf44597aee558930b18c65c
Author: Cristian Marchi
Date: Wed Dec 30 20:05:31 2009 +
l10n: Updates to Italian (it) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 5712671a6951a762181dce4a7d507d3f172de2f4
Author: Cristian Marchi
Date: Wed Dec 30 19:53:17 2009 +
l10n: Updates to Italian (it) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 7293c9fb9b7e9929c6abd3ba949e5e1f68804961
Author: Daniel Nylander
Date: Wed Dec 16 16:28:13 2009 +
l10n: Updates to Swedish (sv) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 06c5bb82e775fb44f64d42d7b7be234b2b761015
Author: Xu Meihong
Date: Mon Nov 9 12:07:21 2009 +
l10n: Updates to Chinese (China) (zh_CN) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 672748208e02fe52e3a793c3f5f7382b06d30b7b
Author: Robert Hartl
Date: Thu Nov 5 16:06:14 2009 +
l10n: Slovak translation
Transmitted-via: Transifex (translations.xfce.org)
po/cs.po| 28 +
po/de.po| 31 +++-
po/it.po| 32 +++-
po/{es.po => ru.po} | 63 +++-
po/{cs.po => sk.po} | 66 +++---
po/sv.po| 22 +++-
po/uk.po| 21 +++-
po/zh_CN.po | 34 +-
8 files changed, 137 insertions(+), 160 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 87c101a..67ef1c0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,14 +1,14 @@
# Czech translations for xfce4-mpc-plugin package.
# Copyright (C) 2006 THE xfce4-mpc-plugin'S COPYRIGHT HOLDER
# This file is distributed under the same license as the xfce4-mpc-plugin
package.
-# Michal Várady , 2006-2008.
+# Michal Várady ,
[Xfce4-commits] Add checkitems in rightclick menu to enable/disable mpd outputs
Updating branch refs/heads/master
to 8f2a1057581138457e7a1d29ab279d7002c87b57 (commit)
from d652109b6c91a31285e9fc479f1c7a7ca3106b03 (commit)
commit 8f2a1057581138457e7a1d29ab279d7002c87b57
Author: Landry Breuil
Date: Thu May 13 23:01:45 2010 +0200
Add checkitems in rightclick menu to enable/disable mpd outputs
- add mpc_output_toggled() callback for checkitems to change output device
status on mpd server
- add mpc_update_outputs() called when mouse hovers the plugin :
traverse the list of known output, update their status
if not found, create a new checkitem and add it to rightclick menu
- add corresponding t_mpd_output struct in headers
currently, this requires mpd_server_set_output_device(),
mpd_server_get_output_devices() and mpd_data_get_next(),
so this will only work when built against libmpd.
Equivalent code to come in simple-libmpd.{c,h}...
panel-plugin/xfce4-mpc-plugin.c | 54 +++
panel-plugin/xfce4-mpc-plugin.h |9 ++
2 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c
index b073146..37f6f48 100644
--- a/panel-plugin/xfce4-mpc-plugin.c
+++ b/panel-plugin/xfce4-mpc-plugin.c
@@ -347,6 +347,57 @@ mpc_repeat_toggled(GtkWidget *widget, t_mpc* mpc)
mpd_player_set_repeat(mpc->mo,
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));
}
+static void
+mpc_output_toggled(GtkWidget *widget, t_mpc* mpc)
+{
+ DBG("!");
+ int i;
+ /* lookup menuitem */
+ for (i = 0; i < mpc->nb_outputs && mpc->mpd_outputs[i]->menuitem != widget;
i++);
+ if (i != mpc->nb_outputs) /* oops case ? */
+ /* set corresponding mpd output status */
+ mpd_server_set_output_device(mpc->mo, mpc->mpd_outputs[i]->id,
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));
+}
+
+/* get output list from mpd, add a checkbox to rightclick menu for each */
+static void
+mpc_update_outputs(t_mpc* mpc)
+{
+ DBG("!");
+ int i,j=0;
+ MpdData * data = mpd_server_get_output_devices(mpc->mo);
+ do {
+ DBG("got output %d with name %s,
enabled=%d",data->output_dev->id,data->output_dev->name,data->output_dev->enabled);
+ /* check if this output doesn't already exist */
+ for (i = 0; i < mpc->nb_outputs && mpc->mpd_outputs[i]->id !=
data->output_dev->id ; i++);
+
+ if (i == mpc->nb_outputs) {
+ DBG("output not found, adding a new checkitem at pos %d",i);
+ GtkWidget* chkitem = gtk_check_menu_item_new_with_label
(data->output_dev->name);
+ g_signal_connect (G_OBJECT(chkitem), "toggled", G_CALLBACK
(mpc_output_toggled), mpc);
+
xfce_panel_plugin_menu_insert_item(mpc->plugin,GTK_MENU_ITEM(chkitem));
+ gtk_widget_show (chkitem);
+ mpc->mpd_outputs[i] = g_new(t_mpd_output,1);
+ mpc->mpd_outputs[i]->id = data->output_dev->id;
+ mpc->mpd_outputs[i]->menuitem = chkitem;
+ mpc->nb_outputs++;
+ }
+ mpc->mpd_outputs[i]->enabled = data->output_dev->enabled;
+
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mpc->mpd_outputs[i]->menuitem),
mpc->mpd_outputs[i]->enabled);
+ j++;
+ } while (NULL != (data = mpd_data_get_next (data)));
+ /* something changed, better prune the list and recreate it */
+ /* TODO: test this codepath */
+ if (j != mpc->nb_outputs) {
+ DBG("didnt found same amount of outputs (was %d got %d), resetting
output list", mpc->nb_outputs, j);
+ for (i = 0; i < mpc->nb_outputs ; i++) {
+ gtk_widget_destroy(mpc->mpd_outputs[i]->menuitem);
+ g_free(mpc->mpd_outputs[i]);
+ }
+ mpc->nb_outputs = 0;
+ mpc_update_outputs(mpc);
+ }
+}
void
str_replace(GString *str, gchar* pattern, gchar* replacement)
@@ -418,6 +469,7 @@ enter_cb(GtkWidget *widget, GdkEventCrossing* event, t_mpc*
mpc)
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mpc->random),
mpd_player_get_random(mpc->mo));
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mpc->repeat),
mpd_player_get_repeat(mpc->mo));
+ mpc_update_outputs(mpc);
gtk_widget_set_tooltip_text (widget, str->str);
g_string_free(str, TRUE);
@@ -736,6 +788,8 @@ mpc_construct (XfcePanelPlugin * plugin)
mpc->playlist_format = g_strdup("%artist% - %album% -/- (#%track%)
%title%");
mpc->show_frame = TRUE;
mpc->playlist = NULL;
+ mpc->mpd_outputs = g_new(t_mpd_output*,1);
+ mpc->nb_outputs = 0;
mpc_read_config (plugin, mpc);
diff --git a/panel-plugin/xfce4-mpc-plugin.h b/panel-plugin/xfce4-mpc-plugin.h
index 8f8e6e8..c128078 100644
--- a/panel-plugin/xfce4-mpc-plugin.h
+++ b/panel-plugin/xfce4-mpc-plugin.h
@@ -32,6 +32,13 @@
#endif /* !HAVE_LIBMPD */
typedef struct {
+ GtkWidget* menuitem;
+ gchar* name;
+ gint id;
+ gint enabled;
+} t_mpd_output;
+
+typedef struct {
XfcePanelPlugin *plugin;
GtkWidget
*frame,*ebox,*box,*prev,*stop,*toggle,*n
[Xfce4-commits] l10n: Updates to Croatian (hr) translation
Updating branch refs/heads/master to 62f5b9e6055daaf1f707ff8ad3736fa41c011bda (commit) from fab74971d2ab4c0910a031c61ac94dfd0d3cfe74 (commit) commit 62f5b9e6055daaf1f707ff8ad3736fa41c011bda Author: Ivica Kolić Date: Thu May 13 22:18:21 2010 +0200 l10n: Updates to Croatian (hr) translation New status: 173 messages complete with 0 fuzzies and 97 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 98 -- 1 files changed, 57 insertions(+), 41 deletions(-) diff --git a/po/hr.po b/po/hr.po index 72a0e65..8a421ee 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,15 +1,15 @@ # Croatian translations for PACKAGE package. # Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# , 2010. -# +# Ivica Kolić, 2010. +# <>, 2010. msgid "" msgstr "" "Project-Id-Version: Terminal 0.4.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-12 22:00+\n" -"PO-Revision-Date: 2010-05-13 01:30+0200\n" -"Last-Translator: Ivica Kolić \n" +"PO-Revision-Date: 2010-05-13 22:13+0200\n" +"Last-Translator: <>\n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,13 +27,13 @@ msgstr "OPCIJA" #: ../terminal/main.c:57 msgid "General Options" -msgstr "Općenite opcije" +msgstr "Osnovne opcije" #. parameter of --default-display #. parameter of --display #: ../terminal/main.c:59 ../terminal/main.c:85 msgid "display" -msgstr "" +msgstr "zaslon" #. parameter of --default-working-directory #. parameter of --working-directory @@ -189,6 +189,8 @@ msgid "" "Option \"--default-display\" requires specifying the default X display as " "its parameter" msgstr "" +"Opcija \"--zadani-zaslon\" zahtjeva određivanje zadanog X zaslona kao njen " +"parametra" #: ../terminal/terminal-options.c:225 #, c-format @@ -196,6 +198,8 @@ msgid "" "Option \"--default-working-directory\" requires specifying the default " "working directory as its parameter" msgstr "" +"Opcija \"zadani-radni-direktorij\" zahtjeva određivanje zadanog radnog " +"direktorija kao njen parametra" #: ../terminal/terminal-options.c:241 #, c-format @@ -203,6 +207,8 @@ msgid "" "Option \"--execute/-x\" requires specifying the command to run on the rest " "of the command line" msgstr "" +"Opcija \"izvrši/-x\"zahtjeva određivanje naredbe za pokretanje ostatka " +"naredbenog retka" #: ../terminal/terminal-options.c:258 #, c-format @@ -210,6 +216,8 @@ msgid "" "Option \"--command/-e\" requires specifying the command to run as its " "parameter" msgstr "" +"Opcija \"--naredba/-e\" zahtjeva određivanje naredne za pokretanje kao njen " +"parametar" #: ../terminal/terminal-options.c:275 #, c-format @@ -217,17 +225,19 @@ msgid "" "Option \"--working-directory\" requires specifying the working directory as " "its parameter" msgstr "" +"Opcija \"--radni direktorij\" zahtjeva određivanje radnog direktorija kao " +"njen parametar" #: ../terminal/terminal-options.c:290 #, c-format msgid "Option \"--title/-T\" requires specifying the title as its parameter" -msgstr "" +msgstr "Opcija \"--naslov/-T\" zahtjeva određivanje naslova kao njen parametar" #: ../terminal/terminal-options.c:309 #, c-format msgid "" "Option \"--display\" requires specifying the X display as its parameters" -msgstr "" +msgstr "Opcija \"--zaslon\" zahtjeva određivanje X zaslona kao njen parametar" #: ../terminal/terminal-options.c:324 #, c-format @@ -253,6 +263,8 @@ msgid "" "Option \"--icon/-I\" requires specifying an icon name or filename as its " "parameter" msgstr "" +"Opcija \"--ikona/-l zahtjeva određivanje ikone ili ime datoteke kao njen " +"parametar" #: ../terminal/terminal-options.c:423 #, c-format @@ -301,7 +313,7 @@ msgstr "" #: ../terminal/terminal-preferences.c:397 msgid "Preferences" -msgstr "Osobiosti" +msgstr "Osobitosti" #: ../terminal/terminal-preferences.c:408 msgid "Show menubar" @@ -321,7 +333,7 @@ msgstr "Puni zaslon" #: ../terminal/terminal-preferences.c:452 msgid "Set Title" -msgstr "" +msgstr "Postavi naslov" #: ../terminal/terminal-preferences.c:463 ../terminal/terminal-window.c:236 msgid "Reset" @@ -455,7 +467,7 @@ msgstr "" #: ../terminal/terminal-toolbars-view.c:112 msgid "Toolbar Editor" -msgstr "" +msgstr "Uređivač alatne trake" #: ../terminal/terminal-widget.c:320 msgid "Copy Email Address" @@ -467,7 +479,7 @@ msgstr " Napiši email" #: ../terminal/terminal-widget.c:325 msgid "Copy Link Address" -msgstr "" +msgstr "Kopiraj adresu poveznice" #: ../terminal/terminal-widget.c:326 msgid "Open Link" @@ -528,7 +540,7 @@ msgstr "" #: ../terminal/terminal-window.c:224 msgid "Open a new window for the current terminal tab" -msgstr "" +msgstr "Otvori novi prozor za trenutnu terminalnu karticu" #: ../terminal/terminal-window.c:225 msgid "C_lose Tab"
[Xfce4-commits] Make build suitable for GIT.
Updating branch refs/heads/xfce-4.6
to 7f32d31585110808bc4dbeed06c025e5a7ca1acf (commit)
from 3cf1631aedc9638efc60b3dcb233f776676e5ff5 (commit)
commit 7f32d31585110808bc4dbeed06c025e5a7ca1acf
Author: Nick Schermer
Date: Thu May 13 20:46:44 2010 +0200
Make build suitable for GIT.
autogen.sh | 21 -
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 170897e..2ce96ce 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -34,15 +34,18 @@ echo >>configure.ac
# substitute revision and linguas
linguas=$(sed -e '/^#/d' po/LINGUAS)
-if [ -d .git/svn ]; then
-revision=$(git svn find-rev trunk 2>/dev/null ||
- git svn find-rev origin/trunk 2>/dev/null ||
- git svn find-rev HEAD 2>/dev/null ||
- git svn find-rev master 2>/dev/null)
-elif [ -d .svn ]; then
-revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",
$2}')
-else
-revision=UNKNOWN
+if test -d .git/svn; then
+revision=`git svn find-rev trunk 2>/dev/null ||
+ git svn find-rev origin/trunk 2>/dev/null ||
+ git svn find-rev HEAD 2>/dev/null ||
+ git svn find-rev master 2>/dev/null`
+elif test -d .git; then
+revision=`git rev-parse --short HEAD`
+elif test -d .svn; then
+revision=`LC_ALL=C svn info $0 | $AWK '/^Revision: / {printf "%05d\n",
$2}'`
+fi
+if test "x$revision" = "x"; then
+revision="UNKNOWN"
fi
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge xml files in reversed order (bug #6079).
Updating branch refs/heads/xfce-4.6
to b686270b38b6199eec080a7faee6b1e4758f28c0 (commit)
from 8c6f3e23de11b9d46acc7f3db4937c026455e6af (commit)
commit b686270b38b6199eec080a7faee6b1e4758f28c0
Author: Nick Schermer
Date: Thu Jan 28 20:42:23 2010 +0100
Merge xml files in reversed order (bug #6079).
xfconfd/xfconf-backend-perchannel-xml.c | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/xfconfd/xfconf-backend-perchannel-xml.c
b/xfconfd/xfconf-backend-perchannel-xml.c
index d764e58..98fa0c3 100644
--- a/xfconfd/xfconf-backend-perchannel-xml.c
+++ b/xfconfd/xfconf-backend-perchannel-xml.c
@@ -1644,7 +1644,7 @@
xfconf_backend_perchannel_xml_load_channel(XfconfBackendPerchannelXml *xbpx,
{
XfconfChannel *channel = NULL;
gchar *filename_stem, **filenames, *user_file;
-gint i;
+gint i, length;
XfconfProperty *prop;
TRACE("entering");
@@ -1669,9 +1669,11 @@
xfconf_backend_perchannel_xml_load_channel(XfconfBackendPerchannelXml *xbpx,
prop->name = g_strdup("/");
channel->properties = g_node_new(prop);
-/* read in system files */
-for(i = 0; filenames[i]; ++i) {
-if(user_file && !strcmp(filenames[i], user_file))
+/* read in system files, we do this in reversed order to properly
+ * follow the xdg spec, see bug #6079 for more information */
+length = g_strv_length(filenames);
+for(i = length - 1; i >= 0; --i) {
+if(!g_strcmp0(user_file, filenames[i]))
continue;
xfconf_backend_perchannel_xml_merge_file(xbpx, filenames[i], TRUE,
channel, NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set Task name from p_comm field, and cmdline from KERN_PROC_ARGV
Updating branch refs/heads/master
to a721cda4bef3a7c23d897f2e3c87a6ccc8343afc (commit)
from 44dc437214888be0b21d25830976a76a88a4bd20 (commit)
commit a721cda4bef3a7c23d897f2e3c87a6ccc8343afc
Author: Landry Breuil
Date: Thu May 13 20:07:35 2010 +0200
Set Task name from p_comm field, and cmdline from KERN_PROC_ARGV
src/task-manager-bsd.c | 10 +++---
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index a7fd71f..12114a1 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -76,11 +76,9 @@ gboolean get_task_list (GArray *task_list)
t.vsz *= getpagesize();
t.rss = p.p_vm_rssize * getpagesize();
g_snprintf(t.state, sizeof t.state, "%s",
state_abbrev[p.p_stat]);
+ g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1);
/* shamelessly stolen from top/machine.c */
- /* short version: g_strlcpy(t.name, p.p_comm, strlen(p.p_comm)
+ 1); */
- if (P_ZOMBIE(&p)) {
- g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1);
- } else {
+ if (!P_ZOMBIE(&p)) {
size = 128;
if ((args = malloc(size)) == NULL)
errx(1,"failed to allocate memory for argv
structures");
@@ -101,9 +99,7 @@ gboolean get_task_list (GArray *task_list)
strlcat(buf, *ptr, sizeof(buf));
}
free(args);
- /* TODO: set difference */
- g_snprintf(t.name, sizeof t.name, "%s", buf);
- g_strlcpy(t.cmdline, t.name, sizeof t.name);
+ g_snprintf(t.cmdline, sizeof t.cmdline, "%s", buf);
}
t.cpu_user = (100.0 * ((double) p.p_pctcpu / FSCALE));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix missing includes, remove unused variables
Updating branch refs/heads/master
to e5ad1842bf9721567ad0c93e7081ba5c24496088 (commit)
from 3acd33040055d460b7c901bd88a6ffc40e9fc827 (commit)
commit e5ad1842bf9721567ad0c93e7081ba5c24496088
Author: Landry Breuil
Date: Thu May 13 19:56:10 2010 +0200
Fix missing includes, remove unused variables
src/task-manager-bsd.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index 2e94083..1c21974 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -24,10 +24,15 @@
#include
#include
#include
+/* for swapctl() */
+#include
/* for kill() */
#include
#include
-
+/* for strlcpy() */
+#include
+/* for getpagesize() */
+#include
#include "task-manager.h"
char *state_abbrev[] = {
@@ -41,14 +46,9 @@ gboolean get_task_list (GArray *task_list)
struct kinfo_proc2 *kp;
Task t;
struct passwd *passwdp;
- double d;
char **args, **ptr;
char buf[127];
int nproc, i;
- fixpt_t ccpu; /* The scheduler exponential decay value. */
- int fscale; /* The kernel fixed-point scale factor. */
-
-// task_list = g_array_new (FALSE, FALSE, sizeof (struct task));
mib[0] = CTL_KERN;
mib[1] = KERN_PROC2;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] correctly implement set_priority/send_signal_to_pid()
Updating branch refs/heads/master
to 44dc437214888be0b21d25830976a76a88a4bd20 (commit)
from 10247249ebb5aec6041876151c53085ce20c6192 (commit)
commit 44dc437214888be0b21d25830976a76a88a4bd20
Author: Landry Breuil
Date: Thu May 13 19:57:37 2010 +0200
correctly implement set_priority/send_signal_to_pid()
src/task-manager-bsd.c | 36 ++--
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index 5c73d91..a7fd71f 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -203,27 +203,35 @@ gboolean send_signal_to_pid (guint task_id, gint signal)
{
gint ret = 0;
if(task_id > 0 && signal != 0)
- {
-
ret = kill(task_id, signal);
-/*
- if(ret != 0)
- xfce_err(_("Couldn't send signal %d to the task with ID
%d"), signal, task_id);
-*/ }
- return ret;
+ return (ret == 0) ? TRUE : FALSE;
}
gboolean set_priority_to_pid (guint task_id, gint prio)
{
- if(task_id > 0)
+ gint res;
+ switch (prio)
{
- gchar command[128] = "";
- /* TODO : syscall */
- g_snprintf(command, 128, "renice %d %d > /dev/null", prio,
task_id);
-
- if(system(command) != 0)
- ;//xfce_err(_("Couldn't set priority %d to the task
with ID %d"), prio, task_id);
+ case XTM_PRIORITY_VERY_LOW:
+ prio = 15;
+ break;
+ case XTM_PRIORITY_LOW:
+ prio = 5;
+ break;
+ case XTM_PRIORITY_NORMAL:
+ prio = 0;
+ break;
+ case XTM_PRIORITY_HIGH:
+ prio = -5;
+ break;
+ case XTM_PRIORITY_VERY_HIGH:
+ prio = -15;
+ break;
+ default:
+ return TRUE;
}
+ res = setpriority (PRIO_PROCESS, task_id, prio);
+ return (res == 0) ? TRUE : FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Implement fetching of swap stats
Updating branch refs/heads/master
to 10247249ebb5aec6041876151c53085ce20c6192 (commit)
from e5ad1842bf9721567ad0c93e7081ba5c24496088 (commit)
commit 10247249ebb5aec6041876151c53085ce20c6192
Author: Landry Breuil
Date: Thu May 13 19:56:51 2010 +0200
Implement fetching of swap stats
src/task-manager-bsd.c | 27 ---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index 1c21974..5c73d91 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -163,6 +163,8 @@ gboolean get_memory_usage (guint64 *memory_total, guint64
*memory_free, guint64
{
int mib[] = {CTL_VM, VM_METER};
struct vmtotal vmtotal;
+ struct swapent *swdev;
+ int nswap, i;
size_t size;
size = sizeof(vmtotal);
if (sysctl(mib, 2, &vmtotal, &size, NULL, 0) < 0)
@@ -172,9 +174,28 @@ gboolean get_memory_usage (guint64 *memory_total, guint64
*memory_free, guint64
*memory_free = pagetok(vmtotal.t_free);
*memory_cache = 0;
*memory_buffers = pagetok(vmtotal.t_rm - vmtotal.t_arm);
- /* XXX:TODO */
- *swap_total = 0;
- *swap_free = 0;
+
+ /* get swap stats */
+ if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) == 0)
+ errx(1,"failed to get swap device count");
+
+ if ((swdev = calloc(nswap, sizeof(*swdev))) == NULL)
+ errx(1,"failed to allocate memory for swdev structures");
+
+ if (swapctl(SWAP_STATS, swdev, nswap) == -1) {
+ free(swdev);
+ errx(1,"failed to get swap stats");
+ }
+
+ /* Total things up */
+ *swap_total = *swap_free = 0;
+ for (i = 0; i < nswap; i++) {
+ if (swdev[i].se_flags & SWF_ENABLE) {
+ *swap_free += ((swdev[i].se_nblks - swdev[i].se_inuse)
/ (1024 / DEV_BSIZE));
+ *swap_total += (swdev[i].se_nblks / (1024 / DEV_BSIZE));
+ }
+ }
+ free(swdev);
return TRUE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Turkish (tr) translation to 100%
Updating branch refs/heads/master to e90360b0d08e22aa16514e4aa2b1e80bc022c6de (commit) from b7ebece02f063a0ffeea33c7b77d822241071f3e (commit) commit e90360b0d08e22aa16514e4aa2b1e80bc022c6de Author: Ayhan YALÇINSOY Date: Thu May 13 18:42:10 2010 +0200 l10n: Updated Turkish (tr) translation to 100% New status: 28 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/tr.po | 69 - 1 files changed, 36 insertions(+), 33 deletions(-) diff --git a/po/tr.po b/po/tr.po index 2f05ff9..08f8ddc 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,133 +4,136 @@ # # Nimet Senem Özkızıklı , 2008. # Gökmen Görgen , 2008. +# Ayhan YALÇINSOY , 2010. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-28 23:51+0200\n" -"PO-Revision-Date: \n" -"Last-Translator: Gökmen Görgen \n" -"Language-Team: Turkish \n" +"POT-Creation-Date: 2010-05-12 16:01+\n" +"PO-Revision-Date: 2010-05-13 11:33+0300\n" +"Last-Translator: Ayhan YALÇINSOY \n" +"Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Turkish\n" "X-Poedit-Country: TURKEY\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../data/xfce/xfce-accessories.directory.in.h:1 msgid "Accessories" -msgstr "" +msgstr "Donatılar" #: ../data/xfce/xfce-accessories.directory.in.h:2 msgid "Common desktop tools and applications" -msgstr "" +msgstr "Genel masaüstü araçları ve uygulamaları" #: ../data/xfce/xfce-development.directory.in.h:1 msgid "Development" -msgstr "" +msgstr "Geliştirme" #: ../data/xfce/xfce-development.directory.in.h:2 msgid "Software development tools" -msgstr "" +msgstr "Yazılım geliştirme araçları" #: ../data/xfce/xfce-education.directory.in.h:1 msgid "Education" -msgstr "" +msgstr "Eğitim" #: ../data/xfce/xfce-education.directory.in.h:2 msgid "Educational software" -msgstr "" +msgstr "Eğitimsel yazılımlar" #: ../data/xfce/xfce-games.directory.in.h:1 msgid "Games" -msgstr "" +msgstr "Oyunalar" #: ../data/xfce/xfce-games.directory.in.h:2 msgid "Games, puzzles, and other fun software" -msgstr "" +msgstr "Oyunlar, bulmacalar ve diğer eğlenceli yazılımlar" #: ../data/xfce/xfce-graphics.directory.in.h:1 msgid "Graphics" -msgstr "" +msgstr "Grafik" #: ../data/xfce/xfce-graphics.directory.in.h:2 msgid "Graphics creation and manipulation applications" -msgstr "" +msgstr "Grafik oluşturma ve değiştirme uygulamaları" #: ../data/xfce/xfce-multimedia.directory.in.h:1 msgid "Audio and video players and editors" -msgstr "" +msgstr "Ses ve video oynatıcı ve düzenleyiciler" #: ../data/xfce/xfce-multimedia.directory.in.h:2 msgid "Multimedia" -msgstr "" +msgstr "Çokluortam" #: ../data/xfce/xfce-network.directory.in.h:1 msgid "Network" -msgstr "" +msgstr "Ağ" #: ../data/xfce/xfce-network.directory.in.h:2 msgid "Network applications and utilities" -msgstr "" +msgstr "Ağ uygulamaları" #: ../data/xfce/xfce-office.directory.in.h:1 msgid "Office" -msgstr "" +msgstr "Ofis" #: ../data/xfce/xfce-office.directory.in.h:2 msgid "Office and productivity applications" -msgstr "" +msgstr "Ofis ve verimlilik uygulamaları" #: ../data/xfce/xfce-other.directory.in.h:1 msgid "Applications that don't fit into other categories" -msgstr "" +msgstr "Diğer bölümlerde bulunmayan uygulamalar" #: ../data/xfce/xfce-other.directory.in.h:2 msgid "Other" -msgstr "" +msgstr "Diğer" #: ../data/xfce/xfce-science.directory.in.h:1 msgid "Science" -msgstr "" +msgstr "Bilim" #: ../data/xfce/xfce-science.directory.in.h:2 msgid "Scientific software" -msgstr "" +msgstr "Bilimsel yazılımlar" #: ../data/xfce/xfce-screensavers.directory.in.h:1 msgid "Screensaver applets" -msgstr "" +msgstr "Ekran koruyucu uygulamaları" #: ../data/xfce/xfce-screensavers.directory.in.h:2 msgid "Screensavers" -msgstr "" +msgstr "Ekran Koruyucular" #: ../data/xfce/xfce-settings.directory.in.h:1 msgid "Desktop and system settings applications" -msgstr "" +msgstr "Masaüstü ve sistem ayarları uygulamaları" #: ../data/xfce/xfce-settings.directory.in.h:2 msgid "Settings" -msgstr "" +msgstr "Ayarlar" #: ../data/xfce/xfce-system.directory.in.h:1 msgid "System" -msgstr "" +msgstr "Sistem" #: ../data/xfce/xfce-system.directory.in.h:2 msgid "System tools and utilities" -msgstr "" +msgstr "Sistem araçları ve uygulamaları" #: ../garcon/garcon-menu-parser.c:278 -#, fuzzy, c-format +#, c-format msgid "Could not load menu file data from %s: %s" -msgstr "libxfce4menu öğesi önbelleği, %s bölümünden çağrılamadı: %s." +msgstr "%s den menü dosya verisi yüklenemedi: %s" #: ../garcon/garcon-menu-parser.c:283 #, c-format msgid "Could not load menu file data from %s" -msgstr "" +msgstr "%s den menü dosya verisi yüklenemedi" #~ msgi
[Xfce4-commits] WIP on OpenBSD support
Updating branch refs/heads/master
to 3acd33040055d460b7c901bd88a6ffc40e9fc827 (commit)
from 1bd6ca0add969e4af7128425431abc0f8fcea43c (commit)
commit 3acd33040055d460b7c901bd88a6ffc40e9fc827
Author: Landry Breuil
Date: Thu May 13 18:36:17 2010 +0200
WIP on OpenBSD support
- update wrt new Task structure
- handle zombie processes
- get full cmdline
rework
src/{taskmanager-bsd.c => task-manager-bsd.c} | 142 -
1 files changed, 91 insertions(+), 51 deletions(-)
diff --git a/src/taskmanager-bsd.c b/src/task-manager-bsd.c
similarity index 51%
rename from src/taskmanager-bsd.c
rename to src/task-manager-bsd.c
index b712c3d..2e94083 100644
--- a/src/taskmanager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Landry Breuil
+ * Copyright (c) 2008-2010 Landry Breuil
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,28 +16,30 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "taskmanager.h"
+#include
/* for getpwuid() */
#include
#include
/* for sysctl() */
#include
+#include
#include
/* for kill() */
#include
#include
+#include "task-manager.h"
+
char *state_abbrev[] = {
"", "start", "run", "sleep", "stop", "zomb", "dead", "onproc"
};
-GArray *get_task_list(void)
+gboolean get_task_list (GArray *task_list)
{
- GArray *task_list;
int mib[6];
size_t size;
struct kinfo_proc2 *kp;
- struct task t;
+ Task t;
struct passwd *passwdp;
double d;
char **args, **ptr;
@@ -46,7 +48,7 @@ GArray *get_task_list(void)
fixpt_t ccpu; /* The scheduler exponential decay value. */
int fscale; /* The kernel fixed-point scale factor. */
- task_list = g_array_new (FALSE, FALSE, sizeof (struct task));
+// task_list = g_array_new (FALSE, FALSE, sizeof (struct task));
mib[0] = CTL_KERN;
mib[1] = KERN_PROC2;
@@ -66,59 +68,98 @@ GArray *get_task_list(void)
for (i=0 ; i < nproc ; i++)
{
struct kinfo_proc2 p = kp[i];
- t.checked = FALSE;
t.pid = p.p_pid;
t.ppid = p.p_ppid;
t.uid = p.p_uid;
- t.prio = p.p_priority - 22;
- t.vsize = p.p_vm_dsize + p.p_vm_ssize + p.p_vm_tsize;
- t.vsize *= getpagesize();
- t.rss = p.p_vm_rssize;
+ t.prio = p.p_priority - PZERO;
+ t.vsz = p.p_vm_dsize + p.p_vm_ssize + p.p_vm_tsize;
+ t.vsz *= getpagesize();
+ t.rss = p.p_vm_rssize * getpagesize();
g_snprintf(t.state, sizeof t.state, "%s",
state_abbrev[p.p_stat]);
/* shamelessly stolen from top/machine.c */
/* short version: g_strlcpy(t.name, p.p_comm, strlen(p.p_comm)
+ 1); */
- size = 128;
- if ((args = malloc(size)) == NULL)
- errx(1,"failed to allocate memory for argv structures");
- for (;; size *= 2) {
- if ((args = realloc(args, size)) == NULL)
+ if (P_ZOMBIE(&p)) {
+ g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1);
+ } else {
+ size = 128;
+ if ((args = malloc(size)) == NULL)
errx(1,"failed to allocate memory for argv
structures");
- mib[0] = CTL_KERN;
- mib[1] = KERN_PROC_ARGS;
- mib[2] = t.pid;
- mib[3] = KERN_PROC_ARGV;
- if (sysctl(mib, 4, args, &size, NULL, 0) == 0)
- break;
- }
- buf[0] = '\0';
- for (ptr = args; *ptr != NULL; ptr++) {
- if (ptr != args)
- strlcat(buf, " ", sizeof(buf));
- strlcat(buf, *ptr, sizeof(buf));
+ for (;; size *= 2) {
+ if ((args = realloc(args, size)) == NULL)
+ errx(1,"failed to allocate memory for
argv structures of pid %d",t.pid);
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC_ARGS;
+ mib[2] = t.pid;
+ mib[3] = KERN_PROC_ARGV;
+ if (sysctl(mib, 4, args, &size, NULL, 0) == 0)
+ break;
+ }
+ buf[0] = '\0';
+ for (ptr = args; *ptr != NULL; ptr++) {
+ if (ptr != args)
+ strlcat(buf, " ", sizeof(buf));
+
[Xfce4-commits] l10n: Updated Indonesian (id) translation to 100%
Updating branch refs/heads/xfce-4.6 to aecdbaaa36d156907a95bc4466ac8033be36f2a9 (commit) from d4b7ea9c91035f6062e3088cd826a9429e1e6838 (commit) commit aecdbaaa36d156907a95bc4466ac8033be36f2a9 Author: Andhika Padmawan Date: Thu May 13 17:11:34 2010 +0200 l10n: Updated Indonesian (id) translation to 100% New status: 7 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 42 ++ 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/po/id.po b/po/id.po index 0473c34..cdb9b1a 100644 --- a/po/id.po +++ b/po/id.po @@ -2,12 +2,12 @@ # This file is distributed under the same license as the libxfce4util package. # Copyright (C) 2003-2006 Benedikt Meurer # Maximilian Schleiss , 2006-2007. -# +# msgid "" msgstr "" "Project-Id-Version: libxfce4util 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-24 10:40+0100\n" +"POT-Creation-Date: 2010-05-13 10:13+\n" "PO-Revision-Date: 2009-01-27 22:03+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" @@ -15,12 +15,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libxfce4util/xfce-fileutils.c:153 +#: ../libxfce4util/xfce-fileutils.c:153 #, c-format msgid "Error creating directory '%s': %s" msgstr "Galat membuat direktori '%s': %s" -#: libxfce4util/xfce-license.c:33 +#: ../libxfce4util/xfce-license.c:33 msgid "" " Redistribution and use in source and binary forms, with or without\n" " modification, are permitted provided that the following conditions\n" @@ -66,7 +66,7 @@ msgstr "" " SEBALIKNYA) YANG MENGAKIBATKAN KERUSAKAN PERANTI LUNAK INI, BAHKAN JIKA\n" " TERCANTUM ADANYA KEMUNGKINAN KERUSAKAN SEPERTI ITU.\n" -#: libxfce4util/xfce-license.c:55 +#: ../libxfce4util/xfce-license.c:55 msgid "" "This program is free software; you can redistribute it and/or modify it\n" "under the terms of the GNU General Public License as published by the Free\n" @@ -78,29 +78,24 @@ msgid "" "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\n" "more details.\n" "\n" -"You should have received a copy of the GNU General Public License along " -"with\n" -"this program; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin\n" +"You should have received a copy of the GNU General Public License along with\n" +"this program; if not, write to the Free Software Foundation, Inc., 51 Franklin\n" "Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" msgstr "" "Program ini adalah peranti lunak bebas; anda dapat mendistribusikan ulang\n" "dan/atau memodifikasinya di bawah Lisensi Publik Umum GNU yang diterbitkan\n" -"oleh Free Software Foundation; baik versi 2 dari Lisensi; atau (sesuai " -"pilihan\n" +"oleh Free Software Foundation; baik versi 2 dari Lisensi; atau (sesuai pilihan\n" "anda) versi manapun setelahnya.\n" "\n" "Program ini didistribusikan dengan harapan dapat berguna; tapi TANPA\n" "GARANSI APAPUN; tanpa pula garansi implisit dari PENJUALAN atau PENGGUNAAN\n" -"UNTUK TUJUAN KHUSUS. Lihat Lisensi Publik Umum GNU untuk detail lebih " -"lanjut.\n" +"UNTUK TUJUAN KHUSUS. Lihat Lisensi Publik Umum GNU untuk detail lebih lanjut.\n" "\n" "Anda seharusnya menerima salinan dari Lisensi Publik Umum GNU bersama\n" -"dengan program ini; jika tidak, kirim surat ke Free Software Foundation, " -"Inc., \n" +"dengan program ini; jika tidak, kirim surat ke Free Software Foundation, Inc., \n" "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" -#: libxfce4util/xfce-license.c:70 +#: ../libxfce4util/xfce-license.c:70 msgid "" "This library is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU Library General Public\n" @@ -131,3 +126,18 @@ msgstr "" "GNU bersama dengan pustaka ini; jika tidak, kirim surat ke\n" "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, \n" "Boston, MA 02110-1301 USA.\n" + +#: ../libxfce4util/xfce-posix-signal-handler.c:132 +#, c-format +msgid "pipe() failed: %s" +msgstr "pipe() gagal: %s" + +#: ../libxfce4util/xfce-posix-signal-handler.c:205 +#, c-format +msgid "xfce_posix_signal_handler_init() must be called first" +msgstr "xfce_posix_signal_handler_init() harus dipanggil terlebih dahulu" + +#: ../libxfce4util/xfce-posix-signal-handler.c:231 +#, c-format +msgid "sigaction() failed: %s\n" +msgstr "sigaction() gagal: %s\n" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Indonesian (id) translation to 100%
Updating branch refs/heads/xfce-4.6 to af41e62220b4c366456be093104f775990a88ace (commit) from d06806c4b16aa0a3c343fcd4a09b828c1595c06a (commit) commit af41e62220b4c366456be093104f775990a88ace Author: Andhika Padmawan Date: Thu May 13 17:09:09 2010 +0200 l10n: Updated Indonesian (id) translation to 100% New status: 167 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 25 ++--- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/po/id.po b/po/id.po index 8faa6c9..55ab1b6 100644 --- a/po/id.po +++ b/po/id.po @@ -2,12 +2,12 @@ # Copyright (C) 2002-2006 The Xfce development team. # This file is distributed under the same license as the xfce4-panel package. # Andhika Padmawan , 2008. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-panel 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-27 15:41+0100\n" +"POT-Creation-Date: 2010-05-13 10:13+\n" "PO-Revision-Date: 2009-01-27 22:49+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" @@ -28,8 +28,7 @@ msgid "Remove \"%s\"?" msgstr "Hapus \"%s\"?" #: ../libxfce4panel/xfce-panel-plugin-iface.c:620 -msgid "" -"The item will be removed from the panel and its configuration will be lost." +msgid "The item will be removed from the panel and its configuration will be lost." msgstr "Item akan dihapus dari panel dan konfigurasinya akan hilang." #. TRANSLATORS: Properties menu item in the right-click plugin menu @@ -163,7 +162,8 @@ msgstr "Tak dapat membuka modul \"%s\"" msgid "Add New Items" msgstr "Tambah Item Baru" -#. TRANSLATORS: Make sure this string is equally spread in the add items dialog, +#. TRANSLATORS: Make sure this string is equally spread in the add items +#. dialog, #. since gtk labels do not update text wrapping on a dialog resize. #: ../panel/panel-dialogs.c:642 msgid "" @@ -595,7 +595,8 @@ msgstr "_Jumlah baris:" msgid "Hidden Applications" msgstr "Aplikasi Tersembunyi" -#. TRANSALTORS: Error returned when the tray manager failed to start. This won't +#. TRANSALTORS: Error returned when the tray manager failed to start. This +#. won't #. show up normally since this is already checked when the plugin is added. #: ../plugins/systray/xfce-tray-manager.c:433 #, c-format @@ -609,9 +610,8 @@ msgid "Task List" msgstr "Senarai Tugas" #: ../plugins/tasklist/tasklist-dialogs.c:192 -#, fuzzy msgid "Fi_xed length (pixels):" -msgstr "_Ukuran (piksel):" +msgstr "Panjang te_tap (pixel):" #: ../plugins/tasklist/tasklist-dialogs.c:217 msgid "Use _flat buttons" @@ -675,12 +675,8 @@ msgid "Window List" msgstr "Senarai Jendela" #: ../plugins/windowlist/windowlist-dialog.c:148 -msgid "" -"Urgency notification will blink the button when an application needs " -"attention." -msgstr "" -"Pemberitahuan Penting akan mengedipkan tombol ketika sebuah aplikasi " -"membutuhkan perhatian." +msgid "Urgency notification will blink the button when an application needs attention." +msgstr "Pemberitahuan Penting akan mengedipkan tombol ketika sebuah aplikasi membutuhkan perhatian." #. Button Urgency Notification #: ../plugins/windowlist/windowlist-dialog.c:155 @@ -773,7 +769,6 @@ msgstr "Manajer Panel" #~ msgid "Unknown" #~ msgstr "Tak diketahui" -#, fuzzy #~ msgid "Copyright (c) 2004-2009" #~ msgstr "Hak Cipta (c) 2004-2007" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Indonesian (id) translation to 100%
Updating branch refs/heads/xfce-4.6
to 8c6f3e23de11b9d46acc7f3db4937c026455e6af (commit)
from 634e50c80b2229c08abb4133f03666f64661616e (commit)
commit 8c6f3e23de11b9d46acc7f3db4937c026455e6af
Author: Andhika Padmawan
Date: Thu May 13 17:07:00 2010 +0200
l10n: Updated Indonesian (id) translation to 100%
New status: 62 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/id.po | 177 +-
1 files changed, 83 insertions(+), 94 deletions(-)
diff --git a/po/id.po b/po/id.po
index 6d094d7..b773ce4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,12 +2,12 @@
# Copyright (C) 2008 THE xfconf'S COPYRIGHT HOLDER
# This file is distributed under the same license as the xfconf package.
# Andhika Padmawan , 2008.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: xfconf\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-07 23:25+0200\n"
+"POT-Creation-Date: 2010-05-13 10:12+\n"
"PO-Revision-Date: 2009-01-27 22:20+0700\n"
"Last-Translator: Andhika Padmawan \n"
"Language-Team: Indonesian \n"
@@ -15,243 +15,234 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: xfconfd/xfconf-backend-perchannel-xml.c:280
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:280
#, c-format
msgid "Unable to create configuration directory \"%s\""
msgstr "Tak dapat membuat direktori konfigurasi \"%s\""
-#: xfconfd/xfconf-backend-perchannel-xml.c:328 xfconfd/xfconf-daemon.c:244
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:328
+#: ../xfconfd/xfconf-daemon.c:244
#, c-format
msgid "Permission denied while modifying property \"%s\" on channel \"%s\""
msgstr "Hak akses ditolak ketika memodifikasi properti \"%s\" di kanal \"%s\""
-#: xfconfd/xfconf-backend-perchannel-xml.c:393
-#: xfconfd/xfconf-backend-perchannel-xml.c:475
-#: xfconfd/xfconf-backend-perchannel-xml.c:636
-#: xfconfd/xfconf-backend-perchannel-xml.c:656
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:393
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:475
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:636
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:656
#, c-format
msgid "Property \"%s\" does not exist on channel \"%s\""
msgstr "Properti \"%s\" tidak ada di kanal \"%s\""
-#: xfconfd/xfconf-backend-perchannel-xml.c:603
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:603
#, c-format
msgid "Unable to remove channel \"%s\": %s"
msgstr "Tak dapat menghapus kanal \"%s\": %s"
-#: xfconfd/xfconf-backend-perchannel-xml.c:1293
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:1293
#, c-format
msgid "Invalid type for : \"%s\""
msgstr "Tipe tidak sah untuk : \"%s\""
-#: xfconfd/xfconf-backend-perchannel-xml.c:1309
-#: xfconfd/xfconf-backend-perchannel-xml.c:1385
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:1309
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:1385
#, c-format
msgid "Unable to parse value of type \"%s\" from \"%s\""
msgstr "Tak dapat mengurai nilai tipe \"%s\" dari \"%s\""
-#: xfconfd/xfconf-backend-perchannel-xml.c:1365
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:1365
#, c-format
msgid "The type attribute of cannot be an array"
msgstr "Atribut tipe dari tidak mungkin sebuah larik"
-#: xfconfd/xfconf-backend-perchannel-xml.c:1374
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:1374
#, c-format
msgid "Invalid type for : \"%s\""
msgstr "Tipe tidak sah untuk : \"%s\""
-#: xfconfd/xfconf-backend-perchannel-xml.c:1662
-#: xfconfd/xfconf-backend-perchannel-xml.c:1907
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:1662
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:1907
#, c-format
msgid "Channel \"%s\" does not exist"
msgstr "Kanal \"%s\" tidak ada"
-#: xfconfd/xfconf-backend-perchannel-xml.c:1965
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:1965
#, c-format
msgid "Unable to write channel \"%s\": %s"
msgstr "Tak dapat menulis kanal \"%s\": %s"
-#: xfconfd/xfconf-backend-factory.c:75
+#: ../xfconfd/xfconf-backend-factory.c:75
#, c-format
msgid "Unable to find Xfconf backend of type \"%s\""
msgstr "Tak dapat menemukan ujung-belakang tipe \"%s\""
-#: xfconfd/xfconf-backend.c:103
+#: ../xfconfd/xfconf-backend.c:103
#, c-format
msgid "Property names must start with a '/' character"
msgstr "Nama properti harus dimulai dengan karakter '/'"
-#: xfconfd/xfconf-backend.c:112
+#: ../xfconfd/xfconf-backend.c:112
#, c-format
msgid "The root element ('/') is not a valid property name"
msgstr "Elemen root ('/') bukan nama properti yang sah"
-#: xfconfd/xfconf-backend.c:126
+#: ../xfconfd/xfconf-backend.c:126
#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Nama properti hanya dapat menyertakan karakter ASCII A-Z, a-z, 0-9, '_', "
-"'-', '<' dan '>', serta '/' sebagai pemisah"
+msgid "Property names can only in
[Xfce4-commits] Leave panel icon styles to the system settings
Updating branch refs/heads/master
to dfddd7ce0a1822c2bbc44b9339939c2de805e1ce (commit)
from 9241afa0dba654b19649a802e22ddc99ffb27656 (commit)
commit dfddd7ce0a1822c2bbc44b9339939c2de805e1ce
Author: Christian Dywan
Date: Thu May 13 16:53:19 2010 +0200
Leave panel icon styles to the system settings
midori/midori-panel.c |1 -
midori/sokoke.c|1 +
panels/midori-bookmarks.c | 16
panels/midori-console.c|1 -
panels/midori-extensions.c |1 -
panels/midori-history.c|1 -
panels/midori-transfers.c |1 -
7 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 0905603..33618ae 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -405,7 +405,6 @@ midori_panel_init (MidoriPanel* panel)
/* Create the sidebar */
panel->toolbar = gtk_toolbar_new ();
-gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), GTK_TOOLBAR_ICONS);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (panel->toolbar),
GTK_ICON_SIZE_BUTTON);
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (panel->toolbar), FALSE);
gtk_widget_show_all (panel->toolbar);
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 32658a0..b23383f 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -1304,6 +1304,7 @@ sokoke_register_stock_items (void)
{ STOCK_PLUGINS,N_("Netscape p_lugins"), 0, 0,
GTK_STOCK_CONVERT },
{ STOCK_USER_TRASH, N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" },
{ STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD },
+{ GTK_STOCK_DIRECTORY, N_("New _Folder"), 0, 0, NULL },
};
factory = gtk_icon_factory_new ();
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 87cc242..2a901f0 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -186,14 +186,6 @@ midori_bookmarks_folder_clicked_cb (GtkWidget* toolitem)
}
static void
-midori_bookmarks_import_clicked_cb (GtkWidget* toolitem)
-{
-MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET
(toolitem));
-/* FIXME: Take selected folder into account */
-midori_browser_activate_action (browser, "BookmarksImport");
-}
-
-static void
midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview,
MidoriBookmarks* bookmarks)
{
@@ -234,7 +226,6 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
GtkToolItem* toolitem;
toolbar = gtk_toolbar_new ();
-gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar),
GTK_ICON_SIZE_BUTTON);
bookmarks->toolbar = toolbar;
toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
@@ -266,13 +257,6 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
gtk_tool_item_set_expand (toolitem, TRUE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
gtk_widget_show (GTK_WIDGET (toolitem));
-toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CONVERT);
-gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
- _("Import bookmarks..."));
-g_signal_connect (toolitem, "clicked",
-G_CALLBACK (midori_bookmarks_import_clicked_cb), bookmarks);
-gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
-gtk_widget_show (GTK_WIDGET (toolitem));
toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY);
gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
_("Add a new folder"));
diff --git a/panels/midori-console.c b/panels/midori-console.c
index f758589..545cd9e 100644
--- a/panels/midori-console.c
+++ b/panels/midori-console.c
@@ -308,7 +308,6 @@ midori_console_get_toolbar (MidoriViewable* console)
GtkToolItem* toolitem;
toolbar = gtk_toolbar_new ();
-gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar),
GTK_ICON_SIZE_BUTTON);
toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_COPY);
gtk_tool_item_set_is_important (toolitem, TRUE);
diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c
index e03c734..f1702ea 100644
--- a/panels/midori-extensions.c
+++ b/panels/midori-extensions.c
@@ -105,7 +105,6 @@ midori_extensions_get_toolbar (MidoriViewable* extensions)
GtkWidget* toolbar;
toolbar = gtk_toolbar_new ();
-gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar),
GTK_ICON_SIZE_BUTTON);
MIDORI_EXTENSIONS (extensions)->toolbar = toolbar;
diff --git a/panels/midori-history.c b/panels/midori-history.c
index 41b1951..2eed597 100644
--- a/panels/midori-history.c
+++ b/panels/midori-histo
[Xfce4-commits] Port to libxklavier 5.0 API.
Updating branch refs/heads/xfce-4.6 to 72d9c3e2e10aa4fed1d133df09f0adcfbcbce56f (commit) from b701fe0827fb71a82f7c08c8b60b2a253a2e8aaa (commit) commit 72d9c3e2e10aa4fed1d133df09f0adcfbcbce56f Author: Lionel Le Folgoc Date: Mon Jan 25 22:36:32 2010 +0100 Port to libxklavier 5.0 API. configure.ac.in|2 ++ dialogs/keyboard-settings/xfce-keyboard-settings.c |4 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 4bb52df..19aabcb 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -111,6 +111,8 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER], [libxklavier], [0.3.0], [libxklavier], [Keyboard layout selection]) XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0], [libxklavier], [Keyboard layout selection]) +XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0], + [libxklavier], [Keyboard layout selection]) dnl dnl *** Xsettings daemon is optional *** diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c index 13d83be..95d1932 100644 --- a/dialogs/keyboard-settings/xfce-keyboard-settings.c +++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c @@ -457,7 +457,11 @@ xfce_keyboard_settings_finalize (GObject *object) #ifdef HAVE_LIBXKLAVIER /* Stop xklavier engine */ +#ifdef HAVE_LIBXKLAVIER5 + xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE); +#else xkl_engine_stop_listen (settings->priv->xkl_engine); +#endif /* HAVE_LIBXKLAVIER5 */ #endif /* HAVE_LIBXKLAVIER */ g_object_unref (settings->priv->provider); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix linking issues (bug #6236).
Updating branch refs/heads/xfce-4.6 to b701fe0827fb71a82f7c08c8b60b2a253a2e8aaa (commit) from 551d539e5c6ede43a6d4b8d45c703e80a7ba3638 (commit) commit b701fe0827fb71a82f7c08c8b60b2a253a2e8aaa Author: Nick Schermer Date: Thu Apr 29 21:30:08 2010 +0200 Fix linking issues (bug #6236). dialogs/mouse-settings/Makefile.am |3 ++- xfsettingsd/Makefile.am|6 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dialogs/mouse-settings/Makefile.am b/dialogs/mouse-settings/Makefile.am index b0c459b..bc89d46 100644 --- a/dialogs/mouse-settings/Makefile.am +++ b/dialogs/mouse-settings/Makefile.am @@ -34,7 +34,8 @@ xfce4_mouse_settings_LDADD = \ $(GLADE_LIBS) \ $(LIBXFCEGUI4_LIBS) \ $(XFCONF_LIBS) \ - $(XI_LIBS) + $(XI_LIBS) \ + -lm if HAVE_XCURSOR xfce4_mouse_settings_CFLAGS += \ diff --git a/xfsettingsd/Makefile.am b/xfsettingsd/Makefile.am index 95723c5..4090d51 100644 --- a/xfsettingsd/Makefile.am +++ b/xfsettingsd/Makefile.am @@ -15,7 +15,8 @@ xfsettingsd_CFLAGS = \ $(LIBXFCE4UTIL_CFLAGS) \ -DDATADIR=\"$(datadir)\" \ -DSRCDIR=\"$(top_srcdir)\" \ - -DLOCALEDIR=\"$(localedir)\" + -DLOCALEDIR=\"$(localedir)\" \ + $(LIBX11_CFLAGS) xfsettingsd_LDADD = \ $(GTK_LIBS) \ @@ -23,7 +24,8 @@ xfsettingsd_LDADD = \ $(DBUS_GLIB_LIBS) \ $(LIBNOTIFY_LIBS) \ $(XFCONF_LIBS) \ - $(LIBXFCE4UTIL_LIBS) + $(LIBXFCE4UTIL_LIBS) \ + $(LIBX11_LIBS) INCLUDES = \ -I$(top_srcdir) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
