[Xfce4-commits] terminal:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 9b3a8023450f3c4454ca41185a318773618fb702 (commit) from eecaebbaf75a97433b698de5a9d5aeff017129d7 (commit) commit 9b3a8023450f3c4454ca41185a318773618fb702 Author: Dmitrij Smirnov a...@cnc-parts.info Date: Sat Feb 19 10:41:55 2011 +0100 l10n: Updated Russian (ru) translation to 100% New status: 273 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po |7 ++- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 465b409..12fa135 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid msgstr Project-Id-Version: Terminal 0.2.10\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-02-15 05:01+\n +POT-Creation-Date: 2011-02-19 05:01+\n PO-Revision-Date: 2010-03-02 18:14+0300\n Last-Translator: Dima Smirnov a...@cnc-parts.info\n Language-Team: \n @@ -96,17 +96,14 @@ msgid Terminal msgstr Терминал #: ../terminal/main.c:147 -#, fuzzy msgid The Xfce development team. All rights reserved. msgstr Команда разработчиков Xfce. Все права защищены. #: ../terminal/main.c:148 -#, fuzzy msgid Written by Benedikt Meurer be...@xfce.org -msgstr Разработано Benedikt Meurer be...@xfce.org +msgstr Разработчики: Benedikt Meurer be...@xfce.org #: ../terminal/main.c:149 -#, fuzzy msgid and Nick Schermer n...@xfce.org. msgstr и Nick Schermer n...@xfce.org. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master l10n: Updated Polish (pl) translation to 98%
Updating branch refs/heads/master to 9c709296dd831beff3dbce8825dd23d721b4d0d4 (commit) from 13b37a8461f4d75a703e6fc7be715ae4980dfe5c (commit) commit 9c709296dd831beff3dbce8825dd23d721b4d0d4 Author: Piotr Sokół pso...@jabster.pl Date: Sat Feb 19 14:46:19 2011 +0100 l10n: Updated Polish (pl) translation to 98% New status: 216 messages complete with 2 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 181 -- 1 files changed, 82 insertions(+), 99 deletions(-) diff --git a/po/pl.po b/po/pl.po index 64207ab..4b62de3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,14 +11,14 @@ msgid msgstr Project-Id-Version: xfce4-session 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:35+0100\n -PO-Revision-Date: 2011-01-05 13:29+0100\n +POT-Creation-Date: 2011-02-19 11:11+\n +PO-Revision-Date: 2011-02-19 14:27+0100\n Last-Translator: Piotr Sokół pso...@jabster.pl\n Language-Team: Polish \n -Language: pl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: pl\n Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10=2 n%10=4 (n %10010 || n%100=20)) ? 1 : 2));\n @@ -147,22 +147,22 @@ msgstr Za_blokuj ekran #: ../panel-plugin/xfsm-logout-plugin.c:88 #: ../panel-plugin/xfsm-logout-plugin.c:128 msgid _Suspend -msgstr _Wstrzymaj sesję +msgstr _Wstrzymaj #: ../panel-plugin/xfsm-logout-plugin.c:89 -#: ../panel-plugin/xfsm-logout-plugin.c:135 +#: ../panel-plugin/xfsm-logout-plugin.c:135 ../xfce4-session/shutdown.c:599 msgid _Hibernate -msgstr Za_hiberuj sesję +msgstr Za_hiberuj #: ../panel-plugin/xfsm-logout-plugin.c:90 #: ../panel-plugin/xfsm-logout-plugin.c:121 msgid _Reboot -msgstr _Uruchom komputer ponownie +msgstr _Uruchom ponownie #: ../panel-plugin/xfsm-logout-plugin.c:91 #: ../panel-plugin/xfsm-logout-plugin.c:114 msgid Shut _down -msgstr _Wyłącz komputer +msgstr _Wyłącz #: ../panel-plugin/xfsm-logout-plugin.c:92 #: ../panel-plugin/xfsm-logout-plugin.c:107 @@ -228,41 +228,41 @@ msgstr Nie można uruchomić programu xflock4 msgid Close Session msgstr Kończenie sesji -#: ../settings/main.c:42 +#: ../settings/main.c:43 msgid Settings manager socket msgstr Określa gniazdo menedżera ustawień -#: ../settings/main.c:42 +#: ../settings/main.c:43 msgid SOCKET ID msgstr ID_GNIAZDA -#: ../settings/main.c:43 +#: ../settings/main.c:44 msgid Version information msgstr Wypisuje informacje o wersji i kończy -#: ../settings/main.c:73 +#: ../settings/main.c:74 #, c-format msgid Type '%s --help' for usage. msgstr Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy. -#: ../settings/main.c:85 ../xfce4-session/main.c:226 +#: ../settings/main.c:86 ../xfce4-session/main.c:226 msgid The Xfce development team. All rights reserved. msgstr Zespół twórców środowiska Xfce. Wszystkie prawa zastrzeżone. -#: ../settings/main.c:86 ../xfce4-session/main.c:232 +#: ../settings/main.c:87 ../xfce4-session/main.c:232 #, c-format msgid Please report bugs to %s. msgstr Proszę zgłaszać błędy na adres %s. -#: ../settings/main.c:95 ../xfce4-session/main.c:238 ../xfce4-tips/main.c:270 +#: ../settings/main.c:96 ../xfce4-session/main.c:238 msgid Unable to contact settings server msgstr Nie można połączyć z serwerem ustawień -#: ../settings/main.c:114 +#: ../settings/main.c:115 msgid Unable to create user interface from embedded definition data msgstr -#: ../settings/main.c:127 +#: ../settings/main.c:128 msgid _Application Autostart msgstr Automatyczne _uruchamianie @@ -382,7 +382,7 @@ msgid Failed to write file %s msgstr Nie udało się zapisać pliku „%s” #: ../settings/xfae-model.c:732 -#, fuzzy, c-format +#, c-format msgid Failed to open %s for reading msgstr Nie udało się otworzyć pliku „%s” do odczytu @@ -432,7 +432,7 @@ msgstr Nie udało się edytować elementu „%s” #: ../settings/xfae-window.c:410 #, fuzzy msgid Failed to toggle item -msgstr Nie udało się przełączyć stanu uruchamiania +msgstr Nie udało się przełączyć elementu #: ../xfce4-session/main.c:76 msgid Disable binding to TCP ports @@ -471,25 +471,20 @@ msgid span size='large'bLog out %s/b/span msgstr span size='large'bWylogowywanie użytkownika „%s”/b/span #: ../xfce4-session/shutdown.c:422 -#: ../xfce4-session-logout/xfce4-session-logout.desktop.in.h:1 -msgid Log Out -msgstr Wyloguj +msgid _Log Out +msgstr Wy_loguj #: ../xfce4-session/shutdown.c:457 -msgid Restart -msgstr Uruchom ponownie +msgid _Restart +msgstr _Uruchom ponownie #: ../xfce4-session/shutdown.c:499 -msgid Shut Down -msgstr Wyłącz komputer +msgid Shut _Down +msgstr _Wyłącz #: ../xfce4-session/shutdown.c:561 -msgid Suspend -msgstr Wstrzymaj sesję - -#: ../xfce4-session/shutdown.c:599 -msgid Hibernate -msgstr Zahibernuj sesję +msgid Sus_pend +msgstr W_strzymaj #: ../xfce4-session/shutdown.c:608 msgid _Save session
[Xfce4-commits] thunar:master l10n: Updated Polish (pl) translation to 99%
Updating branch refs/heads/master to 2ea05d8bff3773803517f7ab9cd415efcbfc9991 (commit) from 2efb89974080e42cf16b6e8e5566c7767b4348e5 (commit) commit 2ea05d8bff3773803517f7ab9cd415efcbfc9991 Author: Piotr Sokół pso...@jabster.pl Date: Sat Feb 19 15:18:08 2011 +0100 l10n: Updated Polish (pl) translation to 99% New status: 675 messages complete with 2 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 42 +- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/po/pl.po b/po/pl.po index 6eb72b4..5ad5595 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,12 +11,12 @@ msgstr Project-Id-Version: Thunar 1.2.1\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2011-02-18 11:14+\n -PO-Revision-Date: 2011-02-18 12:52+0100\n +PO-Revision-Date: 2011-02-19 15:16+0100\n Last-Translator: Piotr Sokół pso...@jabster.pl\n Language-Team: Polish \n Language: \n MIME-Version: 1.0\n -Content-Type: text/plain; charset=UTF-8\n +Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10=2 n%10=4 (n %10010 || n%100=20)) ? 1 : 2));\n @@ -979,7 +979,7 @@ msgstr Otwiera zaznaczony katalog w nowym oknie #: ../thunar/thunar-launcher.c:170 ../thunar/thunar-launcher.c:172 msgid Open With Other _Application... -msgstr Otwórz za pomocą innego _programu... +msgstr Otwórz za pomocą innego p_rogramu... #: ../thunar/thunar-launcher.c:170 ../thunar/thunar-launcher.c:172 #: ../thunar/thunar-launcher.c:887 @@ -1127,18 +1127,18 @@ msgstr[2] Wyślij zaznaczone pliki do „%s” #, c-format msgid %d item (%s), Free space: %s msgid_plural %d items (%s), Free space: %s -msgstr[0] %d element (%s), dostępna przestrzeń: %s -msgstr[1] %d elementy (%s), dostępna przestrzeń: %s -msgstr[2] %d elementów (%s), dostępna przestrzeń: %s +msgstr[0] %d element (%s), wolna przestrzeń: %s +msgstr[1] %d elementy (%s), wolna przestrzeń: %s +msgstr[2] %d elementów (%s), wolna przestrzeń: %s #. just the standard text #: ../thunar/thunar-list-model.c:2317 #, c-format msgid %d item, Free space: %s msgid_plural %d items, Free space: %s -msgstr[0] %d element, dostępna przestrzeń: %s -msgstr[1] %d elementy, dostępna przestrzeń: %s -msgstr[2] %d elementów, dostępna przestrzeń: %s +msgstr[0] %d element, wolna przestrzeń: %s +msgstr[1] %d elementy, wolna przestrzeń: %s +msgstr[2] %d elementów, wolna przestrzeń: %s #: ../thunar/thunar-list-model.c:2325 #, c-format @@ -1596,7 +1596,7 @@ msgstr _Rozmiar ikon: #: ../thunar/thunar-preferences-dialog.c:403 msgid Show Icon E_mblems -msgstr S_ymbole ikon +msgstr Sym_bole ikon #: ../thunar/thunar-preferences-dialog.c:405 msgid @@ -1831,7 +1831,7 @@ msgstr _Plik #: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-window.c:295 msgid _Send To -msgstr W_yślij do... +msgstr Wyś_lij do #: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:354 msgid File Context Menu @@ -1843,7 +1843,7 @@ msgstr _Dodaj pliki... #: ../thunar/thunar-renamer-dialog.c:180 msgid Include additional files in the list of files to be renamed -msgstr Dołącza dodatkowe pliki do listy plików przeznaczonych do zmiany nazwy +msgstr Dołącza pliki do listy plików przeznaczonych do zmiany nazwy #: ../thunar/thunar-renamer-dialog.c:182 msgid Clear @@ -1906,19 +1906,19 @@ msgstr #. allocate the file chooser #: ../thunar/thunar-renamer-dialog.c:1045 msgid Select files to rename -msgstr Wybierz pliki do zmiany nazwy +msgstr Wybór pliku #: ../thunar/thunar-renamer-dialog.c:1061 msgid Audio Files -msgstr Pliki audio +msgstr Pliki nagrań dźwiękowych #: ../thunar/thunar-renamer-dialog.c:1066 msgid Image Files -msgstr Pliki _graficzne +msgstr Pliki obrazów #: ../thunar/thunar-renamer-dialog.c:1071 msgid Video Files -msgstr Pliki wideo +msgstr Pliki nagrań wideo #. just popup the about dialog #: ../thunar/thunar-renamer-dialog.c:1201 @@ -2395,7 +2395,7 @@ msgstr Ponownie odczytuje zawartość katalogu #: ../thunar/thunar-window.c:303 msgid _Location Selector -msgstr Pasek _położenia +msgstr Pasek p_ołożenia #: ../thunar/thunar-window.c:304 msgid _Side Pane @@ -2403,7 +2403,7 @@ msgstr Panel _boczny #: ../thunar/thunar-window.c:305 msgid Zoom I_n -msgstr Pow_iększ +msgstr Po_większ #: ../thunar/thunar-window.c:305 msgid Show the contents in more detail @@ -2969,7 +2969,7 @@ msgstr Format _liczb: #: ../plugins/thunar-sbr/thunar-sbr-number-renamer.c:214 msgid _Start With: -msgstr Wartość _początkowa: +msgstr Wartość p_oczątkowa: #: ../plugins/thunar-sbr/thunar-sbr-number-renamer.c:230 msgid Text _Format: @@ -2981,7 +2981,7 @@ msgstr Numerowanie #: ../plugins/thunar-sbr/thunar-sbr-remove-renamer.c:175 msgid Remove _From Position: -msgstr Pozycja _początkowa: +msgstr Pozycja p_oczątkowa: #: ../plugins/thunar-sbr/thunar-sbr-remove-renamer.c:210 msgid _To Position: @@
[Xfce4-commits] thunar:master Fix crash when trying to thumbnail a file with unknown content type.
Updating branch refs/heads/master
to b3f4ba8174af70d4aed5068333014ddd0d5e620d (commit)
from 2ea05d8bff3773803517f7ab9cd415efcbfc9991 (commit)
commit b3f4ba8174af70d4aed5068333014ddd0d5e620d
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Feb 19 15:35:33 2011 +0100
Fix crash when trying to thumbnail a file with unknown content type.
NEWS|4
thunar/thunar-thumbnailer.c | 14 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/NEWS b/NEWS
index 8bf5499..3129193 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.3.x
+=
+- Fix crash when trying to thumbnail a file with unknown content type.
+
1.3.0
=
- Paste files in correct order (bug #6504).
diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c
index 32d6218..b902d4e 100644
--- a/thunar/thunar-thumbnailer.c
+++ b/thunar/thunar-thumbnailer.c
@@ -396,6 +396,17 @@ thunar_thumbnailer_file_is_supported (ThunarThumbnailer
*thumbnailer,
return FALSE;
}
+ /* determine the content type of the passed file */
+ content_type = thunar_file_get_content_type (file);
+
+ /* abort if the content type is unknown */
+ if (content_type == NULL)
+{
+ /* release the thumbnailer lock */
+ g_mutex_unlock (thumbnailer-lock);
+ return FALSE;
+}
+
/* request the supported types on demand */
if (thumbnailer-supported_schemes == NULL
|| thumbnailer-supported_types == NULL)
@@ -412,9 +423,6 @@ thunar_thumbnailer_file_is_supported (ThunarThumbnailer
*thumbnailer,
if (thumbnailer-supported_schemes != NULL
thumbnailer-supported_types != NULL)
{
- /* determine the content type of the passed file */
- content_type = thunar_file_get_content_type (file);
-
/* go through all the URI schemes we support */
for (n = 0; !supported thumbnailer-supported_schemes[n] != NULL; ++n)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix properties dialog crash with files with unknown content type.
Updating branch refs/heads/master
to bdaafeca93422438c25e76e237bd766cfef71bcf (commit)
from b3f4ba8174af70d4aed5068333014ddd0d5e620d (commit)
commit bdaafeca93422438c25e76e237bd766cfef71bcf
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Feb 19 15:52:53 2011 +0100
Fix properties dialog crash with files with unknown content type.
NEWS |1 +
thunar/thunar-chooser-button.c| 97 +++--
thunar/thunar-properties-dialog.c | 23 ++---
3 files changed, 66 insertions(+), 55 deletions(-)
diff --git a/NEWS b/NEWS
index 3129193..266a258 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
1.3.x
=
- Fix crash when trying to thumbnail a file with unknown content type.
+- Fix properties dialog crash with files with unknown content type.
1.3.0
=
diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
index 757d8a1..fb9489a 100644
--- a/thunar/thunar-chooser-button.c
+++ b/thunar/thunar-chooser-button.c
@@ -1,8 +1,8 @@
/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2005-2006 Benedikt Meurer be...@xfce.org
- * Copyright (c) 2009-2010 Jannis Pohlmann jan...@xfce.org
* Copyright (c) 2010 Nick Schermer n...@xfce.org
+ * Copyright (c) 2009-2011 Jannis Pohlmann jan...@xfce.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -432,56 +432,59 @@ thunar_chooser_button_file_changed (ThunarChooserButton
*chooser_button,
/* determine the content type of the file */
content_type = thunar_file_get_content_type (file);
-
- /* setup a useful tooltip for the button */
- description = g_content_type_get_description (content_type);
- thunar_gtk_widget_set_tooltip (GTK_WIDGET (chooser_button),
- _(The selected application is used to open
- this and other files of type \%s\.),
- description);
- g_free (description);
-
- /* determine the default application for that content type */
- app_info = g_app_info_get_default_for_type (content_type, FALSE);
- if (G_LIKELY (app_info != NULL))
+ if (content_type != NULL)
{
- /* determine all applications that claim to be able to handle the file */
- app_infos = g_app_info_get_all_for_type (content_type);
- app_infos = g_list_sort (app_infos,
thunar_chooser_button_sort_applications);
-
- /* add all possible applications */
- for (lp = app_infos, i = 0; lp != NULL; lp = lp-next, ++i)
+ /* setup a useful tooltip for the button */
+ description = g_content_type_get_description (content_type);
+ thunar_gtk_widget_set_tooltip (GTK_WIDGET (chooser_button),
+ _(The selected application is used to
open
+ this and other files of type \%s\.),
+ description);
+ g_free (description);
+
+ /* determine the default application for that content type */
+ app_info = g_app_info_get_default_for_type (content_type, FALSE);
+ if (G_LIKELY (app_info != NULL))
{
- /* insert the item into the store */
- gtk_list_store_insert_with_values (chooser_button-store, iter, i,
-
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_NAME,
- g_app_info_get_name (lp-data),
-
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_APPLICATION,
- lp-data,
-
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_ICON,
- g_app_info_get_icon (lp-data),
-
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_SENSITIVE,
- TRUE,
- -1);
-
- /* pre-select the default application */
- if (g_app_info_equal (lp-data, app_info))
-gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser_button),
iter);
-
- /* release the application */
- g_object_unref (lp-data);
+ /* determine all applications that claim to be able to handle the
file */
+ app_infos = g_app_info_get_all_for_type (content_type);
+ app_infos = g_list_sort (app_infos,
thunar_chooser_button_sort_applications);
+
+ /* add all possible applications */
+ for (lp = app_infos, i = 0; lp != NULL; lp = lp-next, ++i)
+{
+ /* insert the item into the store */
+ gtk_list_store_insert_with_values (chooser_button-store, iter,
i,
+
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_NAME,
+ g_app_info_get_name
[Xfce4-commits] thunar:xfce-4.8 Fix crash when trying to thumbnail a file with unknown content type.
Updating branch refs/heads/xfce-4.8
to 506851c47e6cf415d71d45a5c67ca05984423717 (commit)
from a8bc7dfae527a4a3b63c93959c361ff0809fd91b (commit)
commit 506851c47e6cf415d71d45a5c67ca05984423717
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Feb 19 15:35:33 2011 +0100
Fix crash when trying to thumbnail a file with unknown content type.
NEWS|4
thunar/thunar-thumbnailer.c | 14 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/NEWS b/NEWS
index 38c4449..b324c95 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.2.x
+=
+- Fix crash when trying to thumbnail a file with unknown content type.
+
1.2.1
=
- Paste files in correct order (bug #6504).
diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c
index 8146d29..93127a0 100644
--- a/thunar/thunar-thumbnailer.c
+++ b/thunar/thunar-thumbnailer.c
@@ -480,6 +480,17 @@ thunar_thumbnailer_file_is_supported (ThunarThumbnailer
*thumbnailer,
return FALSE;
}
+ /* determine the content type of the passed file */
+ content_type = thunar_file_get_content_type (file);
+
+ /* abort if the content type is unknown */
+ if (content_type == NULL)
+{
+ /* release the thumbnailer lock */
+ g_mutex_unlock (thumbnailer-lock);
+ return FALSE;
+}
+
/* request the supported types on demand */
if (thumbnailer-supported_schemes == NULL
|| thumbnailer-supported_types == NULL)
@@ -496,9 +507,6 @@ thunar_thumbnailer_file_is_supported (ThunarThumbnailer
*thumbnailer,
if (thumbnailer-supported_schemes != NULL
thumbnailer-supported_types != NULL)
{
- /* determine the content type of the passed file */
- content_type = thunar_file_get_content_type (file);
-
/* go through all the URI schemes we support */
for (n = 0; !supported thumbnailer-supported_schemes[n] != NULL; ++n)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:xfce-4.8 Fix properties dialog crash with files with unknown content type.
Updating branch refs/heads/xfce-4.8
to 90ef6879c6518500f2abbdf3e13eec5b9e3adcc6 (commit)
from 506851c47e6cf415d71d45a5c67ca05984423717 (commit)
commit 90ef6879c6518500f2abbdf3e13eec5b9e3adcc6
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Feb 19 15:52:53 2011 +0100
Fix properties dialog crash with files with unknown content type.
NEWS |1 +
thunar/thunar-chooser-button.c| 97 +++--
thunar/thunar-properties-dialog.c | 23 ++---
3 files changed, 66 insertions(+), 55 deletions(-)
diff --git a/NEWS b/NEWS
index b324c95..534081c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
1.2.x
=
- Fix crash when trying to thumbnail a file with unknown content type.
+- Fix properties dialog crash with files with unknown content type.
1.2.1
=
diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
index 757d8a1..fb9489a 100644
--- a/thunar/thunar-chooser-button.c
+++ b/thunar/thunar-chooser-button.c
@@ -1,8 +1,8 @@
/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2005-2006 Benedikt Meurer be...@xfce.org
- * Copyright (c) 2009-2010 Jannis Pohlmann jan...@xfce.org
* Copyright (c) 2010 Nick Schermer n...@xfce.org
+ * Copyright (c) 2009-2011 Jannis Pohlmann jan...@xfce.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -432,56 +432,59 @@ thunar_chooser_button_file_changed (ThunarChooserButton
*chooser_button,
/* determine the content type of the file */
content_type = thunar_file_get_content_type (file);
-
- /* setup a useful tooltip for the button */
- description = g_content_type_get_description (content_type);
- thunar_gtk_widget_set_tooltip (GTK_WIDGET (chooser_button),
- _(The selected application is used to open
- this and other files of type \%s\.),
- description);
- g_free (description);
-
- /* determine the default application for that content type */
- app_info = g_app_info_get_default_for_type (content_type, FALSE);
- if (G_LIKELY (app_info != NULL))
+ if (content_type != NULL)
{
- /* determine all applications that claim to be able to handle the file */
- app_infos = g_app_info_get_all_for_type (content_type);
- app_infos = g_list_sort (app_infos,
thunar_chooser_button_sort_applications);
-
- /* add all possible applications */
- for (lp = app_infos, i = 0; lp != NULL; lp = lp-next, ++i)
+ /* setup a useful tooltip for the button */
+ description = g_content_type_get_description (content_type);
+ thunar_gtk_widget_set_tooltip (GTK_WIDGET (chooser_button),
+ _(The selected application is used to
open
+ this and other files of type \%s\.),
+ description);
+ g_free (description);
+
+ /* determine the default application for that content type */
+ app_info = g_app_info_get_default_for_type (content_type, FALSE);
+ if (G_LIKELY (app_info != NULL))
{
- /* insert the item into the store */
- gtk_list_store_insert_with_values (chooser_button-store, iter, i,
-
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_NAME,
- g_app_info_get_name (lp-data),
-
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_APPLICATION,
- lp-data,
-
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_ICON,
- g_app_info_get_icon (lp-data),
-
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_SENSITIVE,
- TRUE,
- -1);
-
- /* pre-select the default application */
- if (g_app_info_equal (lp-data, app_info))
-gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser_button),
iter);
-
- /* release the application */
- g_object_unref (lp-data);
+ /* determine all applications that claim to be able to handle the
file */
+ app_infos = g_app_info_get_all_for_type (content_type);
+ app_infos = g_list_sort (app_infos,
thunar_chooser_button_sort_applications);
+
+ /* add all possible applications */
+ for (lp = app_infos, i = 0; lp != NULL; lp = lp-next, ++i)
+{
+ /* insert the item into the store */
+ gtk_list_store_insert_with_values (chooser_button-store, iter,
i,
+
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_NAME,
+ g_app_info_get_name
[Xfce4-commits] thunar:jannis/thumbnailer-improvements Deleting branch jannis/thumbnailer-improvements
Deleting branch refs/heads/jannis/thumbnailer-improvements ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix crash when opening a mountable drive with no media.
Updating branch refs/heads/master
to f3def301388057f8080d675c8446907d7c62f3bc (commit)
from bdaafeca93422438c25e76e237bd766cfef71bcf (commit)
commit f3def301388057f8080d675c8446907d7c62f3bc
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Feb 19 16:06:27 2011 +0100
Fix crash when opening a mountable drive with no media.
Error spotted, reported and solved by Ambroz Bizjak.
NEWS |2 ++
thunar/thunar-file.c | 24 +---
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/NEWS b/NEWS
index 266a258..686006f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
=
- Fix crash when trying to thumbnail a file with unknown content type.
- Fix properties dialog crash with files with unknown content type.
+- Fix crash when opening a mountable drive with no media (bug #7308).
+ Reported and solved by Ambroz Bizjak.
1.3.0
=
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index ebb1032..25b16a3 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -702,14 +702,15 @@ thunar_file_load (ThunarFile *file,
GCancellable *cancellable,
GError **error)
{
- GKeyFile *key_file;
- GError *err = NULL;
- GFile*thumbnail_dir;
- gchar*base_name;
- gchar*md5_hash;
- gchar*p;
- gchar*thumbnail_dir_path;
- gchar*uri = NULL;
+ const gchar *target_uri;
+ GKeyFile*key_file;
+ GError *err = NULL;
+ GFile *thumbnail_dir;
+ gchar *base_name;
+ gchar *md5_hash;
+ gchar *p;
+ gchar *thumbnail_dir_path;
+ gchar *uri = NULL;
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
_thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -750,9 +751,10 @@ thunar_file_load (ThunarFile *file,
{
if (g_file_info_get_file_type (file-info) == G_FILE_TYPE_MOUNTABLE)
{
- file-is_mounted =
-!g_file_info_get_attribute_boolean (file-info,
-
G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT);
+ target_uri =
+g_file_info_get_attribute_string (file-info,
+
G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+ file-is_mounted = (target_uri != NULL);
}
}
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:xfce-4.8 Fix crash when opening a mountable drive with no media.
Updating branch refs/heads/xfce-4.8
to 61c04e0407e2e9db1ab8f2d2a7fe9adc4edde716 (commit)
from 90ef6879c6518500f2abbdf3e13eec5b9e3adcc6 (commit)
commit 61c04e0407e2e9db1ab8f2d2a7fe9adc4edde716
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Feb 19 16:06:27 2011 +0100
Fix crash when opening a mountable drive with no media.
Error spotted, reported and solved by Ambroz Bizjak.
NEWS |2 ++
thunar/thunar-file.c | 24 +---
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/NEWS b/NEWS
index 534081c..9b21960 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
=
- Fix crash when trying to thumbnail a file with unknown content type.
- Fix properties dialog crash with files with unknown content type.
+- Fix crash when opening a mountable drive with no media (bug #7308).
+ Reported and solved by Ambroz Bizjak.
1.2.1
=
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 1281841..1767f10 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -702,14 +702,15 @@ thunar_file_load (ThunarFile *file,
GCancellable *cancellable,
GError **error)
{
- GKeyFile *key_file;
- GError *err = NULL;
- GFile*thumbnail_dir;
- gchar*base_name;
- gchar*md5_hash;
- gchar*p;
- gchar*thumbnail_dir_path;
- gchar*uri = NULL;
+ const gchar *target_uri;
+ GKeyFile*key_file;
+ GError *err = NULL;
+ GFile *thumbnail_dir;
+ gchar *base_name;
+ gchar *md5_hash;
+ gchar *p;
+ gchar *thumbnail_dir_path;
+ gchar *uri = NULL;
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
_thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -750,9 +751,10 @@ thunar_file_load (ThunarFile *file,
{
if (g_file_info_get_file_type (file-info) == G_FILE_TYPE_MOUNTABLE)
{
- file-is_mounted =
-!g_file_info_get_attribute_boolean (file-info,
-
G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT);
+ target_uri =
+g_file_info_get_attribute_string (file-info,
+
G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+ file-is_mounted = (target_uri != NULL);
}
}
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to a2a7606649e52f2dd0f7460f8b7ce2dc107bf401 (commit) from 9c709296dd831beff3dbce8825dd23d721b4d0d4 (commit) commit a2a7606649e52f2dd0f7460f8b7ce2dc107bf401 Author: Sergio Marques smarque...@gmail.com Date: Sat Feb 19 16:11:22 2011 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 220 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 108 +++--- 1 files changed, 47 insertions(+), 61 deletions(-) diff --git a/po/pt.po b/po/pt.po index 927191f..66c12e0 100644 --- a/po/pt.po +++ b/po/pt.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-session 4.6.x\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-02-17 11:11+\n +POT-Creation-Date: 2011-02-19 11:11+\n PO-Revision-Date: 2010-12-23 16:19+0100\n Last-Translator: Nuno Miguel nu...@netcabo.pt\n Language-Team: \n @@ -251,7 +251,7 @@ msgstr A equipa de desenvolvimento do Xfce. Todos os direitos reservados. msgid Please report bugs to %s. msgstr Por favor, reporte os erros para %s. -#: ../settings/main.c:96 ../xfce4-session/main.c:238 ../xfce4-tips/main.c:270 +#: ../settings/main.c:96 ../xfce4-session/main.c:238 msgid Unable to contact settings server msgstr Incapaz de contactar servidor de definições @@ -486,7 +486,7 @@ msgstr bOcorreu um erro/b msgid Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account. msgstr Pode ter indicado uma palavra-passe inválida ou o administrador do sistema não permite desligar este computador através da sua conta de utilizador. -#: ../xfce4-session/shutdown.c:833 ../xfce4-session/xfsm-manager.c:1119 +#: ../xfce4-session/shutdown.c:833 ../xfce4-session/xfsm-manager.c:1122 msgid Shutdown Failed msgstr Falha ao desligar @@ -527,14 +527,10 @@ msgstr Criar nova sessão. msgid The client doesn't have any properties set yet msgstr O cliente ainda não definiu as propriedades -#: ../xfce4-session/xfsm-compat-gnome.c:301 +#: ../xfce4-session/xfsm-compat-gnome.c:246 msgid Starting The Gnome Keyring Daemon msgstr Iniciando o serviço Gnome Keyring -#: ../xfce4-session/xfsm-compat-gnome.c:313 -msgid Starting Gnome Assistive Technologies -msgstr Iniciando tecnologias de acessibilidade Gnome - #: ../xfce4-session/xfsm-compat-kde.c:124 msgid Starting KDE services msgstr Iniciando serviços KDE @@ -564,55 +560,55 @@ msgstr Continuar na mesma msgid Try again msgstr Tentar novamente -#: ../xfce4-session/xfsm-manager.c:602 +#: ../xfce4-session/xfsm-manager.c:604 #, c-format msgid Unable to determine failsafe session name. Possible causes: xfconfd isn't running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set incorrectly (must include \%s\), or xfce4-session is installed incorrectly. msgstr Incapaz de determinar o nome de sessão \failsafe\. Causas possíveis: xfconfd não está em execução (problema de configuração D-Bus); variável de ambiente $XDG_CONFIG_DIRS incorrecta (deve incluir \%s\) ou xfce4-session mal instalado. -#: ../xfce4-session/xfsm-manager.c:613 +#: ../xfce4-session/xfsm-manager.c:615 #, c-format msgid The specified failsafe session (\%s\) is not marked as a failsafe session. msgstr A sessão \failsafe\ especificada (\%s\) não é reconhecida como uma sessão \failsafe\. -#: ../xfce4-session/xfsm-manager.c:660 +#: ../xfce4-session/xfsm-manager.c:662 msgid The list of applications in the failsafe session is empty. msgstr A lista de aplicações da sessão \failsafe\ está vazia. #. FIXME: migrate this into the splash screen somehow so the #. * window doesn't look ugly (right now now WM is running, so it #. * won't have window decorations). -#: ../xfce4-session/xfsm-manager.c:707 +#: ../xfce4-session/xfsm-manager.c:709 msgid Session Manager Error msgstr Erro do gestor de sessões -#: ../xfce4-session/xfsm-manager.c:709 +#: ../xfce4-session/xfsm-manager.c:711 msgid Unable to load a failsafe session msgstr Incapaz de carregar a sessão \failsafe\ -#: ../xfce4-session/xfsm-manager.c:1122 +#: ../xfce4-session/xfsm-manager.c:1125 msgid Failed to suspend session msgstr Falha ao suspender a sessão -#: ../xfce4-session/xfsm-manager.c:1123 +#: ../xfce4-session/xfsm-manager.c:1126 msgid Failed to hibernate session msgstr Falha ao hibernar a sessão -#: ../xfce4-session/xfsm-manager.c:1411 +#: ../xfce4-session/xfsm-manager.c:1414 #, c-format msgid Can only terminate clients when in the idle state msgstr Apenas pode terminar os clientes inactivos -#: ../xfce4-session/xfsm-manager.c:1942 +#: ../xfce4-session/xfsm-manager.c:1951 #, c-format msgid Session manager must be in idle state when requesting a checkpoint msgstr O gestor de sessões tem de estar inactivo ao solicitar um ponto de verificação -#: ../xfce4-session/xfsm-manager.c:1983 +#:
[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to fb1d64d0992511f16d594e580bc04f4c31ec54a5 (commit) from 9487069c41f9e4a56bf603f0103184af9566d6c9 (commit) commit fb1d64d0992511f16d594e580bc04f4c31ec54a5 Author: Sergio Marques smarque...@gmail.com Date: Sat Feb 19 16:28:50 2011 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 269 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 450 +++--- 1 files changed, 165 insertions(+), 285 deletions(-) diff --git a/po/pt.po b/po/pt.po index 7156171..31b4794 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,20 +2,19 @@ # Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4_settings package. # Nuno Miguel nu...@netcabo.pt, 2008, 2009. -# -#: ../xfsettingsd/main.c:127 +# msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:16+0100\n +POT-Creation-Date: 2011-02-19 11:12+\n PO-Revision-Date: 2010-11-09 16:14+0100\n Last-Translator: Nuno Miguel nu...@netcabo.pt\n Language-Team: \n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Poedit-Language: Portuguese\n X-Poedit-Country: PORTUGAL\n @@ -38,167 +37,154 @@ msgid Accessibility msgstr Acessibilidade #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:5 +msgid +Assistive technologies will be available the\n +next time you login +msgstr +As tecnologias de acessibilidade estarão disponíveis\n +no próximo início de sessão. + +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7 msgid Bounce Keys msgstr Teclas saltitantes -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:6 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8 msgid Configure keyboard and mouse accessibility msgstr Configurar a acessibilidade do teclado e rato -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9 msgid Disable sticky keys if _two keys are pressed msgstr Desligar teclas fi_xas se duas teclas forem pressionadas -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10 +msgid If enabled, the session manager will start the required applications for screen readers and magnifiers +msgstr Se activadas, o gestor de sessões vai iniciar todas as aplicações necessárias para o leitores de ecrã e ampliadores. + +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11 msgid K_eystroke delay: msgstr Atraso do pressionar de t_eclas: -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12 msgid Keyboa_rd msgstr Te_clado -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13 msgid Maximum _speed: msgstr Velo_cidade máxima: -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:14 msgid Mouse Emulation msgstr Emulação do rato -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15 +msgid No AT-SPI provider was found on your system +msgstr Não foi encontrado no sistema qualquer fornecedor AT-SI + +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16 msgid R_epeat interval: msgstr Intervalo de r_epetição: -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17 msgid Slow Keys msgstr Teclas lentas -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:14 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18 msgid Sticky Keys msgstr Teclas fixas -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15 +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19 msgid The amount of time, in milliseconds, required between keystrokes msgstr O tempo, em milissegundos, necessário entre pressões de teclas -#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16 -msgid -The amount of time, in milliseconds, that must elapse before a keystroke -will be accepted -msgstr -O tempo, em milissegundos, que deve decorrer antes que uma pressão de tecla -seja aceite +#: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20 +msgid The amount of time, in milliseconds, that must elapse before a keystroke will be accepted +msgstr O tempo, em milissegundos, que deve decorrer antes
[Xfce4-commits] xfce4-panel:master l10n: Updated Polish (pl) translation to 92%
Updating branch refs/heads/master to 23da405af99391a765dedb54445008460d03894e (commit) from e1aa36e3cabb3e22d1727d4c335a9115b6bf56b9 (commit) commit 23da405af99391a765dedb54445008460d03894e Author: Piotr Sokół pso...@jabster.pl Date: Sat Feb 19 16:46:03 2011 +0100 l10n: Updated Polish (pl) translation to 92% New status: 319 messages complete with 4 fuzzies and 22 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 136 -- 1 files changed, 70 insertions(+), 66 deletions(-) diff --git a/po/pl.po b/po/pl.po index c0fd6d5..6c64f71 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,5 +1,5 @@ # Polish translations for xfce4-panel package. -# Copyright (C) 2009 Jasper Huijsmans. +# Copyright © 2004-2011 Xfce Development Team # This file is distributed under the same license as the xfce4-panel package. # Paweł Pastuła pastu...@poczta.onet.pl, 2003. # Daniel Mróz be...@alpha.pl, 2003. @@ -12,28 +12,26 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.6\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:01+0100\n -PO-Revision-Date: 2011-01-03 17:24+0100\n +POT-Creation-Date: 2011-02-19 11:10+\n +PO-Revision-Date: 2011-02-19 16:45+0100\n Last-Translator: Piotr Sokół pso...@jabster.pl\n Language-Team: Polish \n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: \n Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10=2 n%10=4 (n %10010 || n%100=20)) ? 1 : 2));\n #: ../panel-desktop-handler.desktop.in.h:1 -#, fuzzy msgid Add a new launcher to the panel based on the information of this desktop file msgstr Dodaje do panelu aktywator wykorzystując do tego wskazany plik aktywatora #: ../panel-desktop-handler.desktop.in.h:2 -#, fuzzy msgid Create Launcher on the panel -msgstr Tworzy aktywator na panelu +msgstr Dodanie aktywatora do panelu #: ../panel-preferences.desktop.in.h:1 #, fuzzy @@ -41,7 +39,7 @@ msgid Customize the panel msgstr O programie #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2261 #: ../migrate/main.c:84 msgid Panel msgstr Panel @@ -89,17 +87,17 @@ msgid Pane_l msgstr Pane_l #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2273 msgid Add _New Items... msgstr _Dodaj aplet... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2284 msgid Panel Pr_eferences... msgstr P_referencje... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2300 msgid Log _Out msgstr _Wyloguj @@ -125,15 +123,15 @@ msgstr Dodaje nowy aplet do panelu #: ../panel/main.c:81 msgid PLUGIN-NAME -msgstr NAZWA_APLETU +msgstr APLET #: ../panel/main.c:82 msgid Restart the running panel instance -msgstr Uruchamia ponownie wystąpienie programu +msgstr Uruchamia ponownie bieżące wystąpienie programu #: ../panel/main.c:83 msgid Quit the running panel instance -msgstr Kończy działanie wystąpienia programu +msgstr Kończy działanie bieżącego wystąpienia programu #: ../panel/main.c:84 #: ../plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh:33 @@ -212,11 +210,11 @@ msgstr msgid No running instance of %s was found msgstr Nie odnaleziono uruchomionego wystąpienia %s -#: ../panel/panel-application.c:196 +#: ../panel/panel-application.c:195 msgid Failed to launch the migration application msgstr Nie udało się uruchomić programu importowania konfiguracji -#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 +#: ../panel/panel-application.c:1451 ../plugins/actions/actions.c:421 msgid You have started X without session manager. Clicking Quit will close the X server. @@ -224,21 +222,21 @@ msgstr Uruchomiono serwer X bez menedżera sesji. Zakończenie programu zakończy działanie serwera X. -#: ../panel/panel-application.c:1447 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1452 ../plugins/actions/actions.c:422 msgid Are you sure you want to quit the panel? msgstr Zakończyć działanie panelu? -#: ../panel/panel-application.c:1455 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1460 ../plugins/actions/actions.c:430 #, c-format msgid Failed to execute command \%s\ msgstr Nie udało się wykonać polecenia „%s”. -#: ../panel/panel-dbus-client.c:209 +#: ../panel/panel-dbus-client.c:208 msgid Invalid plugin event syntax specified. Use PLUGIN-NAME:NAME[:TYPE:VALUE]. msgstr -#: ../panel/panel-dbus-client.c:242 +#:
[Xfce4-commits] xfce4-panel:master Ask to start the panel if 'xfce4-panel -r' is called without instance.
Updating branch refs/heads/master
to 8f1f6d76103cdc1235e5620bcfb28ca30caf84a3 (commit)
from 23da405af99391a765dedb54445008460d03894e (commit)
commit 8f1f6d76103cdc1235e5620bcfb28ca30caf84a3
Author: Nick Schermer n...@xfce.org
Date: Sat Feb 19 13:57:31 2011 +0100
Ask to start the panel if 'xfce4-panel -r' is called without instance.
panel/main.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/panel/main.c b/panel/main.c
index e8ae316..67ad6a2 100644
--- a/panel/main.c
+++ b/panel/main.c
@@ -397,7 +397,7 @@ dbus_return:
if (error-code == DBUS_GERROR_NAME_HAS_NO_OWNER)
{
/* normally start the panel */
- if (opt_preferences = 0)
+ if (opt_preferences = 0 || opt_restart)
{
g_clear_error (error);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Rename plugin property change functions.
Updating branch refs/heads/master
to 0a5af2398d47c46f473cb97dbc102b1d4323e715 (commit)
from 8f1f6d76103cdc1235e5620bcfb28ca30caf84a3 (commit)
commit 0a5af2398d47c46f473cb97dbc102b1d4323e715
Author: Nick Schermer n...@xfce.org
Date: Sat Feb 19 15:41:33 2011 +0100
Rename plugin property change functions.
panel/panel-window.c | 40
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 609f276..2866a72 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -128,17 +128,16 @@ static void panel_window_set_autohide
(PanelWindow *w
gboolean
autohide);
static void panel_window_menu_popup (PanelWindow
*window,
guint32
event_time);
-static void panel_window_update_plugins (PanelWindow
*window,
+static void panel_window_plugins_update (PanelWindow
*window,
PluginProp
prop);
-static void panel_window_set_plugin_orientation (GtkWidget
*widget,
+static void panel_window_plugin_set_orientation (GtkWidget
*widget,
gpointer
user_data);
-static void panel_window_set_plugin_size(GtkWidget
*widget,
+static void panel_window_plugin_set_size(GtkWidget
*widget,
gpointer
user_data);
-static void panel_window_set_plugin_screen_position (GtkWidget
*widget,
+static void panel_window_plugin_set_screen_position (GtkWidget
*widget,
gpointer
user_data);
-
enum
{
PROP_0,
@@ -548,8 +547,8 @@ panel_window_set_property (GObject *object,
}
/* send the new orientation and screen position to the panel plugins */
- panel_window_update_plugins (window, PLUGIN_PROP_ORIENTATION);
- panel_window_update_plugins (window, PLUGIN_PROP_SCREEN_POSITION);
+ panel_window_plugins_update (window, PLUGIN_PROP_ORIENTATION);
+ panel_window_plugins_update (window, PLUGIN_PROP_SCREEN_POSITION);
break;
case PROP_SIZE:
@@ -561,7 +560,7 @@ panel_window_set_property (GObject *object,
}
/* send the new size to the panel plugins */
- panel_window_update_plugins (window, PLUGIN_PROP_SIZE);
+ panel_window_plugins_update (window, PLUGIN_PROP_SIZE);
break;
case PROP_LENGTH:
@@ -635,7 +634,7 @@ panel_window_set_property (GObject *object,
panel_window_screen_layout_changed (window-screen, window);
/* send the new screen position to the panel plugins */
- panel_window_update_plugins (window, PLUGIN_PROP_SCREEN_POSITION);
+ panel_window_plugins_update (window, PLUGIN_PROP_SCREEN_POSITION);
}
else
{
@@ -1007,7 +1006,7 @@ panel_window_button_release_event (GtkWidget *widget,
g_object_notify (G_OBJECT (widget), position);
/* send the new screen position to the panel plugins */
- panel_window_update_plugins (window, PLUGIN_PROP_SCREEN_POSITION);
+ panel_window_plugins_update (window, PLUGIN_PROP_SCREEN_POSITION);
return TRUE;
}
@@ -2332,7 +2331,7 @@ panel_window_menu_popup (PanelWindow *window,
static void
-panel_window_update_plugins (PanelWindow *window,
+panel_window_plugins_update (PanelWindow *window,
PluginProp prop)
{
GtkWidget *itembar;
@@ -2343,15 +2342,16 @@ panel_window_update_plugins (PanelWindow *window,
switch (prop)
{
case PLUGIN_PROP_ORIENTATION:
- func = panel_window_set_plugin_orientation;
+ func = panel_window_plugin_set_orientation;
break;
case PLUGIN_PROP_SCREEN_POSITION:
- func = panel_window_set_plugin_screen_position;
+ func = panel_window_plugin_set_screen_position;
break;
case PLUGIN_PROP_SIZE:
- func = panel_window_set_plugin_size;
+ func = panel_window_plugin_set_size;
+ break;
break;
default:
@@ -2370,7 +2370,7 @@ panel_window_update_plugins (PanelWindow *window,
static void
-panel_window_set_plugin_orientation (GtkWidget *widget,
+panel_window_plugin_set_orientation (GtkWidget *widget,
gpointer user_data)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (widget));
@@ -2384,7 +2384,7 @@ panel_window_set_plugin_orientation (GtkWidget *widget,
static void
-panel_window_set_plugin_size (GtkWidget *widget,
+panel_window_plugin_set_size (GtkWidget
[Xfce4-commits] xfce4-panel:master Respawn a child if the widget was realized with a pid.
Updating branch refs/heads/master
to 2303c7b94aac05d53f8b3f5f23fcbf8808a0d129 (commit)
from 0a5af2398d47c46f473cb97dbc102b1d4323e715 (commit)
commit 2303c7b94aac05d53f8b3f5f23fcbf8808a0d129
Author: Nick Schermer n...@xfce.org
Date: Sat Feb 19 15:42:58 2011 +0100
Respawn a child if the widget was realized with a pid.
In some cases the plugin is unrealized, for example when
moving the panel to another screen. In this case there is still
a pid when realizing, while the process was asked to quit in
unrealize. In this case wait for the pid to quit and then
respawn the plugin again.
panel/panel-plugin-external.c | 43 ++--
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/panel/panel-plugin-external.c b/panel/panel-plugin-external.c
index 484b531..e8ce304 100644
--- a/panel/panel-plugin-external.c
+++ b/panel/panel-plugin-external.c
@@ -68,8 +68,7 @@ static void panel_plugin_external_plug_added
(GtkSocket
static gboolean panel_plugin_external_plug_removed(GtkSocket
*socket);
static gboolean panel_plugin_external_child_ask_restart
(PanelPluginExternal *external);
static void panel_plugin_external_child_spawn
(PanelPluginExternal *external);
-static gboolean panel_plugin_external_child_respawn (gpointer
user_data);
-static void panel_plugin_external_child_respawn_destroyed (gpointer
user_data);
+static void panel_plugin_external_child_respawn_schedule
(PanelPluginExternal *external);
static void panel_plugin_external_child_watch (GPid
pid,
gint
status,
gpointer
user_data);
@@ -340,6 +339,13 @@ panel_plugin_external_realize (GtkWidget *widget)
panel_plugin_external_child_spawn (external);
}
+ else
+{
+ /* the child was asked to quit during unrealize and there is
+ * still an pid, so wait for the child to quit and then
+ * spawn it again */
+ panel_plugin_external_child_respawn_schedule (external);
+}
}
@@ -619,7 +625,8 @@ panel_plugin_external_child_respawn (gpointer user_data)
return FALSE;
/* delay startup if the old child is still embedded */
- if (external-priv-embedded)
+ if (external-priv-embedded
+ || external-priv-pid != 0)
{
panel_debug (PANEL_DEBUG_EXTERNAL,
%s-%d: still a child embedded, respawn delayed,
@@ -651,6 +658,25 @@ panel_plugin_external_child_respawn_destroyed (gpointer
user_data)
static void
+panel_plugin_external_child_respawn_schedule (PanelPluginExternal *external)
+{
+ panel_return_if_fail (PANEL_IS_PLUGIN_EXTERNAL (external));
+
+ if (external-priv-spawn_timeout_id == 0)
+{
+ panel_debug (PANEL_DEBUG_EXTERNAL,
+ %s-%d: scheduled a respawn of the child,
+ panel_module_get_name (external-module),
external-unique_id);
+
+ /* schedule a restart timeout */
+ external-priv-spawn_timeout_id = g_timeout_add_full (G_PRIORITY_LOW,
100, panel_plugin_external_child_respawn,
+ external,
panel_plugin_external_child_respawn_destroyed);
+}
+}
+
+
+
+static void
panel_plugin_external_child_watch (GPid pid,
gint status,
gpointer user_data)
@@ -661,7 +687,9 @@ panel_plugin_external_child_watch (GPid pid,
panel_return_if_fail (PANEL_IS_PLUGIN_EXTERNAL (external));
panel_return_if_fail (external-priv-pid == pid);
+ /* reset the pid, it can't be embedded as well */
external-priv-pid = 0;
+ external-priv-embedded = FALSE;
panel_debug (PANEL_DEBUG_EXTERNAL,
%s-%d: child exited with status %d,
@@ -715,16 +743,9 @@ panel_plugin_external_child_watch (GPid pid,
}
if (GTK_WIDGET_REALIZED (external)
- external-priv-spawn_timeout_id == 0
(auto_restart || panel_plugin_external_child_ask_restart (external)))
{
- panel_debug (PANEL_DEBUG_EXTERNAL,
-%s-%d: scheduled a respawn of the child,
-panel_module_get_name (external-module),
external-unique_id);
-
- /* schedule a restart timeout */
- external-priv-spawn_timeout_id = g_timeout_add_full (G_PRIORITY_LOW,
100, panel_plugin_external_child_respawn,
- external,
panel_plugin_external_child_respawn_destroyed);
+ panel_plugin_external_child_respawn_schedule (external);
}
close_pid:
[Xfce4-commits] xfce4-panel:master Don't crash on a wrong colormap when changing screens.
Updating branch refs/heads/master
to 7bd1028804d7f5ffa7dc7994d7104a02375a0bc2 (commit)
from 2303c7b94aac05d53f8b3f5f23fcbf8808a0d129 (commit)
commit 7bd1028804d7f5ffa7dc7994d7104a02375a0bc2
Author: Nick Schermer n...@xfce.org
Date: Sat Feb 19 15:45:08 2011 +0100
Don't crash on a wrong colormap when changing screens.
panel/panel-base-window.c | 48 ++---
panel/panel-window.c |3 ++
2 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 8b08ed5..7025621 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -45,6 +45,8 @@ static void panel_base_window_set_property
(GObject
const GValue
*value,
GParamSpec
*pspec);
static void panel_base_window_finalize(GObject
*object);
+static void panel_base_window_screen_changed (GtkWidget
*widget,
+ GdkScreen
*previous_screen);
static gboolean panel_base_window_expose_event(GtkWidget
*widget,
GdkEventExpose
*event);
static gboolean panel_base_window_enter_notify_event (GtkWidget
*widget,
@@ -119,6 +121,7 @@ panel_base_window_class_init (PanelBaseWindowClass *klass)
gtkwidget_class-enter_notify_event = panel_base_window_enter_notify_event;
gtkwidget_class-leave_notify_event = panel_base_window_leave_notify_event;
gtkwidget_class-composited_changed = panel_base_window_composited_changed;
+ gtkwidget_class-screen_changed = panel_base_window_screen_changed;
g_object_class_install_property (gobject_class,
PROP_ENTER_OPACITY,
@@ -192,9 +195,6 @@ panel_base_window_class_init (PanelBaseWindowClass *klass)
static void
panel_base_window_init (PanelBaseWindow *window)
{
- GdkColormap *colormap;
- GdkScreen *screen;
-
window-priv = G_TYPE_INSTANCE_GET_PRIVATE (window, PANEL_TYPE_BASE_WINDOW,
PanelBaseWindowPrivate);
window-is_composited = FALSE;
@@ -212,19 +212,6 @@ panel_base_window_init (PanelBaseWindow *window)
/* some wm require stick to show the window on all workspaces, on xfwm4
* the type-hint already takes care of that */
gtk_window_stick (GTK_WINDOW (window));
-
- /* set the rgba colormap if supported by the screen */
- screen = gtk_window_get_screen (GTK_WINDOW (window));
- colormap = gdk_screen_get_rgba_colormap (screen);
- if (colormap != NULL)
-{
- gtk_widget_set_colormap (GTK_WIDGET (window), colormap);
- window-is_composited = gtk_widget_is_composited (GTK_WIDGET (window));
-}
-
- panel_debug (PANEL_DEBUG_BASE_WINDOW,
- %p: rgba colormap=%p, compositing=%s, window,
- colormap, PANEL_DEBUG_BOOL (window-is_composited));
}
@@ -447,6 +434,32 @@ panel_base_window_finalize (GObject *object)
+static void
+panel_base_window_screen_changed (GtkWidget *widget, GdkScreen
*previous_screen)
+{
+ PanelBaseWindow *window = PANEL_BASE_WINDOW (widget);
+ GdkColormap *colormap;
+ GdkScreen *screen;
+
+ if (GTK_WIDGET_CLASS (panel_base_window_parent_class)-screen_changed !=
NULL)
+GTK_WIDGET_CLASS (panel_base_window_parent_class)-screen_changed (widget,
previous_screen);
+
+ /* set the rgba colormap if supported by the screen */
+ screen = gtk_window_get_screen (GTK_WINDOW (window));
+ colormap = gdk_screen_get_rgba_colormap (screen);
+ if (colormap != NULL)
+{
+ gtk_widget_set_colormap (widget, colormap);
+ window-is_composited = gtk_widget_is_composited (widget);
+}
+
+ panel_debug (PANEL_DEBUG_BASE_WINDOW,
+ %p: rgba colormap=%p, compositing=%s, window,
+ colormap, PANEL_DEBUG_BOOL (window-is_composited));
+}
+
+
+
static gboolean
panel_base_window_expose_event (GtkWidget *widget,
GdkEventExpose *event)
@@ -660,6 +673,9 @@ panel_base_window_composited_changed (GtkWidget *widget)
/* set new compositing state */
window-is_composited = gtk_widget_is_composited (widget);
+ if (window-is_composited == was_composited)
+return;
+
if (window-is_composited)
gtk_window_set_opacity (GTK_WINDOW (widget), window-priv-leave_opacity);
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 2866a72..c3f1347 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -1341,6 +1341,9 @@ panel_window_screen_changed (GtkWidget *widget,
PanelWindow *window = PANEL_WINDOW (widget);
GdkScreen *screen;
+ if (G_LIKELY (GTK_WIDGET_CLASS (panel_window_parent_class)-screen_changed
!= NULL))
+GTK_WIDGET_CLASS
[Xfce4-commits] xfce4-panel:master Don't activate windows in tasklist when dnd a button or plugin.
Updating branch refs/heads/master
to c73fec644730c078bee2e0893839fb89ba89c7a6 (commit)
from 7bd1028804d7f5ffa7dc7994d7104a02375a0bc2 (commit)
commit c73fec644730c078bee2e0893839fb89ba89c7a6
Author: Nick Schermer n...@xfce.org
Date: Sat Feb 19 16:16:12 2011 +0100
Don't activate windows in tasklist when dnd a button or plugin.
plugins/tasklist/tasklist-widget.c | 30 +-
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index e6c7bfb..15ff7bf 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -1887,19 +1887,31 @@ xfce_tasklist_child_drag_motion (XfceTasklistChild
*child,
gint y,
guint timestamp)
{
+ GtkWidget *dnd_widget;
+
panel_return_val_if_fail (XFCE_IS_TASKLIST (child-tasklist), FALSE);
- child-motion_timestamp = timestamp;
- if (child-motion_timeout_id == 0
- !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (child-button)))
+ /* don't respond to dragging our own children or panel plugins */
+ dnd_widget = gtk_drag_get_source_widget (context);
+ if (dnd_widget == NULL
+ || gtk_widget_get_parent (dnd_widget) != GTK_WIDGET (child-tasklist)
+ || XFCE_IS_PANEL_PLUGIN (dnd_widget))
{
- child-motion_timeout_id = g_timeout_add_full (G_PRIORITY_LOW,
DRAG_ACTIVATE_TIMEOUT,
-
xfce_tasklist_child_drag_motion_timeout, child,
-
xfce_tasklist_child_drag_motion_timeout_destroyed);
-}
+ child-motion_timestamp = timestamp;
+ if (child-motion_timeout_id == 0
+ !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (child-button)))
+{
+ child-motion_timeout_id = g_timeout_add_full (G_PRIORITY_LOW,
DRAG_ACTIVATE_TIMEOUT,
+
xfce_tasklist_child_drag_motion_timeout, child,
+
xfce_tasklist_child_drag_motion_timeout_destroyed);
+}
- /* keep emitting the signal */
- gdk_drag_status (context, 0, timestamp);
+ /* keep emitting the signal */
+ gdk_drag_status (context, 0, timestamp);
+
+ /* we want to receive leave signal as well */
+ return TRUE;
+}
/* also send drag-motion to other widgets */
return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Activate windows on button release events (bug #7296).
Updating branch refs/heads/master
to a0c69aa93bcaa82790a8aa3c1b6c7b9285a4fe08 (commit)
from c73fec644730c078bee2e0893839fb89ba89c7a6 (commit)
commit a0c69aa93bcaa82790a8aa3c1b6c7b9285a4fe08
Author: Nick Schermer n...@xfce.org
Date: Sat Feb 19 17:00:08 2011 +0100
Activate windows on button release events (bug #7296).
plugins/tasklist/tasklist-widget.c | 33 ++---
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index 15ff7bf..13a47e4 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -2557,13 +2557,7 @@ xfce_tasklist_button_button_press_event (GtkWidget
*button,
return TRUE;
}
- if (event-button == 1)
-{
- xfce_tasklist_button_activate (child, event-time);
-
- return TRUE;
-}
- else if (event-button == 3)
+ if (event-button == 3)
{
menu = wnck_action_menu_new (child-window);
g_signal_connect (G_OBJECT (menu), selection-done,
@@ -2584,6 +2578,29 @@ xfce_tasklist_button_button_press_event (GtkWidget
*button,
+static gboolean
+xfce_tasklist_button_button_release_event (GtkWidget *button,
+ GdkEventButton*event,
+ XfceTasklistChild *child)
+{
+ panel_return_val_if_fail (XFCE_IS_TASKLIST (child-tasklist), FALSE);
+ panel_return_val_if_fail (child-type != CHILD_TYPE_GROUP, FALSE);
+
+ /* only respond to in-button events */
+ if (event-type == GDK_BUTTON_RELEASE
+ !xfce_taskbar_is_locked (child-tasklist)
+ event-button == 1
+ event-x 0 event-x button-allocation.width
+ event-y 0 event-y button-allocation.width)
+{
+ xfce_tasklist_button_activate (child, event-time);
+}
+
+ return FALSE;
+}
+
+
+
static void
xfce_tasklist_button_enter_notify_event_disconnected (gpointer data,
GClosure *closure)
@@ -2841,6 +2858,8 @@ xfce_tasklist_button_new (WnckWindow *window,
G_CALLBACK (xfce_tasklist_button_enter_notify_event), child);
g_signal_connect (G_OBJECT (child-button), button-press-event,
G_CALLBACK (xfce_tasklist_button_button_press_event), child);
+ g_signal_connect (G_OBJECT (child-button), button-release-event,
+ G_CALLBACK (xfce_tasklist_button_button_release_event), child);
/* monitor window changes */
g_signal_connect (G_OBJECT (window), icon-changed,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master l10n: Updated Polish (pl) translation to 100%
Updating branch refs/heads/master to a6a898ac92b2c75ed41f376450f9fab5cc6167ed (commit) from 4f4065d259fb830b7a7804efb0f5549cf8afdb07 (commit) commit a6a898ac92b2c75ed41f376450f9fab5cc6167ed Author: Piotr Sokół pso...@jabster.pl Date: Sat Feb 19 17:23:51 2011 +0100 l10n: Updated Polish (pl) translation to 100% New status: 230 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 64 +++--- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/po/pl.po b/po/pl.po index a172a03..4550910 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,5 +1,5 @@ # Polish translations for xfwm4 package. -# Copyright (C) 2002-2006 The Xfce development team. +# Copyright (C) 2002-2011 The Xfce development team. # This file is distributed under the same license as the xfwm4 package. # Paweł Pastuła pastu...@poczta.onet.pl, 2003. # Daniel Mróz be...@alpha.pl, 2003. @@ -9,16 +9,16 @@ # msgid msgstr -Project-Id-Version: xfwm4 4.7.4\n +Project-Id-Version: xfwm4 4.8.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:27+0100\n -PO-Revision-Date: 2011-01-09 15:09+0100\n +POT-Creation-Date: 2011-02-19 11:13+\n +PO-Revision-Date: 2011-02-19 17:21+0100\n Last-Translator: Piotr Sokół pso...@jabster.pl\n Language-Team: Polish \n -Language: pl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: pl\n Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10=2 n%10=4 (n %10010 || n%100=20)) ? 1 : 2));\n @@ -118,7 +118,7 @@ msgstr Obszary robocze #: ../settings-dialogs/xfwm4-dialog.glade.h:1 msgid bBox move and resize/b -msgstr bPrzenoszenie i zmiana rozmiaru/b +msgstr bPrzemieszczanie i zmiana rozmiaru/b #: ../settings-dialogs/xfwm4-dialog.glade.h:2 msgid bButton layout/b @@ -142,7 +142,7 @@ msgstr bCzynność kliknięcia/b #: ../settings-dialogs/xfwm4-dialog.glade.h:7 msgid bRaise on focus/b -msgstr bCzynność zaznaczenia/b +msgstr bCzynność uaktywniania/b #: ../settings-dialogs/xfwm4-dialog.glade.h:8 msgid bTitle _alignment/b @@ -200,15 +200,15 @@ msgstr Z_aawansowane #: ../settings-dialogs/xfwm4-dialog.glade.h:24 msgid Automatically _raise windows when they receive focus -msgstr Przenoszenie na w_ierzch zaznaczonych okien +msgstr Przemieszczanie na w_ierzch uaktywnionych okien #: ../settings-dialogs/xfwm4-dialog.glade.h:25 msgid Automatically give focus to _newly created windows -msgstr Zaznaczanie n_owo utworzonych okien +msgstr Uaktywnianie _nowo utworzonych okien #: ../settings-dialogs/xfwm4-dialog.glade.h:26 msgid Clic_k to focus -msgstr Zaznaczanie k_liknięciem +msgstr Uaktywnianie k_liknięciem #: ../settings-dialogs/xfwm4-dialog.glade.h:27 msgid Click and drag the buttons to change the layout @@ -220,8 +220,7 @@ msgstr Zamyka okno #: ../settings-dialogs/xfwm4-dialog.glade.h:30 msgid Delay _before raising focused window: -msgstr -_Opóźnienie, po którym zaznaczone okno zostanie przeniesione na wierzch: +msgstr _Opóźnienie przemieszczania na wierzch uaktywnionych okien: #: ../settings-dialogs/xfwm4-dialog.glade.h:31 msgid Dis_tance: @@ -229,7 +228,7 @@ msgstr O_dstęp: #: ../settings-dialogs/xfwm4-dialog.glade.h:32 msgid Focus follows _mouse -msgstr Zaznaczanie k_ursorem myszy +msgstr Uaktywnianie ku_rsorem myszy #: ../settings-dialogs/xfwm4-dialog.glade.h:33 msgid Hidden @@ -237,7 +236,7 @@ msgstr Ukryte #: ../settings-dialogs/xfwm4-dialog.glade.h:34 msgid Hide -msgstr Ukrywa okno +msgstr Minimalizuje okno #: ../settings-dialogs/xfwm4-dialog.glade.h:35 msgid Hide content of windows when _moving @@ -261,11 +260,11 @@ msgstr Wyświetla menu okna #: ../settings-dialogs/xfwm4-dialog.glade.h:40 msgid Raise window when clicking _inside application window -msgstr Przenoszenie okien na wierzch po kliknięciu w ich zawa_rtość +msgstr Przemieszczanie okien na wierzch po kliknięciu w ich zawar_tość #: ../settings-dialogs/xfwm4-dialog.glade.h:41 msgid Shade -msgstr Zwija okno do paska tytułowego +msgstr Ukrywa zawartość okna #: ../settings-dialogs/xfwm4-dialog.glade.h:42 msgid Snap windows to other _windows @@ -294,15 +293,16 @@ msgstr Tytuł #: ../settings-dialogs/xfwm4-dialog.glade.h:49 msgid Wrap workspaces when _dragging a window off the screen -msgstr Przełączanie podczas przenoszenia _okna poza krawędź ekranu +msgstr Przełączanie podczas przemieszczania _okna poza krawędź ekranu #: ../settings-dialogs/xfwm4-dialog.glade.h:50 msgid Wrap workspaces when the _pointer reaches the screen edge -msgstr Przełączanie podczas przenoszenia k_ursora myszy poza krawędź ekranu +msgstr +Przełączanie podczas przemieszczania k_ursora myszy poza krawędź ekranu #: ../settings-dialogs/xfwm4-dialog.glade.h:51 msgid _Delay before window receives focus: -msgstr _Opóźnienie, po którym okno zostanie zaznaczone: +msgstr _Opóźnienie
[Xfce4-commits] xfce4-panel:master Keep reference on window to avoid crash (bug #7193).
Updating branch refs/heads/master
to aa928ba50e9e7a7387b7bf14a4bfda3ce1735d58 (commit)
from a0c69aa93bcaa82790a8aa3c1b6c7b9285a4fe08 (commit)
commit aa928ba50e9e7a7387b7bf14a4bfda3ce1735d58
Author: Nick Schermer n...@xfce.org
Date: Sat Feb 19 17:39:57 2011 +0100
Keep reference on window to avoid crash (bug #7193).
plugins/tasklist/tasklist-widget.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index 13a47e4..3d8ac28 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -2614,6 +2614,8 @@ xfce_tasklist_button_enter_notify_event_disconnected
(gpointer data,
* proxy dies */
g_signal_handlers_disconnect_by_func (child-window,
xfce_tasklist_button_geometry_changed, child);
+
+ g_object_unref (G_OBJECT (child-window));
}
@@ -2631,6 +2633,7 @@ xfce_tasklist_button_proxy_menu_item (XfceTasklistChild
*child,
panel_return_val_if_fail (child-type == CHILD_TYPE_OVERFLOW_MENU
|| child-type == CHILD_TYPE_GROUP_MENU, NULL);
panel_return_val_if_fail (GTK_IS_LABEL (child-label), NULL);
+ panel_return_val_if_fail (WNCK_IS_WINDOW (child-window), NULL);
mi = gtk_image_menu_item_new ();
exo_binding_new (G_OBJECT (child-label), label, G_OBJECT (mi), label);
@@ -2652,6 +2655,7 @@ xfce_tasklist_button_proxy_menu_item (XfceTasklistChild
*child,
if (allow_wireframe)
{
+ g_object_ref (G_OBJECT (child-window));
g_signal_connect_data (G_OBJECT (mi), enter-notify-event,
G_CALLBACK (xfce_tasklist_button_enter_notify_event), child,
xfce_tasklist_button_enter_notify_event_disconnected, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Bump version in master to 4.9.0.
Updating branch refs/heads/master to cec9059b9568a007535db3688fb7f488003767ba (commit) from aa928ba50e9e7a7387b7bf14a4bfda3ce1735d58 (commit) commit cec9059b9568a007535db3688fb7f488003767ba Author: Nick Schermer n...@xfce.org Date: Sat Feb 19 17:43:21 2011 +0100 Bump version in master to 4.9.0. configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index c51d735..40e3245 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,7 +11,7 @@ dnl *** m4_define([libxfce4panel_verinfo], [3:0:0]) dnl current:revision:age m4_define([libxfce4panel_version_api], [1.0]) m4_define([xfce4_panel_version_major], [4]) -m4_define([xfce4_panel_version_minor], [8]) +m4_define([xfce4_panel_version_minor], [9]) m4_define([xfce4_panel_version_micro], [0]) m4_define([xfce4_panel_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_panel_version_build], [@REVISION@]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Don't decrease refcount of files returned by GFileIcon (bug #7309).
Updating branch refs/heads/master
to d5739ef148b02a5212dea2c0d7dcb7de4c79dd46 (commit)
from f3def301388057f8080d675c8446907d7c62f3bc (commit)
commit d5739ef148b02a5212dea2c0d7dcb7de4c79dd46
Author: Ambroz Bizjak ambr...@gmail.com
Date: Sat Feb 19 18:26:20 2011 +0100
Don't decrease refcount of files returned by GFileIcon (bug #7309).
This fixes a crash when hovering CD drives with a special icon in
computer://.
Signed-off-by: Jannis Pohlmann jan...@xfce.org
NEWS |2 ++
thunar/thunar-file.c |1 -
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/NEWS b/NEWS
index 686006f..293c417 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@
- Fix properties dialog crash with files with unknown content type.
- Fix crash when opening a mountable drive with no media (bug #7308).
Reported and solved by Ambroz Bizjak.
+- Fix crash when hovering a CD drive with a special icon (bug #7309).
+ Reported and solved by Ambroz Bizjak.
1.3.0
=
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 25b16a3..506713c 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -2921,7 +2921,6 @@ thunar_file_get_icon_name (const ThunarFile *file,
{
icon_file = g_file_icon_get_file (G_FILE_ICON (icon));
icon_name = g_file_get_path (icon_file);
- g_object_unref (icon_file);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:xfce-4.8 Don't decrease refcount of files returned by GFileIcon (bug #7309).
Updating branch refs/heads/xfce-4.8
to fc715a48bdaa80c6db500e086b453b8d6c86a28e (commit)
from 61c04e0407e2e9db1ab8f2d2a7fe9adc4edde716 (commit)
commit fc715a48bdaa80c6db500e086b453b8d6c86a28e
Author: Ambroz Bizjak ambr...@gmail.com
Date: Sat Feb 19 18:26:20 2011 +0100
Don't decrease refcount of files returned by GFileIcon (bug #7309).
This fixes a crash when hovering CD drives with a special icon in
computer://.
Signed-off-by: Jannis Pohlmann jan...@xfce.org
NEWS |2 ++
thunar/thunar-file.c |1 -
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/NEWS b/NEWS
index 9b21960..6ccac5d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@
- Fix properties dialog crash with files with unknown content type.
- Fix crash when opening a mountable drive with no media (bug #7308).
Reported and solved by Ambroz Bizjak.
+- Fix crash when hovering a CD drive with a special icon (bug #7309).
+ Reported and solved by Ambroz Bizjak.
1.2.1
=
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 1767f10..8caa422 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -2912,7 +2912,6 @@ thunar_file_get_icon_name (const ThunarFile *file,
{
icon_file = g_file_icon_get_file (G_FILE_ICON (icon));
icon_name = g_file_get_path (icon_file);
- g_object_unref (icon_file);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Fix commit a0c69aa.
Updating branch refs/heads/master
to 7f74a499802c9d54d3ab87d1fd363bb3d00706bc (commit)
from cec9059b9568a007535db3688fb7f488003767ba (commit)
commit 7f74a499802c9d54d3ab87d1fd363bb3d00706bc
Author: Nick Schermer n...@xfce.org
Date: Sat Feb 19 19:03:52 2011 +0100
Fix commit a0c69aa.
plugins/tasklist/tasklist-widget.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index 3d8ac28..61c06d2 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -1894,8 +1894,8 @@ xfce_tasklist_child_drag_motion (XfceTasklistChild *child,
/* don't respond to dragging our own children or panel plugins */
dnd_widget = gtk_drag_get_source_widget (context);
if (dnd_widget == NULL
- || gtk_widget_get_parent (dnd_widget) != GTK_WIDGET (child-tasklist)
- || XFCE_IS_PANEL_PLUGIN (dnd_widget))
+ || (gtk_widget_get_parent (dnd_widget) != GTK_WIDGET (child-tasklist)
+!XFCE_IS_PANEL_PLUGIN (dnd_widget)))
{
child-motion_timestamp = timestamp;
if (child-motion_timeout_id == 0
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Use the widget snapshot as tasklist draw icon.
Updating branch refs/heads/master
to 4b2c3cc8411fd0e989e0395ca458f16952f46686 (commit)
from 7f74a499802c9d54d3ab87d1fd363bb3d00706bc (commit)
commit 4b2c3cc8411fd0e989e0395ca458f16952f46686
Author: Nick Schermer n...@xfce.org
Date: Sat Feb 19 20:25:30 2011 +0100
Use the widget snapshot as tasklist draw icon.
plugins/tasklist/tasklist-widget.c | 15 +++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/plugins/tasklist/tasklist-widget.c
b/plugins/tasklist/tasklist-widget.c
index 61c06d2..5a64b5f 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -2818,9 +2818,24 @@ xfce_tasklist_button_drag_begin (GtkWidget
*button,
XfceTasklistChild *child)
{
GdkPixbuf *pixbuf;
+ GdkPixmap *pixmap;
panel_return_if_fail (WNCK_IS_WINDOW (child-window));
+ if (child-tasklist-show_labels)
+{
+ pixmap = gtk_widget_get_snapshot (button, NULL);
+ if (pixmap != NULL)
+{
+ gtk_drag_set_icon_pixmap (context,
+ gdk_drawable_get_colormap (GDK_DRAWABLE (pixmap)),
+ pixmap, NULL, 0, 0);
+ g_object_unref (G_OBJECT (pixmap));
+
+ return;
+}
+}
+
pixbuf = wnck_window_get_icon (child-window);
if (G_LIKELY (pixbuf != NULL))
gtk_drag_set_icon_pixbuf (context, pixbuf, 0, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:nick/gettext l10n: Updated Greek (el) translation to 16%
Updating branch refs/heads/nick/gettext to c14c92f96c2d8844d589f794d3eb0f16386fd9d4 (commit) from 76665c011f8acf2dd6f0ff623732aa971df3176b (commit) commit c14c92f96c2d8844d589f794d3eb0f16386fd9d4 Author: Stavros Giannouris stavr...@gmail.com Date: Sat Feb 19 22:03:18 2011 +0100 l10n: Updated Greek (el) translation to 16% New status: 108 messages complete with 18 fuzzies and 538 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/el.po | 172 ++ 1 files changed, 137 insertions(+), 35 deletions(-) diff --git a/lib/po/el.po b/lib/po/el.po index c7bc262..1746374 100644 --- a/lib/po/el.po +++ b/lib/po/el.po @@ -9,13 +9,13 @@ msgstr Project-Id-Version: www.xfce.org\n Report-Msgid-Bugs-To: http://bugzilla.xfce.org\n; POT-Creation-Date: 2011-01-25 18:50+0100\n -PO-Revision-Date: 2011-02-18 14:03+0200\n +PO-Revision-Date: 2011-02-19 21:36+0200\n Last-Translator: \n Language-Team: Greek kde-i18n-...@kde.org\n +Language: el\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: el\n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Generator: Lokalize 1.0\n @@ -184,19 +184,17 @@ msgstr #: about/tour46.php:25 about/index.php:33 about/tour44.php:102 #: projects/index.php:27 msgid Panel -msgstr +msgstr Ταμπλό #: about/tour46.php:233 about/tour44.php:215 msgid Links msgstr #: about/index.php:27 about/tour44.php:71 projects/index.php:20 -#, fuzzy msgid Window Manager msgstr Διαχειριστής παραθύρων #: about/index.php:39 about/tour44.php:28 -#, fuzzy msgid File Manager msgstr Διαχειριστής αρχείων @@ -868,19 +866,16 @@ msgid Screenshots by Jannis Pohlmann msgstr #: about/index.php:30 projects/index.php:38 -#, fuzzy msgid Desktop Manager msgstr Διαχειριστής επιφάνειας εργασίας #: about/index.php:36 projects/index.php:45 -#, fuzzy msgid Session Manager msgstr Διαχειριστής συνεδρίας #: about/releasemodel.php:33 projects/index.php:7 projects/index.php:16 -#, fuzzy msgid Core Components -msgstr Κύρια τμήματα +msgstr Κύρια συστατικά #: projects/index.php:8 projects/index.php:108 msgid Applications @@ -1021,7 +1016,7 @@ msgstr #: about/artwork.php:1 about/nav.php:11 msgid Artwork -msgstr +msgstr Γραφικά #: about/artwork.php:5 msgid @@ -1031,11 +1026,11 @@ msgstr #: about/news.php:6 about/nav.php:6 msgid News -msgstr +msgstr Νέα #: about/news.php:49 msgid Changes in this release -msgstr +msgstr Αλλαγές σε αυτήν την έκδοση #: about/news.php:61 msgid No news articles found. @@ -1043,7 +1038,7 @@ msgstr #: about/nav.php:5 about/tour.php:1 msgid Tour -msgstr +msgstr Παρουσίαση #: about/nav.php:7 about/screenshots.php:1 frontpage.php:25 msgid Screenshots @@ -1085,7 +1080,6 @@ msgstr σύστημα, ενώ ταυτόχρονα να είναι ελκυστικό και φιλικό προς τον χρήστη. #: about/index.php:11 -#, fuzzy msgid Xfce embodies the traditional UNIX philosophy of modularity and re- usability. It consists of a number of components that provide the full @@ -1119,7 +1113,6 @@ msgstr στις πλατφόρμες x86, PPX, Sparc, Alpha... #: about/index.php:22 projects/libxfce4.php:9 -#, fuzzy msgid Features msgstr Χαρακτηριστικά @@ -1160,7 +1153,6 @@ msgid msgstr #: about/index.php:42 -#, fuzzy msgid Setting Manager msgstr Διαχειριστής ρυθμίσεων @@ -1182,7 +1174,7 @@ msgstr #: about/screenshots.php:18 msgid Some screenshots of Xfce, ordered by version. -msgstr +msgstr Μερικά στιγμιότυπα οθόνης του Xfce, ταξινομημένα ανά έκδοση. #: about/tour.php:5 msgid @@ -2478,7 +2470,7 @@ msgstr #: getinvolved/nav.php:6 getinvolved/index.php:17 #: getinvolved/translation.php:3 msgid Translation -msgstr +msgstr Μετάφραση #: getinvolved/nav.php:13 msgid Report a bug @@ -2688,6 +2680,13 @@ msgid of this, just read on and pick an area which interests you or seems challenging. msgstr +Καλωσήλθατε στην κοινότητα του Xfce. Με τη συμμετοχή σας στην ομάδα μας, θα +γίνετε μέρος μιας διεθνούς προσπάθειας εκατοντάδων ανθρώπων που δουλεύουν +μαζί για να προσφέρουν μια εκπληκτική εμπειρία χρήσης υπολογιστή με Ελεύθερο +Λογισμικό. Θα συναντήσετε νέους φίλους, θα αποκτήσετε νέες δεξιότητες και θα +κάνετε τη διαφορά για εκατομμύρια χρήστες ενώ συνεργάζεστε με ανθρώπους από +όλη τη γη. Υπάρχουν πολλοί τρόποι για να λάβετε μέρος. Απλώς διαβάστε +παρακάτω και επιλέξτε έναν τομέα που σας προκαλεί το ενδιαφέρον. #: getinvolved/index.php:9 msgid @@ -2696,10 +2695,13 @@ msgid out with promotion and marketing both on line and at tradeshows and conferences. msgstr +Οι πιθανές εργασίες περιλαμβάνουν δοκιμή και αναφορά σφαλμάτων, γράψιμο +κώδικα, δημιουργία γραφικών, τεκμηρίωση και μετάφραση, καθώς και βοήθεια +στην προώθηση τόσο στο διαδίκτυο όσο και σε εκθέσεις και συνέδρια. #: getinvolved/index.php:12 msgid Documentation -msgstr +msgstr Τεκμηρίωση #: getinvolved/index.php:14
[Xfce4-commits] tumbler:master Add coding style document.
Updating branch refs/heads/master
to 05c5dfbdb3131785131290fbb7e069c20a34ef57 (commit)
from 1bf98813ab4c33091b8a8280ef83c57c1354ebd0 (commit)
commit 05c5dfbdb3131785131290fbb7e069c20a34ef57
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Feb 19 22:33:18 2011 +0100
Add coding style document.
CODING_STYLE | 384
tumblerd/tumbler-service.c |4 +-
2 files changed, 386 insertions(+), 2 deletions(-)
diff --git a/CODING_STYLE b/CODING_STYLE
new file mode 100644
index 000..53d8779
--- /dev/null
+++ b/CODING_STYLE
@@ -0,0 +1,384 @@
+Tumbler Coding Style
+
+
+This document intends to give information about the coding style to be
+used when contributing code to tumbler. It does not claim to be
+complete. Parts of it are taken or inspired from the Clutter coding
+style document.
+
+An example of a good coding style (from the perspective of this
+document) is tumblerd/tumbler-service.c. In the following, the most
+important requirements for writing consistent code for tumbler are
+explained.
+
+
+Line Width
+==
+
+The maximum line width for source files is 90 characters. This limit may
+be exceeded when there is no way around it. Accepted ways to wrap long
+lines caused by function calls are
+
+ result = some_function_with_a_very_long_name (first_parameter,
+second_parameter,
+third_parameter);
+
+and
+
+ long_result_variable =
+some_function_with_a_very_long_name (first_parameter,
+ second_parameter,
+ third_parameter);
+
+where the result variable name is too long to fit the function call
+into the 90 characters limit even when wrapping the parameters.
+
+Do not separate the function name from its arguments like this:
+
+ /* bad */
+ some_function_with_a_long_name
+(long_argument_name1, long_argument_name2);
+
+Instead, consider using shorter variable names as aliases:
+
+ /* good */
+ short1 = long_argument_name1;
+ short2 = long_argument_name2;
+ some_function_with_a_long_name (short1, short2);
+
+The line width limit of 90 characters does not apply to header files.
+However the alignment and parameter indentation rules explained in the
+section Functions and Braces still apply to header files.
+
+
+Whitespace
+==
+
+Always insert a space before a parenthesis but never after or
+between the opening or closing parenthesis and a parameter.
+
+ /* good */
+ if (condition)
+foo (argument1, argument2);
+
+ /* bad */
+ if(condition)
+foo(argument1, argument2);
+
+ /* bad */
+ if ( condition )
+foo ( argument1, argument 2 );
+
+
+Indentation and Braces
+==
+
+Use spaces only, tabs are not allowed. The indentation for each level is
+2 spaces in addition to the previous level. Braces add another level of
+indentation. Valid indentations and uses of braces are:
+
+Single-line statements:
+
+ /* good */
+ if (condition)
+single_line_statement ();
+
+Multiple statements:
+
+ /* good */
+ if (condition)
+{
+ a_statement ();
+ another_statement ();
+}
+
+Multiple and single statements:
+
+ /* good */
+ if (condition)
+{
+ a_statement ();
+ another_statement ();
+}
+ else
+{
+ one_more_statement ();
+}
+
+Do and while loops:
+
+ /* good */
+ while (foo)
+{
+ bar ();
+}
+
+ /* good */
+ do
+{
+ bar ();
+}
+ while (foo);
+
+Switch statements:
+
+ /* good */
+ switch (condition)
+{
+case FOO:
+ do_something ();
+ break;
+case BAR:
+ do_something_else ();
+ break;
+default:
+ do_whatever_you_need_to_do ();
+ break;
+}
+
+ /* bad */
+ switch (condition) {
+case FOO:
+ do_something ();
+ break;
+ }
+
+ /* bad */
+ switch (condition)
+{
+ case FOO:
+do_something ();
+break;
+}
+
+ /* bad */
+ switch (condition)
+{
+case FOO: do_something ();
+ break;
+}
+
+ /* bad */
+ switch (condition)
+{
+ case FOO:
+ do_something ();
+ break;
+}
+
+Nested if statements:
+
+ /* good */
+ if (condition)
+{
+ /* here the same rules as on the top level apply again */
+ if (another_condition)
+single_statement ();
+ else if (yet_another_condition)
+another_single_statement ();
+}
+
+Do not put curly braces into the same line as the condition:
+
+ /* bad */
+ if (condition) {
+ ...
+ }
+
+Do not asymmetrically use and not use braces:
+
+ /* bad */
+ if (condition)
+{
+ /* multiple statements */
+}
+ else
+single_statement ();
+
+If there are multiple conditions in a single if statement spread across
+more than one line, always use curly braces:
+
+ /* good */
+ if (condition1
+ condition2)
[Xfce4-commits] tumbler:master Add information about loops to the coding style documentation.
Updating branch refs/heads/master
to 7d3f6510e2d902219a9dee7c87506f885aa0d49f (commit)
from 05c5dfbdb3131785131290fbb7e069c20a34ef57 (commit)
commit 7d3f6510e2d902219a9dee7c87506f885aa0d49f
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Feb 19 22:40:54 2011 +0100
Add information about loops to the coding style documentation.
CODING_STYLE | 56
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/CODING_STYLE b/CODING_STYLE
index 53d8779..e0df3f1 100644
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -11,6 +11,18 @@ document) is tumblerd/tumbler-service.c. In the following,
the most
important requirements for writing consistent code for tumbler are
explained.
+Table of Contents:
+ * Line Width
+ * Whitespace
+ * Indentation and Braces
+ * Functions and Braces
+ * Empty Lines
+ * Variable Declarations
+ * Assertions
+ * More on Conditions
+ * Header Files
+ * Loops and Loop Termination
+
Line Width
==
@@ -382,3 +394,47 @@ license header (example for tumbler-data-structure.h):
G_END_DECLS
#endif /* !__TUMBLER_DATA_STRUCTURE_H__ */
+
+
+
+Loops and Loop Termination
+==
+
+When writing loops, try to avoid break statements. Instead of breaking
+on some condition move the condition into the loop header to make more
+clear when the loop is supposed to be terminated.
+
+So, instead of doing
+
+ /* bad */
+ for (n = 0; n some_value; ++n)
+{
+ if (some_other_condition)
+break;
+
+ ...
+}
+
+do it like this:
+
+ /* good */
+ for (n = 0; !some_other_condition n some_value; ++n)
+{
+ ...
+}
+
+If the loop header exceeds the 90 character limit per line, split it up
+into multiple lines (in which case you are required to add curly braces
+of course):
+
+ /* good */
+ for (n = 0;
+ !some_other_condition n some_value;
+ ++n)
+{
+ ...
+}
+
+Try to avoid while loops where you can. Some GLib data structures
+such as iterators encourage the use of while loops. In those cases it's
+ok not to use for loops.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master g_strescape the URI in the location completion
Updating branch refs/heads/master
to ce106b0d7f190d280c115d53ce7231eac115c171 (commit)
from 85e78eab9ae36f0a20afcc749d2cae746b770de5 (commit)
commit ce106b0d7f190d280c115d53ce7231eac115c171
Author: Tomasz Szatkowski szat...@gmail.com
Date: Sat Feb 19 22:26:23 2011 +0100
g_strescape the URI in the location completion
Fixes: https://bugs.launchpad.net/midori/+bug/74
midori/midori-locationaction.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index bee0725..000fec2 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1067,6 +1067,7 @@ midori_location_entry_render_text_cb (GtkCellLayout*
layout,
{
MidoriLocationAction* action = data;
gchar* uri_escaped;
+gchar* uri_temp;
gchar* uri;
gchar* title;
gboolean style;
@@ -1109,8 +1110,10 @@ midori_location_entry_render_text_cb (GtkCellLayout*
layout,
keys = g_strsplit_set (key, %, -1);
g_free (key);
-uri = sokoke_uri_unescape_string (uri_escaped);
+uri_temp = sokoke_uri_unescape_string (uri_escaped);
g_free (uri_escaped);
+uri = g_strescape (uri_temp, NULL);
+g_free (uri_temp);
if (G_LIKELY (uri))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Bump version to 0.3.1
Updating branch refs/heads/master to 0ee21d254a210b453edf45a674c84e58c18e21f5 (commit) from 3a887802c5d4f72bde7d853b19a75f02468b31bd (commit) commit 0ee21d254a210b453edf45a674c84e58c18e21f5 Author: Christian Dywan christ...@twotoasts.de Date: Sat Feb 19 22:44:54 2011 +0100 Bump version to 0.3.1 ChangeLog | 15 +++ wscript |2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53a9dbe..e005053 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.3.1 + + Fix automigration of existing bookmarks + + Fix crash on opening autocompletion + + Fix adblock handling of frames + + Reflect tab order in the saved session + + Don't show multiple user addon infobars + + Provide distribution setting for close on left + + Export to Netscape HTML format + + Avoid config update on state changes + + Always show progress and search engines in location + + Default to app menu and no menubar + + Fix GTK+ 2.14 build problems + + Show 'Private Browsing' in window title + + Uncached reload with Ctrl+Shift+R + v0.3.0 + Support libnotify 0.7 + Copy-friendly URIs with %20 diff --git a/wscript b/wscript index 2c53f48..341cc39 100644 --- a/wscript +++ b/wscript @@ -29,7 +29,7 @@ from Configure import find_program_impl major = 0 minor = 3 -micro = 0 +micro = 1 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori|0.3.1 Creating annotated tag 0.3.1
Updating annotated tag refs/tags/0.3.1 as new annotated tag to 8cc92f14bf791744c33abd2349131663cbc650ef (tag) succeeds 0.3.0-66-g3a88780 tagged by Christian Dywan christ...@twotoasts.de on 2011-02-19 21:45 + Christian Dywan (1): Bump version to 0.3.1 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Reflect tab order in saved session
Updating branch refs/heads/master
to 85e78eab9ae36f0a20afcc749d2cae746b770de5 (commit)
from 8310abdf4476a21082e49d3d0c8578fc93606018 (commit)
commit 85e78eab9ae36f0a20afcc749d2cae746b770de5
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Feb 19 22:22:52 2011 +0100
Reflect tab order in saved session
Discussed, tested and tweaked by amphi, ml| and MonkeyofDoom in IRC.
midori/midori-browser.c | 11 +--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 8a03fc4..087869a 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1551,6 +1551,8 @@ _midori_browser_add_tab (MidoriBrowser* browser,
item = midori_view_get_proxy_item (MIDORI_VIEW (view));
g_object_ref (item);
katze_array_add_item (browser-proxy_array, item);
+katze_array_move_item (browser-proxy_array, item,
+ gtk_notebook_get_current_page (notebook) + 1);
g_object_connect (view,
signal::notify::icon,
@@ -1596,11 +1598,16 @@ _midori_browser_add_tab (MidoriBrowser* browser,
if (!g_object_get_data (G_OBJECT (view), midori-view-append)
katze_object_get_boolean (browser-settings,
open-tabs-next-to-current))
{
-n = gtk_notebook_get_current_page (notebook);
-gtk_notebook_insert_page (notebook, view, tab_label, n + 1);
+n = gtk_notebook_get_current_page (notebook) + 1;
+gtk_notebook_insert_page (notebook, view, tab_label, n);
+katze_array_move_item (browser-proxy_array, item, n);
}
else
+{
gtk_notebook_append_page (notebook, view, tab_label);
+katze_array_move_item (browser-proxy_array, item,
+ gtk_notebook_get_n_pages (notebook));
+}
gtk_notebook_set_tab_reorderable (notebook, view, TRUE);
gtk_notebook_set_tab_detachable (notebook, view, TRUE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Take text for Go button in location from the entry
Updating branch refs/heads/master
to 71f89a3d8a4abbb6dd209d3dc9c3a7da23fddeb9 (commit)
from 0ee21d254a210b453edf45a674c84e58c18e21f5 (commit)
commit 71f89a3d8a4abbb6dd209d3dc9c3a7da23fddeb9
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Feb 19 23:38:34 2011 +0100
Take text for Go button in location from the entry
midori/midori-browser.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 087869a..0974f9c 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3597,7 +3597,10 @@ _action_location_secondary_icon_released (GtkAction*
action,
}
}
else if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget)
-_action_location_submit_uri (action, uri, FALSE, browser);
+{
+const gchar* text = gtk_entry_get_text (GTK_ENTRY (widget));
+_action_location_submit_uri (action, text, FALSE, browser);
+}
else if ((feed = g_object_get_data (G_OBJECT (view), news-feeds)))
{
KatzeArray* news_feeds;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-utils:master Update translators, week 07.
Updating branch refs/heads/master to b8cac76ce9f0cf81d5d84b4d0797c4b8484182dc (commit) from 95b086460d1525b37aa349187f4ce9a323a87536 (commit) commit b8cac76ce9f0cf81d5d84b4d0797c4b8484182dc Author: Transifex norep...@xfce.org Date: Sun Feb 20 00:00:05 2011 +0100 Update translators, week 07. xfce4-about/translators.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h index b0d7dd6..4590bd1 100644 --- a/xfce4-about/translators.h +++ b/xfce4-about/translators.h @@ -24,7 +24,7 @@ #include gtk/gtk.h #include libxfce4util/libxfce4util.h -#define TRANSLATORS_H_STAMP 2011-02-13 00:00:05 +#define TRANSLATORS_H_STAMP 2011-02-20 00:00:05 #define ATSIGN @ #define DOTSIGN . ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Bump version to 0.3.2
Updating branch refs/heads/master to 4557f086ef9fff730a760a852f62afd4e769303b (commit) from 71f89a3d8a4abbb6dd209d3dc9c3a7da23fddeb9 (commit) commit 4557f086ef9fff730a760a852f62afd4e769303b Author: Christian Dywan christ...@twotoasts.de Date: Sun Feb 20 00:00:26 2011 +0100 Bump version to 0.3.2 ChangeLog |3 ++- wscript |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e005053..670ef6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ This file is licensed under the terms of the expat license, see the file EXPAT. -v0.3.1 +v0.3.2 + + Fix opening address with Go button + Fix automigration of existing bookmarks + Fix crash on opening autocompletion + Fix adblock handling of frames diff --git a/wscript b/wscript index 341cc39..3277526 100644 --- a/wscript +++ b/wscript @@ -29,7 +29,7 @@ from Configure import find_program_impl major = 0 minor = 3 -micro = 1 +micro = 2 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori|0.3.2 Creating annotated tag 0.3.2
Updating annotated tag refs/tags/0.3.2 as new annotated tag to 15356105cfeafaece07e3a371ce43737427757c4 (tag) succeeds 0.3.1-1-g71f89a3 tagged by Christian Dywan christ...@twotoasts.de on 2011-02-19 23:00 + Christian Dywan (1): Bump version to 0.3.2 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Use distinct labels for Refresh actions in shortcut editor
Updating branch refs/heads/master
to 912637025cbf19455927eb3d27629e7fbca5dd2c (commit)
from 4557f086ef9fff730a760a852f62afd4e769303b (commit)
commit 912637025cbf19455927eb3d27629e7fbca5dd2c
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Feb 20 04:13:30 2011 +0100
Use distinct labels for Refresh actions in shortcut editor
extensions/shortcuts.c |8 +++-
midori/midori-browser.c |2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c
index 12671fa..a9cd165 100644
--- a/extensions/shortcuts.c
+++ b/extensions/shortcuts.c
@@ -100,10 +100,16 @@ shortcuts_accel_cleared_cb (GtkCellRenderer* renderer,
static gchar*
shortcuts_label_for_action (GtkAction* action)
{
+const gchar* name = gtk_action_get_name (action);
gchar* label;
gchar* stripped;
-if ((label = katze_object_get_string (action, label)))
+if (g_str_equal (name, ReloadStop))
+{
+label = NULL;
+stripped = g_strdup (_(Reload page or stop loading));
+}
+else if ((label = katze_object_get_string (action, label)))
stripped = katze_strip_mnemonics (label);
else
{
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0974f9c..d75faa0 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4892,7 +4892,7 @@ static const GtkActionEntry entries[] =
NULL, Ctrlr,
N_(Reload the current page), G_CALLBACK
(_action_reload_stop_activate) },
{ ReloadUncached, GTK_STOCK_REFRESH,
-NULL, CtrlShiftr,
+N_(Reload page without caching), CtrlShiftr,
N_(Reload page without caching), G_CALLBACK
(_action_reload_stop_activate) },
{ Stop, GTK_STOCK_STOP,
NULL, Escape,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
