[Xfce4-commits] midori:master Use search icon name as fallback for search engines

[Christian Dywan]

Updating branch refs/heads/master
 to 072ea586cdb3816e00428c71202538e3f6a08aa9 (commit)
   from f9c38fda6fcf246367db1640dac78dc0a7af76fd (commit)

commit 072ea586cdb3816e00428c71202538e3f6a08aa9
Author: Christian Dywan christ...@twotoasts.de
Date:   Sat Jan 29 08:42:29 2011 +0100

Use search icon name as fallback for search engines

 midori/midori-searchaction.c |   26 --
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 2321e6d..8487234 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -403,20 +403,21 @@ midori_search_action_manage_activate_cb (GtkWidget*   
   menuitem,
 /* static */ GdkPixbuf*
 midori_search_action_get_icon (KatzeItem*item,
GtkWidget*widget,
-   const gchar** icon_name)
+   const gchar** icon_name,
+   gboolean  in_entry)
 {
 const gchar* icon;
+GdkScreen* screen;
+GtkIconTheme* icon_theme;
 
 if ((icon = katze_item_get_uri (item))  (g_strstr_len (icon, 8, ://)))
 return katze_load_cached_icon (icon, widget);
 
+
+screen = gtk_widget_get_screen (widget);
+icon_theme = gtk_icon_theme_get_for_screen (screen);
 if ((icon = katze_item_get_icon (item))  *icon)
 {
-GdkScreen* screen;
-GtkIconTheme* icon_theme;
-
-screen = gtk_widget_get_screen (widget);
-icon_theme = gtk_icon_theme_get_for_screen (screen);
 if (gtk_icon_theme_has_icon (icon_theme, icon))
 {
 *icon_name = icon;
@@ -424,7 +425,12 @@ midori_search_action_get_icon (KatzeItem*item,
 }
 }
 
-*icon_name = GTK_STOCK_FILE;
+if (in_entry  gtk_icon_theme_has_icon (icon_theme, 
edit-find-option-symbolic))
+*icon_name = edit-find-option-symbolic;
+else if (gtk_icon_theme_has_icon (icon_theme, edit-find-option))
+*icon_name = edit-find-option;
+else
+*icon_name = edit-find;
 return NULL;
 }
 
@@ -455,7 +461,7 @@ midori_search_action_icon_released_cb (GtkWidget*   
entry,
 menuitem = gtk_image_menu_item_new_with_label (
 katze_item_get_name (item));
 image = gtk_image_new ();
-icon = midori_search_action_get_icon (item, entry, icon_name);
+icon = midori_search_action_get_icon (item, entry, icon_name, 
FALSE);
 if (icon)
 {
 gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon);
@@ -520,7 +526,7 @@ midori_search_action_set_entry_icon (MidoriSearchAction* 
search_action,
 const gchar* icon_name;
 
 icon = midori_search_action_get_icon (search_action-current_item,
-  entry, icon_name);
+  entry, icon_name, TRUE);
 if (icon)
 {
 gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry),
@@ -825,7 +831,7 @@ midori_search_action_dialog_render_icon_cb 
(GtkTreeViewColumn* column,
 gtk_tree_model_get (model, iter, 0, item, -1);
 
 search_action = g_object_get_data (G_OBJECT (treeview), search-action);
-if ((icon = midori_search_action_get_icon (item, treeview, icon_name)))
+if ((icon = midori_search_action_get_icon (item, treeview, icon_name, 
FALSE)))
 {
 g_object_set (renderer, pixbuf, icon, yalign, 0.25, NULL);
 g_object_unref (icon);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Remove duplicated GtkActionEntry

[Christian Dywan]

Updating branch refs/heads/master
 to 567d5a7d140456c8db9bf84d1e768f1f39a732ed (commit)
   from 072ea586cdb3816e00428c71202538e3f6a08aa9 (commit)

commit 567d5a7d140456c8db9bf84d1e768f1f39a732ed
Author: Paweł Forysiuk tuxa...@o2.pl
Date:   Thu Jan 27 07:09:28 2011 +0100

Remove duplicated GtkActionEntry

 midori/midori-browser.c |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 5e70e1f..16bb9ee 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4857,9 +4857,6 @@ static const GtkActionEntry entries[] =
 { Copy, GTK_STOCK_COPY,
 NULL, Ctrlc,
 N_(Copy the selected text), G_CALLBACK (_action_copy_activate) },
-{ Copy_, GTK_STOCK_COPY,
-NULL, Ctrlc,
-N_(Copy the selected text), G_CALLBACK (_action_copy_activate) },
 { Paste, GTK_STOCK_PASTE,
 NULL, Ctrlv,
 N_(Paste text from the clipboard), G_CALLBACK 
(_action_paste_activate) },
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Add initial support for HTML bookmarks import

[Christian Dywan]

Updating branch refs/heads/master
 to 4ed49d001fbb05fa4ed8f41939ea522c7a660c67 (commit)
   from 567d5a7d140456c8db9bf84d1e768f1f39a732ed (commit)

commit 4ed49d001fbb05fa4ed8f41939ea522c7a660c67
Author: Paweł Forysiuk tuxa...@o2.pl
Date:   Thu Jan 27 18:52:37 2011 +0100

Add initial support for HTML bookmarks import

 midori/midori-array.c |   97 +
 1 files changed, 97 insertions(+), 0 deletions(-)

diff --git a/midori/midori-array.c b/midori/midori-array.c
index 58a2aad..f6495e5 100644
--- a/midori/midori-array.c
+++ b/midori/midori-array.c
@@ -294,6 +294,73 @@ katze_array_from_xmlDocPtr (KatzeArray* array,
 }
 
 static gboolean
+katze_array_from_mozilla_file (KatzeArray*  array,
+   const gchar* filename)
+{
+gchar* line  = NULL;
+GIOChannel* channel = g_io_channel_new_file (filename, r, 0);
+KatzeArray* folder  = array;
+KatzeItem* item = NULL;
+
+if (!channel)
+return FALSE;
+
+while (g_io_channel_read_line (channel, line, NULL, NULL, NULL)
+== G_IO_STATUS_NORMAL)
+{
+g_strstrip (line);
+/* parse lines with bookmarks data only, skip the rest */
+if (!strncmp (line, D, 2) || !strncmp (line, /D, 3))
+{
+gchar** element = g_strsplit_set (line, , -1);
+/* current item */
+if (katze_str_equal (element[1], DT))
+{
+/* item is bookmark */
+if (!strncmp (element[3], A HREF, 6))
+{
+gchar** parts = g_strsplit (line, \, -1);
+item = katze_item_new ();
+katze_array_add_item (folder, item);
+item-name = g_strdup (element[4]);
+item-uri = g_strdup (parts[1]);
+g_strfreev (parts);
+}
+/* item is folder */
+if (!strncmp (element[3], H3, 2))
+{
+item = (KatzeItem*)katze_array_new (KATZE_TYPE_ARRAY);
+katze_array_add_item (folder, item);
+folder = (KatzeArray*)item;
+item-name = g_strdup (element[4]);
+}
+}
+/* item description */
+if (item  katze_str_equal (element[1], DD))
+{
+if (element[2])
+item-text = g_strdup (element[2]);
+item = NULL;
+}
+/* end of current folder, level-up */
+if (katze_str_equal (element[1], /DL))
+{
+if (folder != array)
+folder = katze_item_get_parent ((KatzeItem*)folder);
+else
+g_warning (A level-up although we are at the top level);
+continue;
+}
+g_strfreev (element);
+}
+continue;
+}
+g_io_channel_shutdown (channel, FALSE, 0);
+g_io_channel_unref (channel);
+return TRUE;
+}
+
+static gboolean
 katze_array_from_opera_file (KatzeArray* array,
  const gchar*  filename)
 {
@@ -422,6 +489,36 @@ midori_array_from_file (KatzeArray*  array,
 if (!format)
 format = ;
 
+/* mozilla html */
+if (!*format  g_str_has_suffix (filename, .html))
+{
+FILE* file;
+if ((file = g_fopen (filename, r)))
+{
+gchar line[50];
+while (fgets (line, 50, file))
+{
+g_strstrip (line);
+if (katze_str_equal (line, !DOCTYPE 
NETSCAPE-Bookmark-file-1))
+{
+if (!katze_array_from_mozilla_file (array, filename))
+{
+/* Parsing failed */
+fclose (file);
+if (error)
+*error = g_error_new_literal (G_FILE_ERROR,
+G_FILE_ERROR_FAILED, _(Malformed 
document.));
+return FALSE;
+}
+return TRUE;
+}
+else
+break;
+}
+fclose (file);
+}
+}
+
 /* Opera6 */
 if (katze_str_equal (format, opera)
 || (!*format  g_str_has_suffix (filename, .adr)))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] postler:master l10n: Updated Finnish (fi) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to a869721afad07fd8d13e0ed32c92c2750ee308e1 (commit)
   from 1e652fda4beb15ab3a245fda49ebdb19756c4734 (commit)

commit a869721afad07fd8d13e0ed32c92c2750ee308e1
Author: Jari Rahkonen jari.rahko...@pp1.inet.fi
Date:   Sat Jan 29 12:02:13 2011 +0100

l10n: Updated Finnish (fi) translation to 100%

New status: 227 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/fi.po |  229 --
 1 files changed, 117 insertions(+), 112 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index fae1674..9b48c6b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,8 +7,8 @@ msgid 
 msgstr 
 Project-Id-Version: Postler 0.x\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-26 11:17+\n
-PO-Revision-Date: 2011-01-24 23:26+0200\n
+POT-Creation-Date: 2011-01-29 05:17+\n
+PO-Revision-Date: 2011-01-29 13:01+0200\n
 Last-Translator: Jari Rahkonen jari.rahko...@pp1.inet.fi\n
 Language-Team: Finnish xfce-i...@xfce.org\n
 MIME-Version: 1.0\n
@@ -29,6 +29,7 @@ msgid Postler
 msgstr Postler
 
 #: ../postler/postler-accounts.vala:70 ../postler/postler-accounts.vala:195
+#: ../postler/postler-service.vala:165
 msgid Inbox
 msgstr Saapuvat
 
@@ -277,7 +278,7 @@ msgstr Vastaa li_stalle
 msgid translator-credits
 msgstr Jari Rahkonen jari.rahko...@pp1.inet.fi
 
-#: ../postler/postler-bureau.vala:368 ../postler/postler-composer.vala:375
+#: ../postler/postler-bureau.vala:368 ../postler/postler-composer.vala:410
 msgid _Mail
 msgstr _Sähköposti
 
@@ -325,7 +326,7 @@ msgstr Poista viesti
 msgid Quit the application
 msgstr Poistu sovelluksesta
 
-#: ../postler/postler-bureau.vala:391 ../postler/postler-composer.vala:384
+#: ../postler/postler-bureau.vala:391 ../postler/postler-composer.vala:419
 msgid _Edit
 msgstr _Muokkaa
 
@@ -345,7 +346,7 @@ msgstr Tallenna nykyinen haku
 msgid _View
 msgstr _Näkymä
 
-#: ../postler/postler-bureau.vala:398 ../postler/postler-content.vala:262
+#: ../postler/postler-bureau.vala:398 ../postler/postler-content.vala:263
 msgid _Enlarge Text
 msgstr _Suurenna tekstiä
 
@@ -353,7 +354,7 @@ msgstr _Suurenna tekstiä
 msgid Enlarge message text
 msgstr Suurenna viestin tekstiä
 
-#: ../postler/postler-bureau.vala:400 ../postler/postler-content.vala:269
+#: ../postler/postler-bureau.vala:400 ../postler/postler-content.vala:270
 msgid Sh_rink Text
 msgstr _Pienennä tekstiä
 
@@ -365,7 +366,7 @@ msgstr _Pienennä viestin tekstiä
 msgid View the message in fullscreen
 msgstr Näytä viesti kokoruututilassa
 
-#: ../postler/postler-bureau.vala:404 ../postler/postler-content.vala:282
+#: ../postler/postler-bureau.vala:404 ../postler/postler-content.vala:283
 msgid View _Source
 msgstr Näytä läh_dekoodi
 
@@ -425,7 +426,7 @@ msgstr _Sisältö
 msgid Search the full message text
 msgstr Etsi viestien koko sisällöstä
 
-#: ../postler/postler-bureau.vala:465 ../postler/postler-composer.vala:463
+#: ../postler/postler-bureau.vala:465 ../postler/postler-composer.vala:498
 #, c-format
 msgid Failed to create window: %s
 msgstr Ikkunan luominen epäonnistui: %s
@@ -516,99 +517,99 @@ msgstr Hylätäänkö tallentamaton viesti?
 msgid Attach File...
 msgstr Liitä tiedosto...
 
-#: ../postler/postler-composer.vala:377
+#: ../postler/postler-composer.vala:412
 msgid Send the message
 msgstr Lähetä viesti
 
-#: ../postler/postler-composer.vala:378
+#: ../postler/postler-composer.vala:413
 msgid Save as _Draft
 msgstr _Tallenna luonnos
 
-#: ../postler/postler-composer.vala:379
+#: ../postler/postler-composer.vala:414
 msgid Save message as draft
 msgstr Tallenna viesti luonnoksena
 
-#: ../postler/postler-composer.vala:380
+#: ../postler/postler-composer.vala:415
 msgid _Attach File
 msgstr Liitä ti_edosto
 
-#: ../postler/postler-composer.vala:381
+#: ../postler/postler-composer.vala:416
 msgid Attach a file to the message
 msgstr Liitä tiedosto viestiin
 
-#: ../postler/postler-composer.vala:383
+#: ../postler/postler-composer.vala:418
 msgid Close the window
 msgstr Sulje ikkuna
 
-#: ../postler/postler-composer.vala:386
+#: ../postler/postler-composer.vala:421
 msgid Open the addressbook
 msgstr Avaa osoitekirja
 
-#: ../postler/postler-composer.vala:387
+#: ../postler/postler-composer.vala:422
 msgid _Quote the selected text
 msgstr _Lainaa valittu teksti
 
-#: ../postler/postler-composer.vala:388
+#: ../postler/postler-composer.vala:423
 msgid Mark the selected text as a quote
 msgstr Merkitse valittu teksti lainaukseksi
 
-#: ../postler/postler-composer.vala:389
+#: ../postler/postler-composer.vala:424
 msgid Insert _Smiley
 msgstr Lisää hy_miö
 
-#: ../postler/postler-composer.vala:390
+#: ../postler/postler-composer.vala:425
 msgid Insert Big _Smile
 msgstr Lisää iso _hymy
 
-#: ../postler/postler-composer.vala:391
+#: ../postler/postler-composer.vala:426
 msgid Insert a grinning face
 msgstr Lisää virnistys
 
-#: ../postler/postler-composer.vala:392
+#: 

[Xfce4-commits] postler:master l10n: Updated Polish (pl) translation to 87%

[Transifex]

Updating branch refs/heads/master
 to 258acf281b04dc1125d72fe8d9a0402f3b340e70 (commit)
   from a869721afad07fd8d13e0ed32c92c2750ee308e1 (commit)

commit 258acf281b04dc1125d72fe8d9a0402f3b340e70
Author: Piotr Sokół pso...@jabster.pl
Date:   Sat Jan 29 12:10:10 2011 +0100

l10n: Updated Polish (pl) translation to 87%

New status: 197 messages complete with 7 fuzzies and 22 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pl.po |   34 ++
 1 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 245df65..9f4d528 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgstr 
 Project-Id-Version: postler 0.0.1\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2011-01-24 17:17+\n
-PO-Revision-Date: 2011-01-28 20:19+0100\n
+PO-Revision-Date: 2011-01-29 12:07+0100\n
 Last-Translator: Piotr Sokół pso...@jabster.pl\n
 Language-Team: Polish \n
 MIME-Version: 1.0\n
@@ -35,7 +35,7 @@ msgstr Odebrane
 
 #: ../postler/postler-accounts.vala:71
 msgid Sent
-msgstr 
+msgstr Wysłane
 
 #: ../postler/postler-accounts.vala:72
 msgid Drafts
@@ -43,7 +43,7 @@ msgstr Szkice
 
 #: ../postler/postler-accounts.vala:73
 msgid Outbox
-msgstr 
+msgstr Nadane
 
 #: ../postler/postler-accounts.vala:74
 msgid Trash
@@ -234,7 +234,6 @@ msgid _Receive Mail
 msgstr _Odbierz wiadomości
 
 #: ../postler/postler-app.vala:164
-#, fuzzy
 msgid Failed to launch external application.
 msgstr Nie udało się uruchomić skojarzonego programu.
 
@@ -257,9 +256,8 @@ msgid Failed to send notification: %s
 msgstr Nie udało się wyświetlić powiadomienia: %s
 
 #: ../postler/postler-bureau.vala:133 ../postler/postler-bureau.vala:142
-#, fuzzy
 msgid This message was sent to a mailing list.
-msgstr Wysłano wiadomość na listę mailową.
+msgstr Wysłano wiadomość na listę dyskusyjną.
 
 #: ../postler/postler-bureau.vala:134
 msgid Replying is not allowed.
@@ -271,11 +269,11 @@ msgstr Odpowiedz _nadawcy
 
 #: ../postler/postler-bureau.vala:143
 msgid Do you want to reply to the list?
-msgstr 
+msgstr Odpowiedzieć na listę dyskusyjną?
 
 #: ../postler/postler-bureau.vala:145
 msgid Reply to _List
-msgstr 
+msgstr Odpowiedz na _listę
 
 #: ../postler/postler-bureau.vala:357
 msgid translator-credits
@@ -367,7 +365,6 @@ msgid Shrink message text
 msgstr Pomniejsza tekst wiadomości
 
 #: ../postler/postler-bureau.vala:403
-#, fuzzy
 msgid View the message in fullscreen
 msgstr Wyświetla wiadomość w widoku pełnoekranowym
 
@@ -393,7 +390,7 @@ msgstr Wyświetla informacje na temat programu
 
 #: ../postler/postler-bureau.vala:414
 msgid _Hide Read
-msgstr 
+msgstr _Ukryj przeczytane
 
 #: ../postler/postler-bureau.vala:415
 msgid Hide unread messages
@@ -475,13 +472,12 @@ msgid _Send message without subject
 msgstr _Wyślij bez tematu
 
 #: ../postler/postler-composer.vala:95
-#, fuzzy
 msgid You have not configured any accounts for sending.
 msgstr Nie skonfigurowano wysyłania poczty z żadnego konta.
 
 #: ../postler/postler-composer.vala:110
 msgid Folders for sent messages and outbox can't be created. 
-msgstr 
+msgstr Nie można utworzyć katalogów nadanych i wysłanych wiadomości
 
 #. i18n: A warning is displayed when writing a new message
 #. and there are no attachments but the text mentions
@@ -684,9 +680,8 @@ msgid This message of type \%s\ can't be displayed.
 msgstr 
 
 #: ../postler/postler-content.vala:951
-#, fuzzy
 msgid No text in the message that can be displayed
-msgstr Brak treści do wyświetlenia
+msgstr Brak treści wiadomości do wyświetlenia
 
 #: ../postler/postler-content.vala:980
 msgid Open file
@@ -795,9 +790,9 @@ msgid Import Archived Mailbox
 msgstr 
 
 #: ../postler/postler-folders.vala:474 ../postler/postler-folders.vala:497
-#, fuzzy, c-format
+#, c-format
 msgid Failed to empty folder \%s\: %s
-msgstr Nie udało się opróżnić katalogu „%s”
+msgstr Nie udało się opróżnić katalogu „%s”: %s
 
 #: ../postler/postler-folders.vala:509
 msgid Open in New _Window
@@ -809,7 +804,6 @@ msgid _Import Archived Mailbox
 msgstr _Zaimportuj zarchiwizowaną pocztę
 
 #: ../postler/postler-folders.vala:535
-#, fuzzy
 msgid _Empty Folder
 msgstr _Opróżnij katalog
 
@@ -831,8 +825,9 @@ msgstr 
 
 #. Clickable icons should not display/ mark as read
 #: ../postler/postler-messages.vala:248 ../postler/postler-messages.vala:1053
+#, fuzzy
 msgid Status
-msgstr 
+msgstr Stan
 
 #: ../postler/postler-messages.vala:252
 msgid Subject
@@ -930,11 +925,10 @@ msgid [mailto:][ADDRESS][?subject=SUBJECT][body=BODY];
 msgstr [mailto:][ADRES][?subject=TEMAT][body=TREŚĆ];
 
 #: ../postler/postler-reader.vala:34
-#, fuzzy
 msgid [from=FROM][to=TO][cc=COPY][attach=ATTACHMENT][part=PART]
 msgstr 
 [from=NADAWCA][to=ODBIORCA][cc=ODBIORCA_KOPII][attach=ZAŁĄCZNIK]
-[part=PART]
+[part=FRAGMENT]
 
 #: ../postler/postler-reader.vala:42
 #, c-format
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org

[Xfce4-commits] xfdesktop:master Implement monitoring for special file icons like the trash (bug #6986).

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 5fd40287485dc98bcf070a23e2aa5e8687a3fa5a (commit)
   from 9708fa32e83c0ed0d72244287dfa4bbb3fbdbc57 (commit)

commit 5fd40287485dc98bcf070a23e2aa5e8687a3fa5a
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jan 29 17:50:44 2011 +0100

Implement monitoring for special file icons like the trash (bug #6986).

 NEWS  |1 +
 src/xfdesktop-file-icon-manager.c |8 +--
 src/xfdesktop-special-file-icon.c |   99 -
 3 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index 56cb07a..de245c1 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Xfdesktop 4.x.y
   * Support absolute icon paths in desktop files (bug #7160).
 Patch by xai...@gmail.com.
   * Scroll to the selected background in the settings (bug #7087).
+  * Implement monitoring for special file icons (bug #6986).
 
 
 Xfdesktop 4.8.0
diff --git a/src/xfdesktop-file-icon-manager.c 
b/src/xfdesktop-file-icon-manager.c
index c5944a7..7362c52 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -1,9 +1,9 @@
 /*
  *  xfdesktop - xfce4's desktop manager
  *
- *  Copyright(c) 2006 Brian Tarricone, bj...@cornell.edu
- *  Copyright(c) 2006 Benedikt Meurer, be...@xfce.org
- *  Copyright(c) 2010 Jannis Pohlmann, jan...@xfce.org
+ *  Copyright(c) 2006  Brian Tarricone, bj...@cornell.edu
+ *  Copyright(c) 2006  Benedikt Meurer, be...@xfce.org
+ *  Copyright(c) 2010-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 published by
@@ -1972,8 +1972,6 @@ 
xfdesktop_file_icon_manager_add_special_file_icon(XfdesktopFileIconManager *fman
 XFDESKTOP_FILE_ICON(icon),
 FALSE))
 {
-/* TODO need to make file monitoring work for special icons like
- * the filesystem root and the trash bin */
 g_hash_table_replace(fmanager-priv-special_icons,
  GINT_TO_POINTER(type), icon);
 return XFDESKTOP_FILE_ICON(icon);
diff --git a/src/xfdesktop-special-file-icon.c 
b/src/xfdesktop-special-file-icon.c
index 8bad3f7..7e0264c 100644
--- a/src/xfdesktop-special-file-icon.c
+++ b/src/xfdesktop-special-file-icon.c
@@ -1,9 +1,9 @@
 /*
  *  xfdesktop - xfce4's desktop manager
  *
- *  Copyright(c) 2006 Brian Tarricone, bj...@cornell.edu
- *  Copyright(c) 2006 Benedikt Meurer, be...@xfce.org
- *  Copyright(c) 2010 Jannis Pohlmann, jan...@xfce.org
+ *  Copyright(c) 2006  Brian Tarricone, bj...@cornell.edu
+ *  Copyright(c) 2006  Benedikt Meurer, be...@xfce.org
+ *  Copyright(c) 2010-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 published by
@@ -61,6 +61,7 @@ struct _XfdesktopSpecialFileIconPrivate
 GdkPixbuf *pix;
 gchar *tooltip;
 gint cur_pix_size;
+GFileMonitor *monitor;
 GFileInfo *file_info;
 GFileInfo *filesystem_info;
 GFile *file;
@@ -68,7 +69,7 @@ struct _XfdesktopSpecialFileIconPrivate
 
 /* only needed for trash */
 DBusGProxy *dbus_proxy;
-gboolean trash_full;
+gboolean trash_item_count;
 };
 
 static void xfdesktop_special_file_icon_finalize(GObject *obj);
@@ -88,6 +89,11 @@ static gboolean 
xfdesktop_special_file_icon_populate_context_menu(XfdesktopIcon
 static GFileInfo *xfdesktop_special_file_icon_peek_file_info(XfdesktopFileIcon 
*icon);
 static GFileInfo 
*xfdesktop_special_file_icon_peek_filesystem_info(XfdesktopFileIcon *icon);
 static GFile *xfdesktop_special_file_icon_peek_file(XfdesktopFileIcon *icon);
+static void xfdesktop_special_file_icon_changed(GFileMonitor *monitor,
+GFile *file,
+GFile *other_file,
+GFileMonitorEvent event,
+XfdesktopSpecialFileIcon 
*special_file_icon);
 
 #ifdef HAVE_THUNARX
 static void xfdesktop_special_file_icon_tfi_init(ThunarxFileInfoIface *iface);
@@ -153,10 +159,17 @@ xfdesktop_special_file_icon_finalize(GObject *obj)
 g_signal_handlers_disconnect_by_func(G_OBJECT(itheme),
  
G_CALLBACK(xfdesktop_special_file_icon_invalidate_pixbuf),
  icon);
-
+
 if(icon-priv-pix)
 g_object_unref(G_OBJECT(icon-priv-pix));
 
+if(icon-priv-monitor) {
+g_signal_handlers_disconnect_by_func(icon-priv-monitor,
+ 
G_CALLBACK(xfdesktop_special_file_icon_changed),
+ icon);
+g_object_unref(icon-priv-monitor);
+}
+
 

[Xfce4-commits] xfdesktop:master Implement open and empty actions for the trash.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 94a79f1a1348b56a5dcc3f8123eb2b933feb9073 (commit)
   from 5fd40287485dc98bcf070a23e2aa5e8687a3fa5a (commit)

commit 94a79f1a1348b56a5dcc3f8123eb2b933feb9073
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jan 29 18:17:55 2011 +0100

Implement open and empty actions for the trash.

This makes the trash fully functional again. Unfortunately, it also
required a new string to be added (Could not empty the trash).

 NEWS  |1 +
 src/xfdesktop-file-utils.c|   46 ++
 src/xfdesktop-file-utils.h|2 +
 src/xfdesktop-special-file-icon.c |  119 
 4 files changed, 63 insertions(+), 105 deletions(-)

diff --git a/NEWS b/NEWS
index de245c1..21c455d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Xfdesktop 4.x.y
 Patch by xai...@gmail.com.
   * Scroll to the selected background in the settings (bug #7087).
   * Implement monitoring for special file icons (bug #6986).
+  * Implement open and empty actions for the trash.
 
 
 Xfdesktop 4.8.0
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index c3c3e3b..33ffe64 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -900,6 +900,52 @@ xfdesktop_file_utils_trash_files(GList *files,
 }
 
 void
+xfdesktop_file_utils_empty_trash(GdkScreen *screen,
+ GtkWindow *parent)
+{
+DBusGProxy *trash_proxy;
+
+g_return_if_fail(GDK_IS_SCREEN(screen) || GTK_IS_WINDOW(parent));
+
+if(!screen)
+screen = gtk_widget_get_screen(GTK_WIDGET(parent));
+
+trash_proxy = xfdesktop_file_utils_peek_trash_proxy();
+if(trash_proxy) {
+GError *error = NULL;
+gchar *display_name = gdk_screen_make_display_name(screen);
+gchar *startup_id = g_strdup_printf(_TIME%d, 
gtk_get_current_event_time());
+
+xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH);
+
+if(!xfdesktop_trash_proxy_empty_trash(trash_proxy,
+  display_name, startup_id,
+  error))
+{
+xfce_message_dialog(parent,
+_(Trash Error), GTK_STOCK_DIALOG_ERROR,
+_(Could not empty the trash),
+error-message, GTK_STOCK_CLOSE, 
GTK_RESPONSE_ACCEPT, 
+NULL);
+
+g_error_free(error);
+}
+
+xfdesktop_file_utils_set_window_cursor(parent, GDK_LEFT_PTR);
+
+g_free(startup_id);
+g_free(display_name);
+} else {
+xfce_message_dialog(parent,
+_(Trash Error), GTK_STOCK_DIALOG_ERROR,
+_(Could not empty the trash),
+_(This feature requires a trash service to 
+  be present (such as the one supplied by 
Thunar).),
+GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+}
+}
+
+void
 xfdesktop_file_utils_create_file(GFile *parent_folder,
  const gchar *content_type,
  GdkScreen *screen,
diff --git a/src/xfdesktop-file-utils.h b/src/xfdesktop-file-utils.h
index 73891d1..a44e53f 100644
--- a/src/xfdesktop-file-utils.h
+++ b/src/xfdesktop-file-utils.h
@@ -74,6 +74,8 @@ void xfdesktop_file_utils_rename_file(GFile *file,
 void xfdesktop_file_utils_trash_files(GList *files,
GdkScreen *screen,
GtkWindow *parent);
+void xfdesktop_file_utils_empty_trash(GdkScreen *screen,
+  GtkWindow *parent);
 void xfdesktop_file_utils_unlink_files(GList *files,
GdkScreen *screen,
GtkWindow *parent);
diff --git a/src/xfdesktop-special-file-icon.c 
b/src/xfdesktop-special-file-icon.c
index 7e0264c..8f0990c 100644
--- a/src/xfdesktop-special-file-icon.c
+++ b/src/xfdesktop-special-file-icon.c
@@ -44,8 +44,6 @@
 
 #include libxfce4ui/libxfce4ui.h
 
-#include dbus/dbus-glib.h
-
 #ifdef HAVE_THUNARX
 #include thunarx/thunarx.h
 #endif
@@ -53,7 +51,6 @@
 #include xfdesktop-common.h
 #include xfdesktop-file-utils.h
 #include xfdesktop-special-file-icon.h
-#include xfdesktop-trash-proxy.h
 
 struct _XfdesktopSpecialFileIconPrivate
 {
@@ -68,7 +65,6 @@ struct _XfdesktopSpecialFileIconPrivate
 GdkScreen *gscreen;
 
 /* only needed for trash */
-DBusGProxy *dbus_proxy;
 gboolean trash_item_count;
 };
 
@@ -447,93 +443,18 @@ xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon 
*icon)
 }
 
 static void
-xfdesktop_special_file_icon_trash_handle_error(XfdesktopSpecialFileIcon *icon,
-   const gchar *method,
-

[Xfce4-commits] xfdesktop:xfce-4.8 Handle volume changes in a timeout (bug #7025).

[Jannis Pohlmann]

Updating branch refs/heads/xfce-4.8
 to e8bc0f168577c84e5576ea2702efda2e0b83311a (commit)
   from 45916b4e00a878fcc6f530f30932220b43a2e7a9 (commit)

commit e8bc0f168577c84e5576ea2702efda2e0b83311a
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jan 25 02:21:40 2011 +0100

Handle volume changes in a timeout (bug #7025).

When the volume-changed signal of GVolumeMonitor or the changed
signal of GVolume are emitted after a volume has been mounted, then for
some reason the affected GVolume still has no valid GMount. Same happens
when unmounting: the GVolume still has a valid GMount.

This commit works around this by checking for a change from valid to
invalid GMount or from invalid to valid GMount in a timeout that is
called at most 5 times until it gives up. When a change is detected, the
corresponding XfdesktopVolumeIcon is updated.

I hope this is a suitable workaround for most machines/drives. The
underlying issue seems to be in GIO or GVfs. It might be worth finding
the root cause.

 NEWS|1 +
 src/xfdesktop-volume-icon.c |  148 ++-
 2 files changed, 146 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 7585786..e7ecf33 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Xfdesktop 4.x.y
   * Support absolute icon paths in desktop files (bug #7160).
 Patch by xai...@gmail.com.
   * Scroll to the selected background in the settings (bug #7087).
+  * Handle volume changes in a timeout (bug #7025).
 
 
 Xfdesktop 4.8.0
diff --git a/src/xfdesktop-volume-icon.c b/src/xfdesktop-volume-icon.c
index 85a44dc..01a5570 100644
--- a/src/xfdesktop-volume-icon.c
+++ b/src/xfdesktop-volume-icon.c
@@ -1,9 +1,9 @@
 /*
  *  xfdesktop - xfce4's desktop manager
  *
- *  Copyright(c) 2006 Brian Tarricone, bj...@cornell.edu
- *  Copyright(c) 2006 Benedikt Meurer, be...@xfce.org
- *  Copyright(c) 2010 Jannis Pohlmann, jan...@xfce.org
+ *  Copyright(c) 2006  Brian Tarricone, bj...@cornell.edu
+ *  Copyright(c) 2006  Benedikt Meurer, be...@xfce.org
+ *  Copyright(c) 2010-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 published by
@@ -67,6 +67,9 @@ struct _XfdesktopVolumeIconPrivate
 GFileInfo *filesystem_info;
 GFile *file;
 GdkScreen *gscreen;
+
+guint changed_timeout_id;
+guint changed_timeout_count;
 };
 
 static void xfdesktop_volume_icon_finalize(GObject *obj);
@@ -89,6 +92,9 @@ static GFile 
*xfdesktop_volume_icon_peek_file(XfdesktopFileIcon *icon);
 static void xfdesktop_volume_icon_update_file_info(XfdesktopFileIcon *icon,
GFileInfo *info);
 static gboolean xfdesktop_volume_icon_activated(XfdesktopIcon *icon);
+static gboolean volume_icon_changed_timeout(XfdesktopVolumeIcon *icon);
+static void xfdesktop_volume_icon_changed(GVolume *volume, 
+  XfdesktopVolumeIcon *volume_icon);
 
 #ifdef HAVE_THUNARX
 static void xfdesktop_volume_icon_tfi_init(ThunarxFileInfoIface *iface);
@@ -156,6 +162,10 @@ xfdesktop_volume_icon_finalize(GObject *obj)
 {
 XfdesktopVolumeIcon *icon = XFDESKTOP_VOLUME_ICON(obj);
 GtkIconTheme *itheme = gtk_icon_theme_get_for_screen(icon-priv-gscreen);
+
+/* remove pending change timeouts */
+if(icon-priv-changed_timeout_id  0)
+g_source_remove(icon-priv-changed_timeout_id);
 
 g_signal_handlers_disconnect_by_func(G_OBJECT(itheme),
  
G_CALLBACK(xfdesktop_volume_icon_invalidate_pixbuf),
@@ -800,6 +810,134 @@ xfdesktop_volume_icon_activated(XfdesktopIcon *icon_p)
 }
 }
 
+static gboolean
+volume_icon_changed_timeout(XfdesktopVolumeIcon *volume_icon)
+{
+GMount *mount;
+gboolean mounted_before = FALSE;
+gboolean mounted_after = FALSE;
+
+g_return_val_if_fail(XFDESKTOP_IS_VOLUME_ICON(volume_icon), FALSE);
+
+DBG(TIMEOUT);
+
+/* reset the icon's mount point information */
+if(volume_icon-priv-file) {
+g_object_unref(volume_icon-priv-file);
+volume_icon-priv-file = NULL;
+
+/* apparently the volume was mounted before, otherwise
+ * we wouldn't have had a mount point for it */
+mounted_before = TRUE;
+}
+if(volume_icon-priv-file_info) {
+g_object_unref(volume_icon-priv-file_info);
+volume_icon-priv-file_info = NULL;
+}
+if(volume_icon-priv-filesystem_info) {
+g_object_unref(volume_icon-priv-filesystem_info);
+volume_icon-priv-filesystem_info = NULL;
+}
+
+/* check if we have a valid mount now */
+mount = g_volume_get_mount(volume_icon-priv-volume);
+if(mount) {
+/* load mount point information */
+volume_icon-priv-file = g_mount_get_root(mount);
+volume_icon-priv-file_info = 
+

[Xfce4-commits] xfdesktop:xfce-4.8 Implement open and empty actions for the trash.

[Jannis Pohlmann]

Updating branch refs/heads/xfce-4.8
 to d15eebaab48e640990205eafcaf10c71bd599b88 (commit)
   from 54cf26045b928b8b0c0e10fdb88ff6f6a82f8441 (commit)

commit d15eebaab48e640990205eafcaf10c71bd599b88
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jan 29 18:17:55 2011 +0100

Implement open and empty actions for the trash.

This makes the trash fully functional again. Unfortunately, it also
required a new string to be added (Could not empty the trash).

 NEWS  |1 +
 src/xfdesktop-file-utils.c|   46 ++
 src/xfdesktop-file-utils.h|2 +
 src/xfdesktop-special-file-icon.c |  119 
 4 files changed, 63 insertions(+), 105 deletions(-)

diff --git a/NEWS b/NEWS
index 07d7bb4..f8ada79 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Xfdesktop 4.x.y
   * Scroll to the selected background in the settings (bug #7087).
   * Handle volume changes in a timeout (bug #7025).
   * Implement monitoring for special file icons (bug #6986).
+  * Implement open and empty actions for the trash.
 
 
 Xfdesktop 4.8.0
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index c3c3e3b..33ffe64 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -900,6 +900,52 @@ xfdesktop_file_utils_trash_files(GList *files,
 }
 
 void
+xfdesktop_file_utils_empty_trash(GdkScreen *screen,
+ GtkWindow *parent)
+{
+DBusGProxy *trash_proxy;
+
+g_return_if_fail(GDK_IS_SCREEN(screen) || GTK_IS_WINDOW(parent));
+
+if(!screen)
+screen = gtk_widget_get_screen(GTK_WIDGET(parent));
+
+trash_proxy = xfdesktop_file_utils_peek_trash_proxy();
+if(trash_proxy) {
+GError *error = NULL;
+gchar *display_name = gdk_screen_make_display_name(screen);
+gchar *startup_id = g_strdup_printf(_TIME%d, 
gtk_get_current_event_time());
+
+xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH);
+
+if(!xfdesktop_trash_proxy_empty_trash(trash_proxy,
+  display_name, startup_id,
+  error))
+{
+xfce_message_dialog(parent,
+_(Trash Error), GTK_STOCK_DIALOG_ERROR,
+_(Could not empty the trash),
+error-message, GTK_STOCK_CLOSE, 
GTK_RESPONSE_ACCEPT, 
+NULL);
+
+g_error_free(error);
+}
+
+xfdesktop_file_utils_set_window_cursor(parent, GDK_LEFT_PTR);
+
+g_free(startup_id);
+g_free(display_name);
+} else {
+xfce_message_dialog(parent,
+_(Trash Error), GTK_STOCK_DIALOG_ERROR,
+_(Could not empty the trash),
+_(This feature requires a trash service to 
+  be present (such as the one supplied by 
Thunar).),
+GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+}
+}
+
+void
 xfdesktop_file_utils_create_file(GFile *parent_folder,
  const gchar *content_type,
  GdkScreen *screen,
diff --git a/src/xfdesktop-file-utils.h b/src/xfdesktop-file-utils.h
index 73891d1..a44e53f 100644
--- a/src/xfdesktop-file-utils.h
+++ b/src/xfdesktop-file-utils.h
@@ -74,6 +74,8 @@ void xfdesktop_file_utils_rename_file(GFile *file,
 void xfdesktop_file_utils_trash_files(GList *files,
GdkScreen *screen,
GtkWindow *parent);
+void xfdesktop_file_utils_empty_trash(GdkScreen *screen,
+  GtkWindow *parent);
 void xfdesktop_file_utils_unlink_files(GList *files,
GdkScreen *screen,
GtkWindow *parent);
diff --git a/src/xfdesktop-special-file-icon.c 
b/src/xfdesktop-special-file-icon.c
index 7e0264c..8f0990c 100644
--- a/src/xfdesktop-special-file-icon.c
+++ b/src/xfdesktop-special-file-icon.c
@@ -44,8 +44,6 @@
 
 #include libxfce4ui/libxfce4ui.h
 
-#include dbus/dbus-glib.h
-
 #ifdef HAVE_THUNARX
 #include thunarx/thunarx.h
 #endif
@@ -53,7 +51,6 @@
 #include xfdesktop-common.h
 #include xfdesktop-file-utils.h
 #include xfdesktop-special-file-icon.h
-#include xfdesktop-trash-proxy.h
 
 struct _XfdesktopSpecialFileIconPrivate
 {
@@ -68,7 +65,6 @@ struct _XfdesktopSpecialFileIconPrivate
 GdkScreen *gscreen;
 
 /* only needed for trash */
-DBusGProxy *dbus_proxy;
 gboolean trash_item_count;
 };
 
@@ -447,93 +443,18 @@ xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon 
*icon)
 }
 
 static void
-xfdesktop_special_file_icon_trash_handle_error(XfdesktopSpecialFileIcon *icon,
-   const gchar *method,
- 

[Xfce4-commits] xfdesktop:xfce-4.8 Implement monitoring for special file icons like the trash (bug #6986).

[Jannis Pohlmann]

Updating branch refs/heads/xfce-4.8
 to 54cf26045b928b8b0c0e10fdb88ff6f6a82f8441 (commit)
   from e8bc0f168577c84e5576ea2702efda2e0b83311a (commit)

commit 54cf26045b928b8b0c0e10fdb88ff6f6a82f8441
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jan 29 17:50:44 2011 +0100

Implement monitoring for special file icons like the trash (bug #6986).

 NEWS  |1 +
 src/xfdesktop-file-icon-manager.c |8 +--
 src/xfdesktop-special-file-icon.c |   99 -
 3 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index e7ecf33..07d7bb4 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Xfdesktop 4.x.y
 Patch by xai...@gmail.com.
   * Scroll to the selected background in the settings (bug #7087).
   * Handle volume changes in a timeout (bug #7025).
+  * Implement monitoring for special file icons (bug #6986).
 
 
 Xfdesktop 4.8.0
diff --git a/src/xfdesktop-file-icon-manager.c 
b/src/xfdesktop-file-icon-manager.c
index c5944a7..7362c52 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -1,9 +1,9 @@
 /*
  *  xfdesktop - xfce4's desktop manager
  *
- *  Copyright(c) 2006 Brian Tarricone, bj...@cornell.edu
- *  Copyright(c) 2006 Benedikt Meurer, be...@xfce.org
- *  Copyright(c) 2010 Jannis Pohlmann, jan...@xfce.org
+ *  Copyright(c) 2006  Brian Tarricone, bj...@cornell.edu
+ *  Copyright(c) 2006  Benedikt Meurer, be...@xfce.org
+ *  Copyright(c) 2010-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 published by
@@ -1972,8 +1972,6 @@ 
xfdesktop_file_icon_manager_add_special_file_icon(XfdesktopFileIconManager *fman
 XFDESKTOP_FILE_ICON(icon),
 FALSE))
 {
-/* TODO need to make file monitoring work for special icons like
- * the filesystem root and the trash bin */
 g_hash_table_replace(fmanager-priv-special_icons,
  GINT_TO_POINTER(type), icon);
 return XFDESKTOP_FILE_ICON(icon);
diff --git a/src/xfdesktop-special-file-icon.c 
b/src/xfdesktop-special-file-icon.c
index 8bad3f7..7e0264c 100644
--- a/src/xfdesktop-special-file-icon.c
+++ b/src/xfdesktop-special-file-icon.c
@@ -1,9 +1,9 @@
 /*
  *  xfdesktop - xfce4's desktop manager
  *
- *  Copyright(c) 2006 Brian Tarricone, bj...@cornell.edu
- *  Copyright(c) 2006 Benedikt Meurer, be...@xfce.org
- *  Copyright(c) 2010 Jannis Pohlmann, jan...@xfce.org
+ *  Copyright(c) 2006  Brian Tarricone, bj...@cornell.edu
+ *  Copyright(c) 2006  Benedikt Meurer, be...@xfce.org
+ *  Copyright(c) 2010-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 published by
@@ -61,6 +61,7 @@ struct _XfdesktopSpecialFileIconPrivate
 GdkPixbuf *pix;
 gchar *tooltip;
 gint cur_pix_size;
+GFileMonitor *monitor;
 GFileInfo *file_info;
 GFileInfo *filesystem_info;
 GFile *file;
@@ -68,7 +69,7 @@ struct _XfdesktopSpecialFileIconPrivate
 
 /* only needed for trash */
 DBusGProxy *dbus_proxy;
-gboolean trash_full;
+gboolean trash_item_count;
 };
 
 static void xfdesktop_special_file_icon_finalize(GObject *obj);
@@ -88,6 +89,11 @@ static gboolean 
xfdesktop_special_file_icon_populate_context_menu(XfdesktopIcon
 static GFileInfo *xfdesktop_special_file_icon_peek_file_info(XfdesktopFileIcon 
*icon);
 static GFileInfo 
*xfdesktop_special_file_icon_peek_filesystem_info(XfdesktopFileIcon *icon);
 static GFile *xfdesktop_special_file_icon_peek_file(XfdesktopFileIcon *icon);
+static void xfdesktop_special_file_icon_changed(GFileMonitor *monitor,
+GFile *file,
+GFile *other_file,
+GFileMonitorEvent event,
+XfdesktopSpecialFileIcon 
*special_file_icon);
 
 #ifdef HAVE_THUNARX
 static void xfdesktop_special_file_icon_tfi_init(ThunarxFileInfoIface *iface);
@@ -153,10 +159,17 @@ xfdesktop_special_file_icon_finalize(GObject *obj)
 g_signal_handlers_disconnect_by_func(G_OBJECT(itheme),
  
G_CALLBACK(xfdesktop_special_file_icon_invalidate_pixbuf),
  icon);
-
+
 if(icon-priv-pix)
 g_object_unref(G_OBJECT(icon-priv-pix));
 
+if(icon-priv-monitor) {
+g_signal_handlers_disconnect_by_func(icon-priv-monitor,
+ 
G_CALLBACK(xfdesktop_special_file_icon_changed),
+ icon);
+g_object_unref(icon-priv-monitor);
+}
+
 

[Xfce4-commits] xfce4-panel:master Remove unneeded check (bug #7149).

[Nick Schermer]

Updating branch refs/heads/master
 to f76161d04c3d5e70abb3daf0b4295ed6f219da00 (commit)
   from e3a4cde2b689f7d0bc7abef0024562a78ac9cbaf (commit)

commit f76161d04c3d5e70abb3daf0b4295ed6f219da00
Author: Nick Schermer n...@xfce.org
Date:   Sat Jan 29 18:08:02 2011 +0100

Remove unneeded check (bug #7149).

 plugins/tasklist/tasklist-widget.c |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/plugins/tasklist/tasklist-widget.c 
b/plugins/tasklist/tasklist-widget.c
index 143209e..19d414a 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -876,8 +876,6 @@ xfce_tasklist_size_layout (XfceTasklist  *tasklist,
 
xfce_tasklist_size_sort_window);
 }
 
-  panel_return_if_fail (g_slist_length (windows_scored) == (guint) 
tasklist-n_windows);
-
   if (!tasklist-show_labels)
 max_button_length = min_button_length;
   else if (tasklist-max_button_length != -1)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:master Don't disappear when wm restarts with compositing (bug #7194).

[Nick Schermer]

Updating branch refs/heads/master
 to 16ca0888abb9e92ed8a38d1e53128da01c712c4f (commit)
   from f76161d04c3d5e70abb3daf0b4295ed6f219da00 (commit)

commit 16ca0888abb9e92ed8a38d1e53128da01c712c4f
Author: Nick Schermer n...@xfce.org
Date:   Sat Jan 29 18:18:37 2011 +0100

Don't disappear when wm restarts with compositing (bug #7194).

Because of a quick widget hide/show to make sure the
window was redrawn, the window became invisible when quickly
restarting the wm. Remove this unneeded trick.

Also cleanup the colormap handling, we now only set the rgba
colormap in the init function, since it depends on the screen
and won't change during runtime, this makes things a lot easier.

 libxfce4panel/xfce-panel-macros-46.h |3 -
 panel/panel-base-window.c|   87 +
 panel/panel-window.c |   24 -
 wrapper/wrapper-plug.c   |4 --
 4 files changed, 34 insertions(+), 84 deletions(-)

diff --git a/libxfce4panel/xfce-panel-macros-46.h 
b/libxfce4panel/xfce-panel-macros-46.h
index dd28bb9..b18a04e 100644
--- a/libxfce4panel/xfce-panel-macros-46.h
+++ b/libxfce4panel/xfce-panel-macros-46.h
@@ -583,10 +583,7 @@ G_BEGIN_DECLS
 gtk_widget_set_app_paintable (plug, TRUE); \
 \
 screen = gtk_widget_get_screen (plug); \
-\
 colormap = gdk_screen_get_rgba_colormap (screen); \
-if (colormap == NULL) \
-  colormap = gdk_screen_get_rgb_colormap (screen); \
 if (colormap != NULL) \
   gtk_widget_set_colormap (plug, colormap); \
 \
diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 8bdb298..751e0c9 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -192,6 +192,9 @@ 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;
@@ -210,7 +213,19 @@ panel_base_window_init (PanelBaseWindow *window)
* the type-hint already takes care of that */
   gtk_window_stick (GTK_WINDOW (window));
 
-  panel_base_window_composited_changed (GTK_WIDGET (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=%s, compositing=%s, window,
+   PANEL_DEBUG_BOOL (colormap != NULL),
+   PANEL_DEBUG_BOOL (window-is_composited));
 }
 
 
@@ -641,50 +656,17 @@ static void
 panel_base_window_composited_changed (GtkWidget *widget)
 {
   PanelBaseWindow *window = PANEL_BASE_WINDOW (widget);
-  GdkColormap *colormap = NULL;
   gboolean was_composited = window-is_composited;
-  gboolean was_visible;
-  GdkScreen   *screen;
-  gboolean colormap_changed;
-  gboolean colormap_rgba = FALSE;
-
-  panel_return_if_fail (PANEL_IS_BASE_WINDOW (widget));
-
-  /* get the widget screen */
-  screen = gtk_window_get_screen (GTK_WINDOW (widget));
-  panel_return_if_fail (GDK_IS_SCREEN (screen));
-
-  /* get the rgba colormap */
-  colormap = gdk_screen_get_rgba_colormap (screen);
-  if (G_UNLIKELY (colormap == NULL))
-{
-  window-is_composited = FALSE;
-  colormap = gdk_screen_get_rgb_colormap (screen);
-}
-  else
-{
-  colormap_rgba = TRUE;
-  window-is_composited = gtk_widget_is_composited (widget);
-  gtk_window_set_opacity (GTK_WINDOW (widget), 
window-priv-leave_opacity);
-}
+  GdkWindow   *gdkwindow;
 
-  panel_return_if_fail (GDK_IS_COLORMAP (colormap));
-  colormap_changed = gtk_widget_get_colormap (widget) != colormap;
+  /* set new compositing state */
+  window-is_composited = gtk_widget_is_composited (widget);
+  if (window-is_composited)
+gtk_window_set_opacity (GTK_WINDOW (widget), window-priv-leave_opacity);
 
   panel_debug (PANEL_DEBUG_BASE_WINDOW,
-   %p: composited=%s, rgba=%s, visible=%s, window,
-   PANEL_DEBUG_BOOL (gtk_widget_is_composited (widget)),
-   PANEL_DEBUG_BOOL (colormap_rgba),
-   PANEL_DEBUG_BOOL (GTK_WIDGET_VISIBLE (widget)));
-
-  was_visible = GTK_WIDGET_VISIBLE (widget);
-  if (was_visible)
-{
-  gtk_widget_hide (widget);
-
-  if (colormap_changed)
-gtk_widget_unrealize (widget);
-}
+   %p: compositing=%s, window,
+   PANEL_DEBUG_BOOL (window-is_composited));
 
   /* clear cairo image cache */
   if (window-priv-bg_image_cache != NULL)
@@ -693,20 +675,19 @@ panel_base_window_composited_changed (GtkWidget 

[Xfce4-commits] exo:xfce-4.8 l10n: Updated Russian (ru) translation to 99%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to 795731aafe4362ebb27f0a81bc5dacac2f289de8 (commit)
   from 150bf44db02e4f39c449fd219da68428b2b4154b (commit)

commit 795731aafe4362ebb27f0a81bc5dacac2f289de8
Author: Styopa Semenukha semenu...@gmail.com
Date:   Sat Jan 29 18:26:22 2011 +0100

l10n: Updated Russian (ru) translation to 99%

New status: 273 messages complete with 0 fuzzies and 1 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ru.po |  192 +++---
 1 files changed, 70 insertions(+), 122 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index c7ee3e7..2bc0973 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,8 +2,8 @@
 # Russian translation for exo package.
 # Copyright (C) 2004-2006 os-cillation e.K.
 # This file is distributed under the same license as the exo package.
-#
-#
+# 
+# 
 # Andrey Fedoseev andrey.fedos...@gmail.com, 2006.
 # Maxim Zenin webmechan...@gmail.com, 2006.
 # Andrey Fedoseev andrey.fedos...@gmail.com, 2008.
@@ -12,16 +12,15 @@ msgid 
 msgstr 
 Project-Id-Version: ru\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 16:35+0100\n
+POT-Creation-Date: 2011-01-29 11:30+\n
 PO-Revision-Date: 2010-01-05 20:28+0300\n
 Last-Translator: dima i...@cnc-parts.info\n
 Language-Team: Russian \n
-Language: ru\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  n
-%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
+Language: ru\n
+Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
 X-Generator: KBabel 1.11.4\n
 
 #: ../exo/exo-cell-renderer-ellipsized-text.c:131
@@ -70,11 +69,8 @@ msgstr Не удалось прочитать файл \%s\: %s
 
 #: ../exo/exo-gdk-pixbuf-extensions.c:890
 #, c-format
-msgid 
-Failed to load image \%s\: Unknown reason, probably a corrupt image file
-msgstr 
-Не удалось открыть файл изображения \%s\: Причина неизвестна, возможно 
-файл повреждён
+msgid Failed to load image \%s\: Unknown reason, probably a corrupt image 
file
+msgstr Не удалось открыть файл изображения \%s\: Причина неизвестна, 
возможно файл повреждён
 
 #: ../exo/exo-gtk-extensions.c:227
 #, c-format
@@ -223,7 +219,7 @@ msgstr Выберите _значок из:
 #. search filter
 #: ../exo/exo-icon-chooser-dialog.c:225
 msgid _Search icon:
-msgstr _Иконка поиска
+msgstr _Поиск иконки
 
 #: ../exo/exo-icon-chooser-dialog.c:236
 msgid Clear search field
@@ -283,9 +279,7 @@ msgstr Колонка разметки
 
 #: ../exo/exo-icon-view.c:748
 msgid Model column used to retrieve the text if using Pango markup
-msgstr 
-Колонка модели, используемая для получения текста при использовании разметки 
-Pango
+msgstr Колонка модели, используемая для получения текста при использовании 
разметки Pango
 
 #: ../exo/exo-icon-view.c:762
 msgid Icon View Model
@@ -296,8 +290,7 @@ msgid The model for the icon view
 msgstr Модель для представления иконок
 
 #: ../exo/exo-icon-view.c:777
-msgid 
-How the text and icon of each item are positioned relative to each other
+msgid How the text and icon of each item are positioned relative to each 
other
 msgstr Расположение текста и значков относительно друг друга
 
 #: ../exo/exo-icon-view.c:809
@@ -345,12 +338,8 @@ msgid Single Click Timeout
 msgstr Таймаут одиночного клика
 
 #: ../exo/exo-icon-view.c:889 ../exo/exo-tree-view.c:172
-msgid 
-The amount of time after which the item under the mouse cursor will be 
-selected automatically in single click mode
-msgstr 
-Промежуток времени в режиме одиночного клика, после которого элемент под 
-курсором мыши будет выбран
+msgid The amount of time after which the item under the mouse cursor will be 
selected automatically in single click mode
+msgstr Промежуток времени в режиме одиночного клика, после которого элемент 
под курсором мыши будет выбран
 
 #: ../exo/exo-icon-view.c:904
 msgid Spacing
@@ -409,9 +398,7 @@ msgid _Add a new toolbar
 msgstr _Добавить новую панель
 
 #: ../exo/exo-toolbars-editor.c:221
-msgid 
-Drag an item onto the toolbars above to add it, from the toolbars in the 
-items table to remove it.
+msgid Drag an item onto the toolbars above to add it, from the toolbars in 
the items table to remove it.
 msgstr Перетащите элемент на панель для добавления и с панели для удаления.
 
 #: ../exo/exo-toolbars-editor.c:538
@@ -618,37 +605,44 @@ msgstr Скрипты Shell
 msgid Create Launcher b%s/b
 msgstr Создать значок запуска b%s/b
 
-#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to 
avoid mnemonic conflicts
+#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to
+#. avoid mnemonic conflicts
 #: ../exo-desktop-item-edit/exo-die-editor.c:297
 msgid _Name:
 msgstr _Имя:
 
-#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to 
avoid mnemonic conflicts
+#. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to
+#. 

[Xfce4-commits] thunar:master Fix segfault when calling strcasecmp with NULL parameters (bug #7206).

[Jannis Pohlmann]

Updating branch refs/heads/master
 to aabb332fb07aa7b86c74eae518cadd9764c296ed (commit)
   from 8f7a02c162880e48891ea5528e3513d71ef6105f (commit)

commit aabb332fb07aa7b86c74eae518cadd9764c296ed
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jan 29 18:27:15 2011 +0100

Fix segfault when calling strcasecmp with NULL parameters (bug #7206).

 NEWS   |1 +
 thunar/thunar-list-model.c |   11 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index b548d88..8439901 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
 - Don't interpret file display names as format strings (bug #7128).
 - Ship stock_folder-copy.png and stock_folder-move.png icons with
   Thunar itself (bug #6851).
+- Fix segfault when calling strcasecmp with NULL parameters (bug #7206).
 
 1.2.0
 =
diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c
index dacb4ad..f5e42b3 100644
--- a/thunar/thunar-list-model.c
+++ b/thunar/thunar-list-model.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /*-
  * Copyright (c) 2004-2007 Benedikt Meurer be...@xfce.org
- * Copyright (c) 2009 Jannis Pohlmann jan...@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 published by the Free
@@ -1643,6 +1643,15 @@ sort_by_type (const ThunarFile *a,
   description_b = g_content_type_get_description (content_type_b);
 }
 
+  /* avoid calling strcasecmp with NULL parameters */
+  if (description_a == NULL || description_b == NULL)
+{
+  g_free (description_a);
+  g_free (description_b);
+
+  return 0;
+}
+
   if (!case_sensitive)
 result = strcasecmp (description_a, description_b);
   else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:xfce-4.8 Fix segfault when calling strcasecmp with NULL parameters (bug #7206).

[Jannis Pohlmann]

Updating branch refs/heads/xfce-4.8
 to 9c67fe4bd38530cb169b50339bf5fb846e2a6f67 (commit)
   from 126b3fe860869fd45b532a8d1210ad9f23ed5b6e (commit)

commit 9c67fe4bd38530cb169b50339bf5fb846e2a6f67
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jan 29 18:27:15 2011 +0100

Fix segfault when calling strcasecmp with NULL parameters (bug #7206).

 NEWS   |1 +
 thunar/thunar-list-model.c |   11 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index e258539..208c349 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
 - Don't interpret file display names as format strings (bug #7128).
 - Ship stock_folder-copy.png and stock_folder-move.png icons with
   Thunar itself (bug #6851).
+- Fix segfault when calling strcasecmp with NULL parameters (bug #7206).
 
 1.2.0
 =
diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c
index dacb4ad..f5e42b3 100644
--- a/thunar/thunar-list-model.c
+++ b/thunar/thunar-list-model.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /*-
  * Copyright (c) 2004-2007 Benedikt Meurer be...@xfce.org
- * Copyright (c) 2009 Jannis Pohlmann jan...@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 published by the Free
@@ -1643,6 +1643,15 @@ sort_by_type (const ThunarFile *a,
   description_b = g_content_type_get_description (content_type_b);
 }
 
+  /* avoid calling strcasecmp with NULL parameters */
+  if (description_a == NULL || description_b == NULL)
+{
+  g_free (description_a);
+  g_free (description_b);
+
+  return 0;
+}
+
   if (!case_sensitive)
 result = strcasecmp (description_a, description_b);
   else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:xfce-4.8 Ship stock_folder-{copy, move}.png with Thunar itself (bug #6851).

[Jannis Pohlmann]

Updating branch refs/heads/xfce-4.8
 to 126b3fe860869fd45b532a8d1210ad9f23ed5b6e (commit)
   from e7795bd3a691cd3dc3ee15f5b9f9384df3d18dc1 (commit)

commit 126b3fe860869fd45b532a8d1210ad9f23ed5b6e
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jan 26 23:17:18 2011 +0100

Ship stock_folder-{copy,move}.png with Thunar itself (bug #6851).

These icons were part of older gnome-icon-theme releases but have now
disappeared. There are no useful equivalents in the icon naming
specification or the GTK+ stock icons (well, there is GTK_STOCK_COPY,
but no appropriate replacement for stock_folder-move), so for now it's
best to ship the icons ourselves, I think.

 AUTHORS   |6 ++
 NEWS  |2 ++
 icons/16x16/Makefile.am   |2 ++
 icons/16x16/stock_folder-copy.png |  Bin 0 - 472 bytes
 icons/16x16/stock_folder-move.png |  Bin 0 - 555 bytes
 icons/24x24/Makefile.am   |8 +++-
 icons/24x24/stock_folder-copy.png |  Bin 0 - 824 bytes
 icons/24x24/stock_folder-move.png |  Bin 0 - 848 bytes
 thunar/thunar-dnd.c   |   29 +++--
 9 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d44a8fa..34a0f53 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,3 +9,9 @@ the code was written by Andrew Trigell tri...@linuxcare.com 
with the help of
 Paul Rusty Russell ru...@linuxcare.com. Luke Kenneth Casson Leighton
 l...@samba.org also contributed a few patches. Sorted freelist merge code
 added by Jeremy Allison jer...@valinux.com.
+
+The stock_folder-copy and stock_folder-move icons where taken from 
+gnome-icon-theme 2.18.0 whose authors are Lapo Calamandrei 
calamand...@gmail.com,
+Rodney Dawes do...@novell.com, Luca Ferretti elle@libero.it,
+Tuomas Kuosmanen tig...@gimp.org, Andreas Nilsson nisses.m...@home.se
+and Jakub Steiner jim...@novell.com. The icons are licensed under GPL.
diff --git a/NEWS b/NEWS
index 9e4e5f4..e258539 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
 - Fix truncated strings when loading and storing emblems (bug #7171).
 - Only erase top-level items from trash (bug #7147).
 - Don't interpret file display names as format strings (bug #7128).
+- Ship stock_folder-copy.png and stock_folder-move.png icons with
+  Thunar itself (bug #6851).
 
 1.2.0
 =
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 5e3fbf1..d91ac9e 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -6,6 +6,8 @@ apps_DATA = 
\
 
 stockdir = $(datadir)/icons/hicolor/16x16/stock/navigation
 stock_DATA =   \
+   stock_folder-copy.png   \
+   stock_folder-move.png   \
stock_thunar-shortcuts.png  \
stock_thunar-templates.png
 
diff --git a/icons/16x16/stock_folder-copy.png 
b/icons/16x16/stock_folder-copy.png
new file mode 100644
index 000..e67381a
Binary files /dev/null and b/icons/16x16/stock_folder-copy.png differ
diff --git a/icons/16x16/stock_folder-move.png 
b/icons/16x16/stock_folder-move.png
new file mode 100644
index 000..111f69d
Binary files /dev/null and b/icons/16x16/stock_folder-move.png differ
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index 3c6cf97..49a1e38 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -4,7 +4,13 @@ iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA =   \
Thunar.png
 
+stockdir = $(datadir)/icons/hicolor/24x24/stock/navigation
+stock_DATA =   \
+   stock_folder-copy.png   \
+   stock_folder-move.png
+
 EXTRA_DIST =   \
-   $(icons_DATA)
+   $(icons_DATA)   \
+   $(stock_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/24x24/stock_folder-copy.png 
b/icons/24x24/stock_folder-copy.png
new file mode 100644
index 000..2db0368
Binary files /dev/null and b/icons/24x24/stock_folder-copy.png differ
diff --git a/icons/24x24/stock_folder-move.png 
b/icons/24x24/stock_folder-move.png
new file mode 100644
index 000..d8ab50d
Binary files /dev/null and b/icons/24x24/stock_folder-move.png differ
diff --git a/thunar/thunar-dnd.c b/thunar/thunar-dnd.c
index 92259bc..9871eb0 100644
--- a/thunar/thunar-dnd.c
+++ b/thunar/thunar-dnd.c
@@ -1,21 +1,22 @@
-/* $Id$ */
+/* 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) 2009-2011 Jannis Pohlmann jan...@xfce.org

[Xfce4-commits] xfdesktop:master l10n: Updated Danish (da) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to 1189643f73d4b75b65c61f276fe9c69ff8837ad0 (commit)
   from 94a79f1a1348b56a5dcc3f8123eb2b933feb9073 (commit)

commit 1189643f73d4b75b65c61f276fe9c69ff8837ad0
Author: Per Kongstad p_kongs...@op.pl
Date:   Sat Jan 29 18:31:12 2011 +0100

l10n: Updated Danish (da) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/da.po |  316 +
 1 files changed, 130 insertions(+), 186 deletions(-)

diff --git a/po/da.po b/po/da.po
index 974365c..7e77b0a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,14 +7,14 @@ msgid 
 msgstr 
 Project-Id-Version: xfdesktop 4.7.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 17:29+\n
 PO-Revision-Date: 2009-12-18 18:46+0100\n
 Last-Translator: Per Kongstad p_kongs...@op.pl\n
 Language-Team: Danish da...@dansk-gruppen.dk\n
-Language: da\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: da\n
 X-Poedit-Language: Danish\n
 X-Poedit-SourceCharset: utf-8\n
 X-Poedit-Country: DENMARK\n
@@ -25,7 +25,7 @@ msgid Backdrop list file is not valid
 msgstr Baggrundsliste er ikke gyldig
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -34,129 +34,126 @@ msgstr 
 %s\n
 iStørrelse: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Hjem
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Filsystem
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Papirkurv
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Fjernbare enheder
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Kan ikke oprette baggrundsliste \%s\
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Baggrundslistefejl
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Opret/indlæs baggrundsliste
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-Fil \%s\ er ikke en gyldig baggrundsfilliste.  Ønsker du at overskrive 
-denne?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr Fil \%s\ er ikke en gyldig baggrundsfilliste.  Ønsker du at 
overskrive denne?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Ugyldig filliste
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Overskrivning af filen vil medføre, at indholdet går tabt.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Udskift
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Kunne ikke skrive baggrundsliste til \%s\
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Tilføj billedfil(er)
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Billedfiler
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Alle filer
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Skærm %d, monitor %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Skærm %d, monitor %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Skærm %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Skærm %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Skærm %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Sokkel for indstillingshåndtering
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr SOKKEL-ID
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid Version information
 msgstr Versionsinformation
 
-#: ../settings/main.c:1498
+#: ../settings/main.c:1521
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Tast '%s --help' for brug.
 
-#: ../settings/main.c:1510
+#: ../settings/main.c:1533
 msgid The Xfce development team. All rights reserved.
 msgstr Xfce-udviklingsholdet. Alle 

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated Portuguese (pt) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to e334d1f1153cbf8dee28a4061d638f5e1a44295f (commit)
   from d15eebaab48e640990205eafcaf10c71bd599b88 (commit)

commit e334d1f1153cbf8dee28a4061d638f5e1a44295f
Author: Nuno Miguel nu...@netcabo.pt
Date:   Sat Jan 29 18:42:02 2011 +0100

l10n: Updated Portuguese (pt) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pt.po |  314 +
 1 files changed, 129 insertions(+), 185 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 944e869..ee0e4c9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,19 +3,19 @@
 # This file is distributed under the same license as the xfdesktop package.
 # Nuno Donato nunodon...@gmail.com, 2004.
 # Nuno Miguel nu...@netcabo.pt, 2007, 2008, 2009.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop 4.6.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 17:35+\n
 PO-Revision-Date: 2010-12-30 16:11+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
 X-Poedit-Language: Portuguese\n
 X-Poedit-Country: PORTUGAL\n
 
@@ -25,7 +25,7 @@ msgid Backdrop list file is not valid
 msgstr O ficheiro de lista de fundos é inválido
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -34,127 +34,126 @@ msgstr 
 %s\n
 iTamanho: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Pasta pessoal
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Sistema de ficheiros
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Lixo
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Dispositivos amovíveis
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Não é possível criar lista de fundos \%s\
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Erro na lista de fundos
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Criar/carregar lista de fundos
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
 msgstr O ficheiro \%s\ não é um ficheiro válido. Deseja sobrescrevê-lo?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr O ficheiro da lista e inválido
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Sobrescrever o ficheiro provocará a perda do conteúdo. 
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Substituir
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Falhou ao escrever a lista de fundos para \%s\
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Adicionar ficheiro(s) de imagem
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Ficheiros de imagem
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Todos os ficheiros
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Ecrã %d, Monitor %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Ecrã %d, Monitor %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Ecrã %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Monitor %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Monitor %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Gestor de definições
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr ID de \SOCKET\
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid Version information
 msgstr Informações de versão
 
-#: ../settings/main.c:1498
+#: ../settings/main.c:1521
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Digite \%s --help\ para utilização.
 
-#: ../settings/main.c:1510
+#: 

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated French (fr) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to 5ce4b9e0c8005d3b09c290f70446358f825225a7 (commit)
   from e334d1f1153cbf8dee28a4061d638f5e1a44295f (commit)

commit 5ce4b9e0c8005d3b09c290f70446358f825225a7
Author: Mike Massonnet mmasson...@gmail.com
Date:   Sat Jan 29 18:45:29 2011 +0100

l10n: Updated French (fr) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/fr.po |  322 +-
 1 files changed, 131 insertions(+), 191 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 35fb241..5f87d6c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,19 +6,19 @@
 # Maximilian Schleiss maximil...@xfce.org, 2006-2008.
 # Mike Massonnet mmasson...@xfce.org, 2008.
 # Jérôme Guelfucci jero...@xfce.org, 2009.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 17:35+\n
 PO-Revision-Date: 2011-01-15 17:52+0100\n
 Last-Translator: Jérôme Guelfucci jero...@xfce.org\n
 Language-Team: French xfce-i...@xfce.org\n
-Language: fr\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: fr\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
 #, c-format
@@ -26,7 +26,7 @@ msgid Backdrop list file is not valid
 msgstr La liste de fonds d'écran n'est pas valide
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -35,129 +35,126 @@ msgstr 
 %s\n
 iTaille : %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Répertoire personnel
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Système de fichiers
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Corbeille
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Périphériques amovibles
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Impossible de créer la liste de fonds d'écrans \%s\
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Éditeur de listes de fonds d'écran
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Créer/Charger la liste de fonds d'écrans
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-Le fichier de liste de fonds d'écran \%s\ n'est pas valide. Voulez-vous 
-l'écraser ?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr Le fichier de liste de fonds d'écran \%s\ n'est pas valide. 
Voulez-vous l'écraser ?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Liste de fichiers non valide
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Écraser le fichier effacera son contenu.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Remplacer
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Impossible d'écrire la liste de fonds d'écran dans \%s\
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Ajouter un/des fichier(s) images
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Fichiers images
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Tous les fichiers
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Écran %d, moniteur %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Écran %d, Moniteur %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Écran %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Moniteur %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Moniteur %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Socket du gestionnaire de paramètres
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr ID SOCKET
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid Version information
 msgstr Informations sur la 

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated Romanian (ro) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to 96c6f14036f05d68c229234db0133b63c1c3284e (commit)
   from 5ce4b9e0c8005d3b09c290f70446358f825225a7 (commit)

commit 96c6f14036f05d68c229234db0133b63c1c3284e
Author: Mișu Moldovan du...@xfce.org
Date:   Sat Jan 29 18:49:45 2011 +0100

l10n: Updated Romanian (ro) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ro.po |  270 +++---
 1 files changed, 117 insertions(+), 153 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index 0f1c034..01808f7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,21 +2,20 @@
 # Copyright (C) 2003-2011 The Xfce development team.
 # This file is distributed under the same license as the xfdesktop package.
 # Mișu Moldovan du...@xfce.org, 2004-2011.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop 4.8\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 17:35+\n
 PO-Revision-Date: 2011-01-15 23:49+0200\n
 Last-Translator: Mișu Moldovan du...@xfce.org\n
 Language-Team: Romanian debian-l10n-roman...@lists.debian.org\n
-Language: ro\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100  0  n%100  
-20)) ? 1 : 2);;\n
+Language: ro\n
+Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100  0  n%100  
20)) ? 1 : 2);;\n
 X-Generator: Virtaal 0.6.1\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
@@ -25,7 +24,7 @@ msgid Backdrop list file is not valid
 msgstr Fișierul cu lista de fundaluri nu este valid
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -34,129 +33,126 @@ msgstr 
 %s\n
 iMărime: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Acasă
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Sistem de fișiere
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Coș de gunoi
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Dispozitive detașabile
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Nu s-a putut crea lista imaginilor de fundal „%s”
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Eroare în lista de fundaluri
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Creare/Încărcare listă de fundaluri
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-Fișierul „%s” nu este un fișier valid de tip listă de fundaluri. Doriți să-l 
-suprascrieți?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr Fișierul „%s” nu este un fișier valid de tip listă de fundaluri. 
Doriți să-l suprascrieți?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Fișier de tip listă nevalid
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Suprascrierea fișierului implică pierderea conținutului său.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Înlocuiește
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Nu s-a putut scrie lista de fundaluri în „%s”
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Adăugare fișiere de tip imagine
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Fișierele imagine
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Toate fișierele
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Ecran %d, Monitor %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Ecran %d, Monitor %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Ecran %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Monitor %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Monitor %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Socket 

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated Russian (ru) translation to 93%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to 91ecbd197ca5ffca10411415f4c9ee943e91c452 (commit)
   from 96c6f14036f05d68c229234db0133b63c1c3284e (commit)

commit 91ecbd197ca5ffca10411415f4c9ee943e91c452
Author: Aleksandr Ponomarenko davian...@gmail.com
Date:   Sat Jan 29 19:19:07 2011 +0100

l10n: Updated Russian (ru) translation to 93%

New status: 186 messages complete with 10 fuzzies and 3 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ru.po |  361 -
 1 files changed, 142 insertions(+), 219 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 5cff02c..6cc833b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,21 +5,20 @@
 # Anthony Ivanoff a...@bk.ru, 2004, 2005.
 # Andrey Fedoseev andrey.fedos...@gmail.com, 2006.
 # Denis Koryavov dkorya...@yandex.ru, 2010.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop 4.4.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 17:35+\n
 PO-Revision-Date: 2010-01-26 13:02+0300\n
 Last-Translator: Denis Koryavov dkorya...@yandex.ru\n
 Language-Team: Russian r...@li.org\n
-Language: ru\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  n
-%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
+Language: ru\n
+Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
 #, c-format
@@ -27,7 +26,7 @@ msgid Backdrop list file is not valid
 msgstr Неправильный файл со списком фоновых картинок
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -36,129 +35,126 @@ msgstr 
 %s\n
 iРазмер: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Домашний каталог
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Файловая система
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Корзина
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Съёмные устройства
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Невозможно создать список фоновых изображений \%s\
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Ошибка списка изображений
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Создать/Загрузить список фоновых изображений
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-Файл \%s\ не является правильным файлом списка фоновых изображений. 
-Перезаписать его?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr Файл \%s\ не является правильным файлом списка фоновых изображений. 
Перезаписать его?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Неправильный файл списка
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Перезапись файла приведёт к утрате его содержимого.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Заменить
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Не удалось записать список изображений в \%s\:
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Добавить файл(ы) изображений
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Файлы изображений
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Все файлы
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Экран %d, монитор %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Экран %d, монитор %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Экран %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Монитор %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Монитор %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Сокет диспетчера настроек
 
-#: 

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated Finnish (fi) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to 309b18a34aaebc0e86e744f1acdf4e1091335848 (commit)
   from 91ecbd197ca5ffca10411415f4c9ee943e91c452 (commit)

commit 309b18a34aaebc0e86e744f1acdf4e1091335848
Author: Jari Rahkonen jari.rahko...@pp1.inet.fi
Date:   Sat Jan 29 19:53:41 2011 +0100

l10n: Updated Finnish (fi) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/fi.po |  211 +++--
 1 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 4b84dcd..857c732 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,29 +1,29 @@
 # Translation of xfdesktop into Finnish.
-# Copyright (C) 2003-2010 The Xfce Development Team.
+# Copyright (C) 2003-2011 The Xfce Development Team.
 # This file is distributed under the same license as the xfdesktop package.
 # Ilkka Ollakka ilkka.olla...@iki.fi, 2004.
-# Jari Rahkonen jari.rahko...@pp1.inet.fi, 2005-2010.
+# Jari Rahkonen jari.rahko...@pp1.inet.fi, 2005-2011.
 #
 msgid 
 msgstr 
-Project-Id-Version: xfdesktop 4.7.x\n
+Project-Id-Version: xfdesktop 4.8.x\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
-PO-Revision-Date: 2010-11-05 12:50+0200\n
+POT-Creation-Date: 2011-01-29 17:35+\n
+PO-Revision-Date: 2011-01-29 20:52+0200\n
 Last-Translator: Jari Rahkonen jari.rahko...@pp1.inet.fi\n
 Language-Team: Finnish xfce-i...@xfce.org\n
-Language: fi\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: fi\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
 #, c-format
 msgid Backdrop list file is not valid
-msgstr Tiedosto ei ole kelvollinen taustakuvalista
+msgstr Tiedosto ei ole kelvollinen taustakuvalista.
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -32,127 +32,127 @@ msgstr 
 %s\n
 iKoko: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Kotikansio
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Tiedostojärjestelmä
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Roskakori
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Irrotettavat taltiot
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Ei voi luoda taustakuvalistaa \%s\.
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Taustakuvalistavirhe
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Luo/lataa taustakuvalista
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
 msgid 
 File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
 msgstr Tiedosto \%s\ ei ole kelvollinen taustakuvalista. Korvataanko se?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Taustakuvalista ei kelpaa
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Jos korvaat tiedoston, sen sisältö menetetään.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Korvaa
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Taustakuvalistan kirjoitus epäonnistui kohteeseen \%s\.
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Lisää kuvatiedosto(ja)
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Kuvatiedostot
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Kaikki tiedostot
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Näyttö %d, Monitori %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Näyttö %d, Monitori %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Näyttö %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Monitori %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Monitori %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Asetustenhallinnan pistoke
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr PISTOKE
 
-#: ../settings/main.c:1478

[Xfce4-commits] xfdesktop:master l10n: Updated Finnish (fi) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to ceafdac977172dee8543066cb832e6792d89bdf8 (commit)
   from 1189643f73d4b75b65c61f276fe9c69ff8837ad0 (commit)

commit ceafdac977172dee8543066cb832e6792d89bdf8
Author: Jari Rahkonen jari.rahko...@pp1.inet.fi
Date:   Sat Jan 29 19:54:19 2011 +0100

l10n: Updated Finnish (fi) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/fi.po |  217 +++--
 1 files changed, 110 insertions(+), 107 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 4b84dcd..55f9caa 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,29 +1,29 @@
 # Translation of xfdesktop into Finnish.
-# Copyright (C) 2003-2010 The Xfce Development Team.
+# Copyright (C) 2003-2011 The Xfce Development Team.
 # This file is distributed under the same license as the xfdesktop package.
 # Ilkka Ollakka ilkka.olla...@iki.fi, 2004.
-# Jari Rahkonen jari.rahko...@pp1.inet.fi, 2005-2010.
+# Jari Rahkonen jari.rahko...@pp1.inet.fi, 2005-2011.
 #
 msgid 
 msgstr 
-Project-Id-Version: xfdesktop 4.7.x\n
+Project-Id-Version: xfdesktop 4.8.x\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
-PO-Revision-Date: 2010-11-05 12:50+0200\n
+POT-Creation-Date: 2011-01-29 17:29+\n
+PO-Revision-Date: 2011-01-29 20:50+0200\n
 Last-Translator: Jari Rahkonen jari.rahko...@pp1.inet.fi\n
 Language-Team: Finnish xfce-i...@xfce.org\n
-Language: fi\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: fi\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
 #, c-format
 msgid Backdrop list file is not valid
-msgstr Tiedosto ei ole kelvollinen taustakuvalista
+msgstr Tiedosto ei ole kelvollinen taustakuvalista.
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -32,127 +32,127 @@ msgstr 
 %s\n
 iKoko: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Kotikansio
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Tiedostojärjestelmä
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Roskakori
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Irrotettavat taltiot
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Ei voi luoda taustakuvalistaa \%s\.
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Taustakuvalistavirhe
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Luo/lataa taustakuvalista
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
 msgid 
 File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
 msgstr Tiedosto \%s\ ei ole kelvollinen taustakuvalista. Korvataanko se?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Taustakuvalista ei kelpaa
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Jos korvaat tiedoston, sen sisältö menetetään.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Korvaa
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Taustakuvalistan kirjoitus epäonnistui kohteeseen \%s\.
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Lisää kuvatiedosto(ja)
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Kuvatiedostot
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Kaikki tiedostot
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Näyttö %d, Monitori %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Näyttö %d, Monitori %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Näyttö %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Monitori %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Monitori %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Asetustenhallinnan pistoke
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr PISTOKE
 
-#: ../settings/main.c:1478

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated Greek (el) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to af91644b35fd5c37299224064fc5ec1ece5adde3 (commit)
   from 309b18a34aaebc0e86e744f1acdf4e1091335848 (commit)

commit af91644b35fd5c37299224064fc5ec1ece5adde3
Author: Stavros Giannouris stavr...@gmail.com
Date:   Sat Jan 29 20:14:51 2011 +0100

l10n: Updated Greek (el) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/el.po |  267 +++---
 1 files changed, 116 insertions(+), 151 deletions(-)

diff --git a/po/el.po b/po/el.po
index f33f96c..3b918c2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,22 +3,20 @@
 # This file is distributed under the same license as the xfdesktop package.
 # Stavros Giannouris stavr...@hellug.gr, 2005-2006, 2008.
 # Stathis Kamperis ekamp...@auth.gr, 2006.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop git\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 17:35+\n
 PO-Revision-Date: 2011-01-07 17:54+0200\n
 Last-Translator: Spiros Georgaras s...@hellug.gr\n
 Language-Team: Greek n...@tux.hellug.gr\n
-Language: el\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Plural-Forms: nplurals=2; plural=(n != 1);\\n\\n\\nX-Poedit-Language: Greek
-\\nX-Poedit-SourceCharset: utf-8\n
-X-Poedit-Country: GREECE\n
+Language: el\n
+Plural-Forms: nplurals=2; plural=(n != 1);\\n\\n\\nX-Poedit-Language: 
Greek\\nX-Poedit-SourceCharset: utf-8\\nX-Poedit-Country: GREECE\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
 #, c-format
@@ -26,7 +24,7 @@ msgid Backdrop list file is not valid
 msgstr Το αρχείο δεν είναι έγκυρο
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -35,129 +33,126 @@ msgstr 
 %s\n
 iΜέγεθος %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Αρχικός κατάλογος
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Σύστημα αρχείων
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Απορρίμματα
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Αφαιρούμενα μέσα
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Δεν ήταν δυνατή η δημιουργία του αρχείου λίστας \%s\
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Σφάλμα στη λίστα παρασκηνίων
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Δημιουργία/φόρτωση λίστας παρασκηνίων
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-Το αρχείο \%s\ δεν είναι έγκυρο αρχείο λίστας εικόνων φόντου. Θέλετε να το 
-αντικαταστήσετε;
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr Το αρχείο \%s\ δεν είναι έγκυρο αρχείο λίστας εικόνων φόντου. Θέλετε 
να το αντικαταστήσετε;
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Μη έγκυρο αρχείο
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Αν αντικαταστήσετε το αρχείο θα χαθούν τα τρέχοντα περιεχόμενα του.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Αντικατάσταση
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Η εγγραφή της λίστας στο \%s\ απέτυχε
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Προσθήκη αρχείων εικόνας
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Αρχεία εικόνας
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Όλα τα αρχεία
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Οθόνη %d, Monitor %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Οθόνη %d, Monitor %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Οθόνη %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Monitor %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Monitor %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid 

[Xfce4-commits] xfce4-panel:master Properly update the plugin background when moving to other panel.

[Nick Schermer]

Updating branch refs/heads/master
 to 32bc2ef58f0f78d6da4fc498825008f4eba6d9f2 (commit)
   from 16ca0888abb9e92ed8a38d1e53128da01c712c4f (commit)

commit 32bc2ef58f0f78d6da4fc498825008f4eba6d9f2
Author: Nick Schermer n...@xfce.org
Date:   Sat Jan 29 20:40:43 2011 +0100

Properly update the plugin background when moving to other panel.

The background alpha was not send when the other panel was opaque,
leaving a transparent item in opaque panel.
The background was also not unset, so for example the image or
color was not unset.

 panel/panel-application.c |4 ++--
 panel/panel-plugin-external.c |2 +-
 panel/panel-window.c  |   40 +++-
 panel/panel-window.h  |3 ++-
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/panel/panel-application.c b/panel/panel-application.c
index 092417b..a107f5a 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -669,7 +669,7 @@ panel_application_plugin_insert (PanelApplication  
*application,
 GTK_WIDGET (provider), position);
 
   /* send all the needed info about the panel to the plugin */
-  panel_window_set_povider_info (window, provider);
+  panel_window_set_povider_info (window, provider, FALSE);
 
   /* show the plugin */
   gtk_widget_show (provider);
@@ -907,7 +907,7 @@ panel_application_drag_data_received (PanelWindow  
*window,
   panel_itembar_reorder_child (PANEL_ITEMBAR (itembar), provider, 
application-drop_index);
 
   /* send all the needed panel information to the plugin */
-  panel_window_set_povider_info (window, provider);
+  panel_window_set_povider_info (window, provider, TRUE);
 }
 
   /* everything went fine */
diff --git a/panel/panel-plugin-external.c b/panel/panel-plugin-external.c
index f4d434a..484b531 100644
--- a/panel/panel-plugin-external.c
+++ b/panel/panel-plugin-external.c
@@ -632,7 +632,7 @@ panel_plugin_external_child_respawn (gpointer user_data)
 
   window = gtk_widget_get_toplevel (GTK_WIDGET (external));
   panel_return_val_if_fail (PANEL_IS_WINDOW (window), FALSE);
-  panel_window_set_povider_info (PANEL_WINDOW (window), GTK_WIDGET (external));
+  panel_window_set_povider_info (PANEL_WINDOW (window), GTK_WIDGET (external), 
FALSE);
 
   panel_plugin_external_child_spawn (external);
 
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 1d5424d..dbdef1e 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2475,7 +2475,8 @@ panel_window_new (GdkScreen *screen)
 
 void
 panel_window_set_povider_info (PanelWindow *window,
-   GtkWidget   *provider)
+   GtkWidget   *provider,
+   gboolean moving_to_other_panel)
 {
   PanelBaseWindow *base_window = PANEL_BASE_WINDOW (window);
 
@@ -2485,24 +2486,29 @@ panel_window_set_povider_info (PanelWindow *window,
   xfce_panel_plugin_provider_set_locked (XFCE_PANEL_PLUGIN_PROVIDER (provider),
  panel_window_get_locked (window));
 
-  if (base_window-background_alpha  1.0)
+  if (PANEL_IS_PLUGIN_EXTERNAL (provider))
 {
-  if (PANEL_IS_PLUGIN_EXTERNAL (provider))
-panel_plugin_external_set_background_alpha (PANEL_PLUGIN_EXTERNAL 
(provider),
-base_window-background_alpha);
-}
+  if (moving_to_other_panel || base_window-background_alpha  1.0)
+{
+  panel_plugin_external_set_background_alpha (PANEL_PLUGIN_EXTERNAL 
(provider),
+  base_window-background_alpha);
+}
 
-  if (base_window-background_style == PANEL_BG_STYLE_COLOR)
-{
-  if (PANEL_IS_PLUGIN_EXTERNAL (provider))
-panel_plugin_external_set_background_color (PANEL_PLUGIN_EXTERNAL 
(provider),
-base_window-background_color);
-}
-  else if (base_window-background_style == PANEL_BG_STYLE_IMAGE)
-{
-  if (PANEL_IS_PLUGIN_EXTERNAL (provider))
-panel_plugin_external_set_background_image (PANEL_PLUGIN_EXTERNAL 
(provider),
-base_window-background_image);
+  if (base_window-background_style == PANEL_BG_STYLE_COLOR)
+{
+  panel_plugin_external_set_background_color (PANEL_PLUGIN_EXTERNAL 
(provider),
+  base_window-background_color);
+}
+  else if (base_window-background_style == PANEL_BG_STYLE_IMAGE)
+{
+  panel_plugin_external_set_background_image (PANEL_PLUGIN_EXTERNAL 
(provider),
+  base_window-background_image);
+}
+  else if (moving_to_other_panel)
+{
+  /* unset the background (PROVIDER_PROP_TYPE_ACTION_BACKGROUND_UNSET) 
*/
+  panel_plugin_external_set_background_color (PANEL_PLUGIN_EXTERNAL 
(provider), NULL);
+}
 }
 
   panel_window_set_plugin_orientation (provider, window);
diff --git a/panel/panel-window.h 

[Xfce4-commits] xfce4-eyes-plugin:master Fix compiler warning and hide event window.

[Nick Schermer]

Updating branch refs/heads/master
 to 41ecb9026ba777e41c7c0a8f6e07cad9cfda4c37 (commit)
   from ab34029ca2717b33954436c5de44f8e6760d6306 (commit)

commit 41ecb9026ba777e41c7c0a8f6e07cad9cfda4c37
Author: Nick Schermer n...@xfce.org
Date:   Sat Jan 29 21:01:27 2011 +0100

Fix compiler warning and hide event window.

This makes the plugin look nice on transparent panels.

 panel-plugin/eyes.c   |9 -
 panel-plugin/themes.c |2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/eyes.c b/panel-plugin/eyes.c
index 1524e5b..6c71938 100644
--- a/panel-plugin/eyes.c
+++ b/panel-plugin/eyes.c
@@ -489,13 +489,12 @@ eyes_plugin_new (XfcePanelPlugin* plugin)
 eyes-plugin = plugin;
 
 eyes-ebox = gtk_event_box_new ();
-gtk_widget_show(GTK_WIDGET(eyes-ebox));
+gtk_event_box_set_visible_window (GTK_EVENT_BOX (eyes-ebox), FALSE);
+gtk_widget_show(eyes-ebox);
 
 eyes-align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-
-gtk_widget_show(GTK_WIDGET(eyes-align));
-
-gtk_container_add(GTK_CONTAINER(eyes-ebox), GTK_WIDGET(eyes-align));
+gtk_container_add(GTK_CONTAINER(eyes-ebox), eyes-align);
+gtk_widget_show(eyes-align);
 
 eyes_read_rc_file (plugin, eyes);
 
diff --git a/panel-plugin/themes.c b/panel-plugin/themes.c
index e0be092..a7d2fed 100644
--- a/panel-plugin/themes.c
+++ b/panel-plugin/themes.c
@@ -24,7 +24,9 @@
 #include ctype.h
 
 #include gtk/gtk.h
+
 #include eyes.h
+#include themes.h
 
 gchar *theme_directories[] = {
 THEMESDIR
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:master Unset visible event window in 4.6 plugins.

[Nick Schermer]

Updating branch refs/heads/master
 to ffb8c175e9795d0d25d0ce38d8f513285c26e46f (commit)
   from 32bc2ef58f0f78d6da4fc498825008f4eba6d9f2 (commit)

commit ffb8c175e9795d0d25d0ce38d8f513285c26e46f
Author: Nick Schermer n...@xfce.org
Date:   Sat Jan 29 21:12:19 2011 +0100

Unset visible event window in 4.6 plugins.

A lot 4.6 plugins have an event window as plugin child,
but most of them do not disable the visible event window,
resulting in an ugly looking plugin with composited panels.

So detect if the plugin has an event window as child and
hide the visible window.

For this change, plugins need to recompile.

 libxfce4panel/xfce-panel-macros-46.h |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/libxfce4panel/xfce-panel-macros-46.h 
b/libxfce4panel/xfce-panel-macros-46.h
index b18a04e..ec2d484 100644
--- a/libxfce4panel/xfce-panel-macros-46.h
+++ b/libxfce4panel/xfce-panel-macros-46.h
@@ -420,6 +420,8 @@ G_BEGIN_DECLS
   _xpp_realize (XfcePanelPlugin *xpp, \
 GtkPlug *plug) \
   { \
+GtkWidget *ebox; \
+\
 g_return_if_fail (XFCE_IS_PANEL_PLUGIN (xpp)); \
 g_return_if_fail (GTK_IS_PLUG (plug)); \
 g_return_if_fail (GTK_WIDGET_REALIZED (plug)); \
@@ -435,6 +437,10 @@ G_BEGIN_DECLS
 G_CALLBACK (_xpp_provider_signal), plug); \
 \
 ((XfcePanelPluginFunc) construct_func) (xpp); \
+\
+ebox = gtk_bin_get_child (GTK_BIN (xpp)); \
+if (ebox != NULL  GTK_IS_EVENT_BOX (ebox)) \
+  gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE); \
   } \
   \
   static gboolean \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Make the panels sticky for some window managers (bug #7130).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to e43a35fe1422572a300c7c06e3867a913605ea30 (commit)
   from 95b0153375a3e898adb369d3f266135cb90cc982 (commit)

commit e43a35fe1422572a300c7c06e3867a913605ea30
Author: Nick Schermer n...@xfce.org
Date:   Tue Jan 18 11:31:52 2011 +0100

Make the panels sticky for some window managers (bug #7130).

 panel/panel-base-window.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 9a0f3fe..1da04a2 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -206,6 +206,10 @@ panel_base_window_init (PanelBaseWindow *window)
   window-priv-borders = PANEL_BORDER_NONE;
   window-priv-active_timeout_id = 0;
 
+  /* 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));
+
   panel_base_window_composited_changed (GTK_WIDGET (window));
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Fix assert when storing property values in xfconf (bug #7117).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 8b0c024c435b2cab825ceb2661e2589145e3b5ee (commit)
   from e43a35fe1422572a300c7c06e3867a913605ea30 (commit)

commit 8b0c024c435b2cab825ceb2661e2589145e3b5ee
Author: Nick Schermer n...@xfce.org
Date:   Tue Jan 18 13:10:03 2011 +0100

Fix assert when storing property values in xfconf (bug #7117).

 common/panel-xfconf.c |   21 -
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/common/panel-xfconf.c b/common/panel-xfconf.c
index b43809b..451dd18 100644
--- a/common/panel-xfconf.c
+++ b/common/panel-xfconf.c
@@ -36,6 +36,8 @@ panel_properties_store_value (XfconfChannel *channel,
   const gchar   *object_property)
 {
   GValue  value = { 0, };
+  GdkColor   *color;
+  guint16 alpha = 0x;
 #ifndef NDEBUG
   GParamSpec *pspec;
 #endif
@@ -53,7 +55,24 @@ panel_properties_store_value (XfconfChannel *channel,
   /* write the property to the xfconf channel */
   g_value_init (value, xfconf_property_type);
   g_object_get_property (G_OBJECT (object), object_property, value);
-  xfconf_channel_set_property (channel, xfconf_property, value);
+
+  if (G_LIKELY (xfconf_property_type != GDK_TYPE_COLOR))
+{
+  xfconf_channel_set_property (channel, xfconf_property, value);
+}
+  else
+{
+  /* work around xfconf's lack of storing colors (bug #7117) and
+   * do the same as xfconf_g_property_bind_gdkcolor() does */
+  color = g_value_get_boxed (value);
+  xfconf_channel_set_array (channel, xfconf_property,
+XFCONF_TYPE_UINT16, color-red,
+XFCONF_TYPE_UINT16, color-green,
+XFCONF_TYPE_UINT16, color-blue,
+XFCONF_TYPE_UINT16, alpha,
+G_TYPE_INVALID);
+}
+
   g_value_unset (value);
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Migrate monitor information (bug #7135).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 6485131ab512ab133c9a97411ba83e4ff16aa792 (commit)
   from 8b0c024c435b2cab825ceb2661e2589145e3b5ee (commit)

commit 6485131ab512ab133c9a97411ba83e4ff16aa792
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 20 11:09:06 2011 +0100

Migrate monitor information (bug #7135).

 migrate/migrate-46.c |   23 +++
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/migrate/migrate-46.c b/migrate/migrate-46.c
index 9f3dc27..2f9ebcc 100644
--- a/migrate/migrate-46.c
+++ b/migrate/migrate-46.c
@@ -180,7 +180,10 @@ migrate_46_panel_set_property (ConfigParser  *parser,
const gchar   *value,
GError   **error)
 {
-  gchar prop[128];
+  gchar   prop[128];
+  GdkDisplay *display;
+  gchar  *name;
+  gintnum;
 
   if (strcmp (property_name, size) == 0)
 {
@@ -200,17 +203,29 @@ migrate_46_panel_set_property (ConfigParser  *parser,
 }
   else if (strcmp (property_name, xoffset) == 0)
 {
-  /* TODO test this */
   parser-panel_xoffset = MAX (0, atoi (value));
 }
   else if (strcmp (property_name, yoffset) == 0)
 {
-  /* TODO test this */
   parser-panel_yoffset = MAX (0, atoi (value));
 }
   else if (strcmp (property_name, monitor) == 0)
 {
-  /* TODO */
+  /* in 4.4 and 4.6 we only use monitor and make no difference between 
monitors
+   * and screen's, so check the setup of the user to properly convert this 
*/
+  num = MAX (0, atoi (value));
+  if (G_LIKELY (num  0))
+{
+  display = gdk_display_get_default ();
+  if (display != NULL  gdk_display_get_n_screens (display)  1)
+name = g_strdup_printf (screen-%d, num);
+  else
+name = g_strdup_printf (monitor-%d, num);
+
+  g_snprintf (prop, sizeof (prop), /panels/panel-%u/output, 
parser-panel_id_counter);
+  xfconf_channel_set_string (parser-channel, prop, name);
+  g_free (name);
+}
 }
   else if (strcmp (property_name, handlestyle) == 0)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Improve systray debugging messages.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 09922fc9951c107d915297d3d3874d2293d9cbf4 (commit)
   from ccf4636bb379b8a0d49032fd032b3b29dd1e7528 (commit)

commit 09922fc9951c107d915297d3d3874d2293d9cbf4
Author: Nick Schermer n...@xfce.org
Date:   Sat Jan 22 18:01:32 2011 +0100

Improve systray debugging messages.

Add the pointer location to the icon name, so it is easier
to spot 2 different icons with the same name.

 plugins/systray/systray-box.c|4 ++--
 plugins/systray/systray-socket.c |6 +++---
 plugins/systray/systray.c|8 
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index bf0ebd7..7fb3c29 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -554,8 +554,8 @@ systray_box_size_allocate (GtkWidget *widget,
 y += row_size * ratio + SPACING;
 }
 
-  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, allocated %s at 
(%d,%d;%d,%d),
-  systray_socket_get_name (XFCE_SYSTRAY_SOCKET (child)),
+  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, allocated %s[%p] at 
(%d,%d;%d,%d),
+  systray_socket_get_name (XFCE_SYSTRAY_SOCKET (child)), child,
   child_alloc.x, child_alloc.y, child_alloc.width, child_alloc.height);
 
   gtk_widget_size_allocate (child, child_alloc);
diff --git a/plugins/systray/systray-socket.c b/plugins/systray/systray-socket.c
index 3e5e67b..cb875ea 100644
--- a/plugins/systray/systray-socket.c
+++ b/plugins/systray/systray-socket.c
@@ -156,8 +156,8 @@ systray_socket_realize (GtkWidget *widget)
   gtk_widget_set_double_buffered (widget, socket-parent_relative_bg);
 
   panel_debug_filtered (PANEL_DEBUG_SYSTRAY,
-  socket %s (composited=%s, relative-bg=%s,
-  systray_socket_get_name (socket),
+  socket %s[%p] (composited=%s, relative-bg=%s,
+  systray_socket_get_name (socket), socket,
   PANEL_DEBUG_BOOL (socket-is_composited),
   PANEL_DEBUG_BOOL (socket-parent_relative_bg));
 }
@@ -409,7 +409,7 @@ systray_socket_get_name_prop (SystraySocket *socket,
 
 
 const gchar *
-systray_socket_get_name  (SystraySocket *socket)
+systray_socket_get_name (SystraySocket *socket)
 {
   panel_return_val_if_fail (XFCE_IS_SYSTRAY_SOCKET (socket), NULL);
 
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index cc346e0..74aacec 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -811,8 +811,8 @@ systray_plugin_icon_added (SystrayManager *manager,
   gtk_container_add (GTK_CONTAINER (plugin-box), icon);
   gtk_widget_show (icon);
 
-  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, added %s icon,
-  systray_socket_get_name (XFCE_SYSTRAY_SOCKET (icon)));
+  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, added %s[%p] icon,
+  systray_socket_get_name (XFCE_SYSTRAY_SOCKET (icon)), icon);
 }
 
 
@@ -830,8 +830,8 @@ systray_plugin_icon_removed (SystrayManager *manager,
   /* remove the icon from the box */
   gtk_container_remove (GTK_CONTAINER (plugin-box), icon);
 
-  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, removed %s icon,
-  systray_socket_get_name (XFCE_SYSTRAY_SOCKET (icon)));
+  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, removed %s[%p] icon,
+  systray_socket_get_name (XFCE_SYSTRAY_SOCKET (icon)), icon);
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Reverse menu item insert order (bug #7102).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 39c02586f4ceefc99c83afdafd15aae0802c847f (commit)
   from cfad253bd5d09e0fc1e5493e3e621120c9250b9d (commit)

commit 39c02586f4ceefc99c83afdafd15aae0802c847f
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 12:46:23 2011 +0100

Reverse menu item insert order (bug #7102).

The insert order was reversed in 4.8, compared to 4.6.

 libxfce4panel/xfce-panel-plugin.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libxfce4panel/xfce-panel-plugin.c 
b/libxfce4panel/xfce-panel-plugin.c
index b06885a..a88fe52 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -1756,8 +1756,8 @@ xfce_panel_plugin_menu_insert_item (XfcePanelPlugin 
*plugin,
   g_return_if_fail (GTK_IS_MENU_ITEM (item));
 
   /* take the item and add to internal list */
-  plugin-priv-menu_items = g_slist_prepend (plugin-priv-menu_items,
-  g_object_ref_sink (item));
+  plugin-priv-menu_items = g_slist_append (plugin-priv-menu_items,
+ g_object_ref_sink (item));
   g_signal_connect (G_OBJECT (item), destroy,
   G_CALLBACK (xfce_panel_plugin_menu_item_destroy), plugin);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Cache launcher menu tooltip pixbuf (bug #7146).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to cfad253bd5d09e0fc1e5493e3e621120c9250b9d (commit)
   from 09922fc9951c107d915297d3d3874d2293d9cbf4 (commit)

commit cfad253bd5d09e0fc1e5493e3e621120c9250b9d
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 12:41:39 2011 +0100

Cache launcher menu tooltip pixbuf (bug #7146).

Because the query-tooltip query in Gtk is not implemented correctly
(although the gtk docs say otherwise), see 
https://bugzilla.gnome.org/show_bug.cgi?id=516130
we cache the pixbuf, so setting the tooltip will be faster.

 plugins/launcher/launcher.c |   22 +++---
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index fd228cb..c3a5dce 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -2209,18 +2209,26 @@ launcher_plugin_item_query_tooltip (GtkWidget  
*widget,
   gtk_tooltip_set_text (tooltip, name);
 }
 
-  /* we use the cached pixbuf for the button, because they are more
-   * likely to occur and we don't want to poke the hard drive multiple
-   * times for a simple pixbuf. for menu items this is not a big real,
-   * so here we use the pixbuf directly */
+  /* the button uses a custom cache because the button widget is never
+   * destroyed, for menu items we cache the pixbuf by attaching the
+   * data on the menu item widget */
   if (GTK_IS_MENU_ITEM (widget))
 {
-  pixbuf = launcher_plugin_tooltip_pixbuf (gtk_widget_get_screen (widget),
-   garcon_menu_item_get_icon_name 
(item));
+  pixbuf = g_object_get_data (G_OBJECT (widget), I_(pixbuf-cache));
   if (G_LIKELY (pixbuf != NULL))
 {
   gtk_tooltip_set_icon (tooltip, pixbuf);
-  g_object_unref (G_OBJECT (pixbuf));
+}
+  else
+{
+  pixbuf = launcher_plugin_tooltip_pixbuf (gtk_widget_get_screen 
(widget),
+   
garcon_menu_item_get_icon_name (item));
+  if (G_LIKELY (pixbuf != NULL))
+{
+  gtk_tooltip_set_icon (tooltip, pixbuf);
+  g_object_set_data_full (G_OBJECT (widget), I_(pixbuf-cache), 
pixbuf,
+  (GDestroyNotify) g_object_unref);
+}
 }
  }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Set and restore a unique role name for windows (bug #7094).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 4a3230b22f6cec2549b3ee2ee696b5d8a65ba155 (commit)
   from 39c02586f4ceefc99c83afdafd15aae0802c847f (commit)

commit 4a3230b22f6cec2549b3ee2ee696b5d8a65ba155
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 12:55:59 2011 +0100

Set and restore a unique role name for windows (bug #7094).

This way each panel window can be identified by window managers
and other tools.

 panel/panel-application.c |   15 ++-
 panel/panel-window.c  |3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/panel/panel-application.c b/panel/panel-application.c
index 9431f89..d3101c4 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -260,7 +260,6 @@ panel_application_xfconf_window_bindings (PanelApplication 
*application,
   const PanelProperty  properties[] =
   {
 { position-locked, G_TYPE_BOOLEAN },
-{ autohide, G_TYPE_BOOLEAN },
 { span-monitors, G_TYPE_BOOLEAN },
 { horizontal, G_TYPE_BOOLEAN },
 { size, G_TYPE_UINT },
@@ -275,6 +274,8 @@ panel_application_xfconf_window_bindings (PanelApplication 
*application,
 { output-name, G_TYPE_STRING },
 { position, G_TYPE_STRING },
 { disable-struts, G_TYPE_BOOLEAN },
+{ role, G_TYPE_STRING }, /* GtkWindow property (see bug #7094) */
+{ autohide, G_TYPE_BOOLEAN },
 { NULL }
   };
 
@@ -1264,6 +1265,8 @@ panel_application_new_window (PanelApplication 
*application,
   GtkWidget *itembar;
   gchar *property;
   gint   idx;
+  GTimeVal   tv;
+  gchar *wmrole;
 
   panel_return_val_if_fail (PANEL_IS_APPLICATION (application), NULL);
   panel_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), NULL);
@@ -1325,6 +1328,16 @@ panel_application_new_window (PanelApplication 
*application,
   if (new_window)
 g_object_notify (G_OBJECT (window), position);
 
+  /* create a somewhat unique role for the panel window (bug #7094) */
+  if (gtk_window_get_role (GTK_WINDOW (window)) == NULL)
+{
+  g_get_current_time (tv);
+  idx = g_slist_index (application-windows, window);
+  wmrole = g_strdup_printf (PACKAGE_NAME -%ld%d, tv.tv_sec, idx);
+  gtk_window_set_role (GTK_WINDOW (window), wmrole);
+  g_free (wmrole);
+}
+
   return PANEL_WINDOW (window);
 }
 
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 12c53d8..352c7e5 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2109,7 +2109,8 @@ panel_window_set_autohide (PanelWindow *window,
   guinti;
   const gchar *properties[] = { enter-opacity, leave-opacity,
 background-alpha, borders,
-background-style, background-color };
+background-style, background-color,
+role };
 
   panel_return_if_fail (PANEL_IS_WINDOW (window));
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Don't return a critical on a NULL dbus session.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 49bc149b475fc5ba6e6e7224437d7b9f0b712337 (commit)
   from 4a3230b22f6cec2549b3ee2ee696b5d8a65ba155 (commit)

commit 49bc149b475fc5ba6e6e7224437d7b9f0b712337
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 13:07:32 2011 +0100

Don't return a critical on a NULL dbus session.

This way the users gets a normal warning, instead of an abort
when debugging is enabled.

 panel/panel-dbus-client.c |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/panel/panel-dbus-client.c b/panel/panel-dbus-client.c
index 3d34935..47add8b 100644
--- a/panel/panel-dbus-client.c
+++ b/panel/panel-dbus-client.c
@@ -57,7 +57,6 @@ panel_dbus_client_get_proxy (GError **error)
 
   /* return null if no connection is found */
   dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, error);
-  panel_return_val_if_fail (dbus_connection != NULL, NULL);
   if (G_UNLIKELY (dbus_connection == NULL))
 return NULL;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Remove too new Gtk+ functions.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 83eed7240c8cb8b4afbc813141b5337fbd3390c5 (commit)
   from 25f101ce32aaf8eefb06b79bf841ee74375f7d7d (commit)

commit 83eed7240c8cb8b4afbc813141b5337fbd3390c5
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 16:20:58 2011 +0100

Remove too new Gtk+ functions.

 plugins/systray/systray-socket.c |8 +---
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/plugins/systray/systray-socket.c b/plugins/systray/systray-socket.c
index cb875ea..52975c9 100644
--- a/plugins/systray/systray-socket.c
+++ b/plugins/systray/systray-socket.c
@@ -248,7 +248,6 @@ systray_socket_new (GdkScreen   *screen,
   GdkVisual *visual;
   GdkColormap   *colormap;
   gboolean   release_colormap = FALSE;
-  gint   red_prec, green_prec, blue_prec, depth;
 
   panel_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
 
@@ -293,12 +292,7 @@ systray_socket_new (GdkScreen   *screen,
 g_object_unref (G_OBJECT (colormap));
 
   /* check if there is an alpha channel in the visual */
-  gdk_visual_get_red_pixel_details (visual, NULL, NULL, red_prec);
-  gdk_visual_get_green_pixel_details (visual, NULL, NULL, green_prec);
-  gdk_visual_get_blue_pixel_details (visual, NULL, NULL, blue_prec);
-  depth = gdk_visual_get_depth (visual);
-
-  if (red_prec + blue_prec + green_prec  depth
+  if (visual-red_prec + visual-blue_prec + visual-green_prec  visual-depth
gdk_display_supports_composite (gdk_screen_get_display (screen)))
 socket-is_composited = TRUE;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Move the panel menu to the correct screen.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to f411e79df2f9255924cd85ff47ad21c1a354cb46 (commit)
   from 87f60627fdc292007041ee3833ae3c324ab2b1f4 (commit)

commit f411e79df2f9255924cd85ff47ad21c1a354cb46
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 17:29:29 2011 +0100

Move the panel menu to the correct screen.

 panel/panel-window.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/panel/panel-window.c b/panel/panel-window.c
index 2f20130..62e986a 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2216,6 +2216,8 @@ panel_window_menu_popup (PanelWindow *window,
 
   /* create menu */
   menu = gtk_menu_new ();
+  gtk_menu_set_screen (GTK_MENU (menu),
+  gtk_window_get_screen (GTK_WINDOW (window)));
   g_object_ref_sink (G_OBJECT (menu));
   g_signal_connect (G_OBJECT (menu), deactivate,
   G_CALLBACK (panel_window_menu_deactivate), window);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Move some systray code around without functionality changes.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to ccf4636bb379b8a0d49032fd032b3b29dd1e7528 (commit)
   from 2a004cc07a36f9a738b04ff3ca03730f8900e13e (commit)

commit ccf4636bb379b8a0d49032fd032b3b29dd1e7528
Author: Nick Schermer n...@xfce.org
Date:   Sat Jan 22 13:13:59 2011 +0100

Move some systray code around without functionality changes.

- Remove from socket hashtable before telling others the
  icon will be removed, this to make sure the window
  still exists.
- Move composited detection to socket init, no need to do this
  during realize, since we restart the tray on compositing
  changes anyway.

 plugins/systray/systray-manager.c |   12 +++---
 plugins/systray/systray-socket.c  |   41 
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/plugins/systray/systray-manager.c 
b/plugins/systray/systray-manager.c
index 6a18f9e..d485bfa 100644
--- a/plugins/systray/systray-manager.c
+++ b/plugins/systray/systray-manager.c
@@ -214,8 +214,6 @@ systray_manager_init (SystrayManager *manager)
   manager-invisible = NULL;
   manager-orientation = GTK_ORIENTATION_HORIZONTAL;
   manager-messages = NULL;
-
-  /* create new sockets table */
   manager-sockets = g_hash_table_new (NULL, NULL);
 }
 
@@ -738,15 +736,13 @@ systray_manager_handle_undock_request (GtkSocket *socket,
 
   panel_return_val_if_fail (XFCE_IS_SYSTRAY_MANAGER (manager), FALSE);
 
-  /* emit signal that the socket will be removed */
-  g_signal_emit (manager, systray_manager_signals[ICON_REMOVED], 0, socket);
-
-  /* get the xwindow */
-  window = systray_socket_get_window (XFCE_SYSTRAY_SOCKET (socket));
-
   /* remove the socket from the list */
+  window = systray_socket_get_window (XFCE_SYSTRAY_SOCKET (socket));
   g_hash_table_remove (manager-sockets, GUINT_TO_POINTER (*window));
 
+  /* emit signal that the socket will be removed */
+  g_signal_emit (manager, systray_manager_signals[ICON_REMOVED], 0, socket);
+
   /* destroy the socket */
   return FALSE;
 }
diff --git a/plugins/systray/systray-socket.c b/plugins/systray/systray-socket.c
index 70496b3..3e5e67b 100644
--- a/plugins/systray/systray-socket.c
+++ b/plugins/systray/systray-socket.c
@@ -122,35 +122,34 @@ static void
 systray_socket_realize (GtkWidget *widget)
 {
   SystraySocket *socket = XFCE_SYSTRAY_SOCKET (widget);
-  GdkVisual *visual;
   GdkColor   transparent = { 0, 0, 0, 0 };
+  GdkWindow *window;
 
   GTK_WIDGET_CLASS (systray_socket_parent_class)-realize (widget);
 
-  visual = gtk_widget_get_visual (widget);
-  if (visual-red_prec + visual-blue_prec + visual-green_prec  visual-depth
-   gdk_display_supports_composite (gtk_widget_get_display (widget)))
+  window = gtk_widget_get_window (widget);
+
+  if (socket-is_composited)
 {
-  gdk_window_set_background (widget-window, transparent);
-  gdk_window_set_composited (widget-window, TRUE);
+  gdk_window_set_background (window, transparent);
+  gdk_window_set_composited (window, TRUE);
 
-  socket-is_composited = TRUE;
   socket-parent_relative_bg = FALSE;
 }
-  else if (visual == gdk_drawable_get_visual (
-   GDK_DRAWABLE (gdk_window_get_parent (widget-window
+  else if (gtk_widget_get_visual (widget) ==
+   gdk_drawable_get_visual (GDK_DRAWABLE (gdk_window_get_parent 
(window
 {
-  gdk_window_set_back_pixmap (widget-window, NULL, TRUE);
+  gdk_window_set_back_pixmap (window, NULL, TRUE);
 
-  socket-is_composited = FALSE;
   socket-parent_relative_bg = TRUE;
 }
   else
 {
-  socket-is_composited = FALSE;
   socket-parent_relative_bg = FALSE;
 }
 
+  gdk_window_set_composited (window, socket-is_composited);
+
   gtk_widget_set_app_paintable (widget,
   socket-parent_relative_bg || socket-is_composited);
 
@@ -197,6 +196,7 @@ systray_socket_size_allocate (GtkWidget *widget,
 }
 
 
+
 static gboolean
 systray_socket_expose_event (GtkWidget  *widget,
  GdkEventExpose *event)
@@ -248,6 +248,7 @@ systray_socket_new (GdkScreen   *screen,
   GdkVisual *visual;
   GdkColormap   *colormap;
   gboolean   release_colormap = FALSE;
+  gint   red_prec, green_prec, blue_prec, depth;
 
   panel_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
 
@@ -257,12 +258,13 @@ systray_socket_new (GdkScreen   *screen,
   result = XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (display),
  window, attr);
 
-  /* leave on an error or is the window does not exist */
+  /* leave on an error or if the window does not exist */
   if (gdk_error_trap_pop () != 0 || result == 0)
 return NULL;
 
   /* get the windows visual */
   visual = gdk_x11_screen_lookup_visual (screen, attr.visual-visualid);
+  panel_return_val_if_fail (visual == NULL || GDK_IS_VISUAL (visual), NULL);
   if (G_UNLIKELY (visual == NULL))
 return NULL;
 
@@ -282,13 

[Xfce4-commits] xfce4-panel:xfce-4.8 Popup window menu under cursor when on a popup menu.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 25f101ce32aaf8eefb06b79bf841ee74375f7d7d (commit)
   from db9f6f5416ada71b070e73347d839aecba925ef0 (commit)

commit 25f101ce32aaf8eefb06b79bf841ee74375f7d7d
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 14:53:02 2011 +0100

Popup window menu under cursor when on a popup menu.

 plugins/tasklist/tasklist-widget.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/tasklist/tasklist-widget.c 
b/plugins/tasklist/tasklist-widget.c
index beebd65..143209e 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -2558,7 +2558,7 @@ xfce_tasklist_button_button_press_event (GtkWidget
 *button,
 
   gtk_menu_attach_to_widget (GTK_MENU (menu), button, NULL);
   gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
-  xfce_panel_plugin_position_menu,
+  child-type == CHILD_TYPE_WINDOW ? 
xfce_panel_plugin_position_menu : NULL,
   xfce_tasklist_get_panel_plugin (child-tasklist),
   event-button,
   event-time);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 l10n: Updated Japanese (ja) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to 2a004cc07a36f9a738b04ff3ca03730f8900e13e (commit)
   from 6485131ab512ab133c9a97411ba83e4ff16aa792 (commit)

commit 2a004cc07a36f9a738b04ff3ca03730f8900e13e
Author: Masato Hashimoto hash...@xfce.org
Date:   Sat Jan 22 15:13:49 2011 +0100

l10n: Updated Japanese (ja) translation to 100%

New status: 344 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ja.po |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index d66357f..781ca25 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-panel 4.7.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:01+0100\n
-PO-Revision-Date: 2010-12-29 18:56+0900\n
+POT-Creation-Date: 2011-01-22 23:11+0900\n
+PO-Revision-Date: 2011-01-22 23:11+0900\n
 Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n
 Language-Team: Japanese xfce-users...@ml.fdiary.net\n
 Language: ja\n
@@ -1207,7 +1207,7 @@ msgstr フォルダを開く
 
 #: ../plugins/directorymenu/directorymenu.c:780
 msgid Open in Terminal
-msgstr ターミナルを開く
+msgstr ターミナルで開く
 
 #: ../plugins/directorymenu/directorymenu.desktop.in.h:1
 #: ../plugins/directorymenu/directorymenu-dialog.glade.h:2
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Sync hidden window and panel screen.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 15e3162d25c26555e23c533848c8c19c50de1bb5 (commit)
   from 4c61574cca5b01984e25c24ab21c8dab9cce7276 (commit)

commit 15e3162d25c26555e23c533848c8c19c50de1bb5
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 18:25:27 2011 +0100

Sync hidden window and panel screen.

 panel/panel-window.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/panel/panel-window.c b/panel/panel-window.c
index b826fda..f8cd275 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2128,7 +2128,7 @@ panel_window_set_autohide (PanelWindow *window,
   const gchar *properties[] = { enter-opacity, leave-opacity,
 background-alpha, borders,
 background-style, background-color,
-role };
+role, screen };
 
   panel_return_if_fail (PANEL_IS_WINDOW (window));
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Show launcher add dialog on the same screen as parent.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 5f703756fce60eb42396d6e6870abb82172d7e2f (commit)
   from 15e3162d25c26555e23c533848c8c19c50de1bb5 (commit)

commit 5f703756fce60eb42396d6e6870abb82172d7e2f
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 18:27:57 2011 +0100

Show launcher add dialog on the same screen as parent.

 plugins/launcher/launcher-dialog.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/plugins/launcher/launcher-dialog.c 
b/plugins/launcher/launcher-dialog.c
index 80bbc41..7f06aa1 100644
--- a/plugins/launcher/launcher-dialog.c
+++ b/plugins/launcher/launcher-dialog.c
@@ -1125,6 +1125,8 @@ launcher_dialog_show (LauncherPlugin *plugin)
 
   /* setup responses for the add dialog */
   object = gtk_builder_get_object (builder, dialog-add);
+  gtk_window_set_screen (GTK_WINDOW (object),
+  gtk_window_get_screen (GTK_WINDOW (window)));
   g_signal_connect (G_OBJECT (object), response,
   G_CALLBACK (launcher_dialog_add_response), dialog);
   g_signal_connect (G_OBJECT (object), delete-event,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Fix autohide direction based on orientation and edge.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 15a5fa2fb459aa175e4b6f98e341bdff0395eccd (commit)
   from 5f703756fce60eb42396d6e6870abb82172d7e2f (commit)

commit 15a5fa2fb459aa175e4b6f98e341bdff0395eccd
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 20:21:52 2011 +0100

Fix autohide direction based on orientation and edge.

When the panel is horizontal and snapped to the left or right
border (not in a corner) is should hide sideways. Same when
a vertical panel is snapped to the top or bottom of the screen.

 panel/panel-window.c |   31 +++
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/panel/panel-window.c b/panel/panel-window.c
index f8cd275..822c303 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -1159,10 +1159,33 @@ panel_window_size_allocate (GtkWidget *widget,
 
   /* set hidden window size */
   w = h = 3;
-  if (window-horizontal)
-w = alloc-width;
-  else
-h = alloc-height;
+
+  switch (window-snap_position)
+{
+/* left or right of the screen */
+case SNAP_POSITION_E:
+case SNAP_POSITION_EC:
+case SNAP_POSITION_W:
+case SNAP_POSITION_WC:
+  h = alloc-height;
+  break;
+
+/* top or bottom of the screen */
+case SNAP_POSITION_NC:
+case SNAP_POSITION_SC:
+case SNAP_POSITION_N:
+case SNAP_POSITION_S:
+  w = alloc-width;
+  break;
+
+/* corner or floating panel */
+default:
+  if (window-horizontal)
+w = alloc-width;
+  else
+h = alloc-height;
+  break;
+}
 
   /* position the autohide window */
   panel_window_size_allocate_set_xy (window, w, h, x, y);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Deactivate menu button if loading menu failed.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to f3063104180157e7dd029faeccb513ba34c737a4 (commit)
   from 15a5fa2fb459aa175e4b6f98e341bdff0395eccd (commit)

commit f3063104180157e7dd029faeccb513ba34c737a4
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 20:37:24 2011 +0100

Deactivate menu button if loading menu failed.

 plugins/applicationsmenu/applicationsmenu.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/plugins/applicationsmenu/applicationsmenu.c 
b/plugins/applicationsmenu/applicationsmenu.c
index 8098767..a0fc8af 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -1033,6 +1033,8 @@ applications_menu_plugin_menu (GtkWidget  
*button,
   xfce_dialog_show_error (NULL, error, _(Failed to load the 
applications menu));
   g_error_free (error);
 
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
+
   if (G_LIKELY (menu != NULL))
 g_object_unref (G_OBJECT (menu));
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Don't double expose the panel's child widget (bug #6872).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 23fa1aee1651f36c435c4867f09a718948d5c8fe (commit)
   from f3063104180157e7dd029faeccb513ba34c737a4 (commit)

commit 23fa1aee1651f36c435c4867f09a718948d5c8fe
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 22:26:29 2011 +0100

Don't double expose the panel's child widget (bug #6872).

We chain the expose event to GtkWindow wich on his turn exposes
the container child in GtkContainer. Because we draw (alpha background
and background color) on the window, the child needs to be exposed after
this, so drop the first expose event and only expose the child
in PanelWindow.

 panel/panel-base-window.c |9 +++--
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 1da04a2..6c7434f 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -446,19 +446,16 @@ panel_base_window_expose_event (GtkWidget  *widget,
   gdouble height = widget-allocation.height;
   const gdouble   dashes[] = { 4.00, 4.00 };
   GTimeValtimeval;
-  gbooleanresult;
   GdkPixbuf  *pixbuf;
   GError *error = NULL;
   cairo_matrix_t  matrix = { 1, 0, 0, 1, 0, 0 }; /* identity matrix */
 
-  result = (*GTK_WIDGET_CLASS (panel_base_window_parent_class)-expose_event) 
(widget, event);
-
   if (!GTK_WIDGET_DRAWABLE (widget))
-return result;
+return FALSE;
 
   /* create cairo context and set some default properties */
   cr = gdk_cairo_create (widget-window);
-  panel_return_val_if_fail (cr != NULL, result);
+  panel_return_val_if_fail (cr != NULL, FALSE);
   cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
   cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_line_width (cr, 1.00);
@@ -599,7 +596,7 @@ panel_base_window_expose_event (GtkWidget  *widget,
 
   cairo_destroy (cr);
 
-  return result;
+  return FALSE;
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Improve window debug messages.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to e3a4cde2b689f7d0bc7abef0024562a78ac9cbaf (commit)
   from 23fa1aee1651f36c435c4867f09a718948d5c8fe (commit)

commit e3a4cde2b689f7d0bc7abef0024562a78ac9cbaf
Author: Nick Schermer n...@xfce.org
Date:   Mon Jan 24 20:14:55 2011 +0100

Improve window debug messages.

 panel/panel-base-window.c |2 +-
 panel/panel-window.c  |   39 ++-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 6c7434f..8bdb298 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -672,7 +672,7 @@ panel_base_window_composited_changed (GtkWidget *widget)
   colormap_changed = gtk_widget_get_colormap (widget) != colormap;
 
   panel_debug (PANEL_DEBUG_BASE_WINDOW,
-   set new colormap; composited=%s, rgba=%s, visible=%s,
+   %p: composited=%s, rgba=%s, visible=%s, window,
PANEL_DEBUG_BOOL (gtk_widget_is_composited (widget)),
PANEL_DEBUG_BOOL (colormap_rgba),
PANEL_DEBUG_BOOL (GTK_WIDGET_VISIBLE (widget)));
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 822c303..046e2ec 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -1561,13 +1561,13 @@ panel_window_screen_struts_set (PanelWindow *window)
   else if (struts[STRUT_BOTTOM] != 0)
 n = STRUT_BOTTOM;
   else
-panel_debug (PANEL_DEBUG_STRUTS, unset);
+panel_debug (PANEL_DEBUG_STRUTS, %p: unset, window);
 
   if (n != -1)
 {
   panel_debug (PANEL_DEBUG_STRUTS,
-   %s=%ld, start_%s=%ld, end_%s=%ld,
-   strut_border[n], struts[n],
+   %p: %s=%ld, start_%s=%ld, end_%s=%ld,
+   window, strut_border[n], struts[n],
strut_xy[n], struts[4 + n * 2],
strut_xy[n], struts[5 + n * 2]);
 }
@@ -1744,7 +1744,7 @@ panel_window_display_layout_debug (GtkWidget *widget)
   for (n = 0; n  n_screens; n++)
 {
   screen = gdk_display_get_screen (display, n);
-  g_string_append_printf (str, screen-%d=[%d,%d] (, n,
+  g_string_append_printf (str, screen-%d[%p]=[%d,%d] (, n, screen,
   gdk_screen_get_width (screen), gdk_screen_get_height (screen));
 
   n_monitors = gdk_screen_get_n_monitors (screen);
@@ -1770,7 +1770,7 @@ panel_window_display_layout_debug (GtkWidget *widget)
 }
 
   panel_debug (PANEL_DEBUG_DISPLAY_LAYOUT,
-   display %s: %s,
+   %p: display=%s, %s, widget,
gdk_display_get_name (display), str-str);
 
   g_string_free (str, TRUE);
@@ -1791,6 +1791,7 @@ panel_window_screen_layout_changed (GdkScreen   *screen,
   gboolean  force_struts_update = FALSE;
   gint  screen_num;
   GdkDisplay   *display;
+  GdkScreen*new_screen;
 
   panel_return_if_fail (PANEL_IS_WINDOW (window));
   panel_return_if_fail (GDK_IS_SCREEN (screen));
@@ -1816,7 +1817,8 @@ panel_window_screen_layout_changed (GdkScreen   *screen,
   panel_return_if_fail (n_monitors  0);
 
   panel_debug (PANEL_DEBUG_POSITIONING,
-   monitors=%d, output-name=%s, span-monitors=%s, base=%d,%d,
+   %p: screen=%p, monitors=%d, output-name=%s, span-monitors=%s, 
base=%d,%d,
+   window, screen,
n_monitors, window-output_name,
PANEL_DEBUG_BOOL (window-span_monitors),
window-base_x, window-base_y);
@@ -1844,7 +1846,8 @@ panel_window_screen_layout_changed (GdkScreen   *screen,
   if (gdk_display_get_n_screens (display) - 1  screen_num)
 {
   panel_debug (PANEL_DEBUG_POSITIONING,
-   screen-%d not found, hiding panel, screen_num);
+   %p: screen-%d not found, hiding panel,
+   window, screen_num);
 
   /* out of range, hide the window */
   if (GTK_WIDGET_VISIBLE (window))
@@ -1853,14 +1856,14 @@ panel_window_screen_layout_changed (GdkScreen   *screen,
 }
   else
 {
+  new_screen = gdk_display_get_screen (display, screen_num);
   panel_debug (PANEL_DEBUG_POSITIONING,
-   moving panel from screen %d to %d,
-   gdk_screen_get_number (screen),
-   screen_num);
+   %p: moving window to screen %d[%p] to %d[%p],
+   window, gdk_screen_get_number (screen), screen,
+   screen_num, new_screen);
 
   /* move window to the correct screen */
-  screen = gdk_display_get_screen (display, screen_num);
-  gtk_window_set_screen (GTK_WINDOW (window), screen);
+  gtk_window_set_screen (GTK_WINDOW (window), new_screen);
 
   /* we will invoke this function 

[Xfce4-commits] xfce4-panel:xfce-4.8 Fix dragging a window to another screen.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to c3eac787dc0b962ebde6bf92e304a5e53418082f (commit)
   from 5d81fb2945bc05e02e413f7f4cbdd39c11cf7133 (commit)

commit c3eac787dc0b962ebde6bf92e304a5e53418082f
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 23 18:03:58 2011 +0100

Fix dragging a window to another screen.

Only downside it that we have to abort the drag, because the
button is event is gone too.

 panel/panel-window.c |   30 --
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/panel/panel-window.c b/panel/panel-window.c
index 62e986a..b826fda 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -859,6 +859,8 @@ panel_window_motion_notify_event (GtkWidget  *widget,
   gint  pointer_x, pointer_y;
   gint  window_x, window_y;
   gint  high;
+  GdkScreen*screen = NULL;
+  gboolean  retval = TRUE;
 
   /* leave when the pointer is not grabbed */
   if (G_UNLIKELY (window-grab_time == 0))
@@ -868,12 +870,27 @@ panel_window_motion_notify_event (GtkWidget  *widget,
   pointer_x = event-x_root;
   pointer_y = event-y_root;
 
+  /* the 0x0 coordinate is a sign the cursor is on another screen then
+   * the panel that is currently dragged */
+  if (event-x == 0  event-y == 0)
+{
+  gdk_display_get_pointer (gtk_widget_get_display (widget),
+   screen, NULL, NULL, NULL);
+  if (screen != gtk_window_get_screen (GTK_WINDOW (window)))
+{
+  gtk_window_set_screen (GTK_WINDOW (window), screen);
+
+  /* stop the drag, we somehow loose the motion event */
+  window-grab_time = 0;
+  retval = FALSE;
+}
+}
   /* check if the pointer moved to another monitor */
-  if (!window-span_monitors
-   (pointer_x  window-area.x
-  || pointer_y  window-area.y
-  || pointer_x  window-area.x + window-area.width
-  || pointer_y  window-area.y + window-area.height))
+  else if (!window-span_monitors
+(pointer_x  window-area.x
+   || pointer_y  window-area.y
+   || pointer_x  window-area.x + window-area.width
+   || pointer_y  window-area.y + window-area.height))
 {
   /* set base point to cursor position and update working area */
   window-base_x = pointer_x;
@@ -908,7 +925,7 @@ panel_window_motion_notify_event (GtkWidget  *widget,
   /* update the working area */
   panel_window_screen_layout_changed (window-screen, window);
 
-  return TRUE;
+  return retval;
 }
 
 
@@ -1330,6 +1347,7 @@ panel_window_screen_changed (GtkWidget *widget,
  {
g_free (window-output_name);
window-output_name = g_strdup_printf (screen-%d, 
gdk_screen_get_number (screen));
+   g_object_notify (G_OBJECT (window), output-name);
  }
 
   /* update the screen layout */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:xfce-4.8 Properly update the plugin background when moving to other panel.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to 32bc2ef58f0f78d6da4fc498825008f4eba6d9f2 (commit)
   from 16ca0888abb9e92ed8a38d1e53128da01c712c4f (commit)

commit 32bc2ef58f0f78d6da4fc498825008f4eba6d9f2
Author: Nick Schermer n...@xfce.org
Date:   Sat Jan 29 20:40:43 2011 +0100

Properly update the plugin background when moving to other panel.

The background alpha was not send when the other panel was opaque,
leaving a transparent item in opaque panel.
The background was also not unset, so for example the image or
color was not unset.

 panel/panel-application.c |4 ++--
 panel/panel-plugin-external.c |2 +-
 panel/panel-window.c  |   40 +++-
 panel/panel-window.h  |3 ++-
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/panel/panel-application.c b/panel/panel-application.c
index 092417b..a107f5a 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -669,7 +669,7 @@ panel_application_plugin_insert (PanelApplication  
*application,
 GTK_WIDGET (provider), position);
 
   /* send all the needed info about the panel to the plugin */
-  panel_window_set_povider_info (window, provider);
+  panel_window_set_povider_info (window, provider, FALSE);
 
   /* show the plugin */
   gtk_widget_show (provider);
@@ -907,7 +907,7 @@ panel_application_drag_data_received (PanelWindow  
*window,
   panel_itembar_reorder_child (PANEL_ITEMBAR (itembar), provider, 
application-drop_index);
 
   /* send all the needed panel information to the plugin */
-  panel_window_set_povider_info (window, provider);
+  panel_window_set_povider_info (window, provider, TRUE);
 }
 
   /* everything went fine */
diff --git a/panel/panel-plugin-external.c b/panel/panel-plugin-external.c
index f4d434a..484b531 100644
--- a/panel/panel-plugin-external.c
+++ b/panel/panel-plugin-external.c
@@ -632,7 +632,7 @@ panel_plugin_external_child_respawn (gpointer user_data)
 
   window = gtk_widget_get_toplevel (GTK_WIDGET (external));
   panel_return_val_if_fail (PANEL_IS_WINDOW (window), FALSE);
-  panel_window_set_povider_info (PANEL_WINDOW (window), GTK_WIDGET (external));
+  panel_window_set_povider_info (PANEL_WINDOW (window), GTK_WIDGET (external), 
FALSE);
 
   panel_plugin_external_child_spawn (external);
 
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 1d5424d..dbdef1e 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2475,7 +2475,8 @@ panel_window_new (GdkScreen *screen)
 
 void
 panel_window_set_povider_info (PanelWindow *window,
-   GtkWidget   *provider)
+   GtkWidget   *provider,
+   gboolean moving_to_other_panel)
 {
   PanelBaseWindow *base_window = PANEL_BASE_WINDOW (window);
 
@@ -2485,24 +2486,29 @@ panel_window_set_povider_info (PanelWindow *window,
   xfce_panel_plugin_provider_set_locked (XFCE_PANEL_PLUGIN_PROVIDER (provider),
  panel_window_get_locked (window));
 
-  if (base_window-background_alpha  1.0)
+  if (PANEL_IS_PLUGIN_EXTERNAL (provider))
 {
-  if (PANEL_IS_PLUGIN_EXTERNAL (provider))
-panel_plugin_external_set_background_alpha (PANEL_PLUGIN_EXTERNAL 
(provider),
-base_window-background_alpha);
-}
+  if (moving_to_other_panel || base_window-background_alpha  1.0)
+{
+  panel_plugin_external_set_background_alpha (PANEL_PLUGIN_EXTERNAL 
(provider),
+  base_window-background_alpha);
+}
 
-  if (base_window-background_style == PANEL_BG_STYLE_COLOR)
-{
-  if (PANEL_IS_PLUGIN_EXTERNAL (provider))
-panel_plugin_external_set_background_color (PANEL_PLUGIN_EXTERNAL 
(provider),
-base_window-background_color);
-}
-  else if (base_window-background_style == PANEL_BG_STYLE_IMAGE)
-{
-  if (PANEL_IS_PLUGIN_EXTERNAL (provider))
-panel_plugin_external_set_background_image (PANEL_PLUGIN_EXTERNAL 
(provider),
-base_window-background_image);
+  if (base_window-background_style == PANEL_BG_STYLE_COLOR)
+{
+  panel_plugin_external_set_background_color (PANEL_PLUGIN_EXTERNAL 
(provider),
+  base_window-background_color);
+}
+  else if (base_window-background_style == PANEL_BG_STYLE_IMAGE)
+{
+  panel_plugin_external_set_background_image (PANEL_PLUGIN_EXTERNAL 
(provider),
+  base_window-background_image);
+}
+  else if (moving_to_other_panel)
+{
+  /* unset the background (PROVIDER_PROP_TYPE_ACTION_BACKGROUND_UNSET) 
*/
+  panel_plugin_external_set_background_color (PANEL_PLUGIN_EXTERNAL 
(provider), NULL);
+}
 }
 
   panel_window_set_plugin_orientation (provider, window);
diff --git a/panel/panel-window.h 

[Xfce4-commits] xfce4-panel:xfce-4.8 Unset visible event window in 4.6 plugins.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
 to ffb8c175e9795d0d25d0ce38d8f513285c26e46f (commit)
   from 32bc2ef58f0f78d6da4fc498825008f4eba6d9f2 (commit)

commit ffb8c175e9795d0d25d0ce38d8f513285c26e46f
Author: Nick Schermer n...@xfce.org
Date:   Sat Jan 29 21:12:19 2011 +0100

Unset visible event window in 4.6 plugins.

A lot 4.6 plugins have an event window as plugin child,
but most of them do not disable the visible event window,
resulting in an ugly looking plugin with composited panels.

So detect if the plugin has an event window as child and
hide the visible window.

For this change, plugins need to recompile.

 libxfce4panel/xfce-panel-macros-46.h |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/libxfce4panel/xfce-panel-macros-46.h 
b/libxfce4panel/xfce-panel-macros-46.h
index b18a04e..ec2d484 100644
--- a/libxfce4panel/xfce-panel-macros-46.h
+++ b/libxfce4panel/xfce-panel-macros-46.h
@@ -420,6 +420,8 @@ G_BEGIN_DECLS
   _xpp_realize (XfcePanelPlugin *xpp, \
 GtkPlug *plug) \
   { \
+GtkWidget *ebox; \
+\
 g_return_if_fail (XFCE_IS_PANEL_PLUGIN (xpp)); \
 g_return_if_fail (GTK_IS_PLUG (plug)); \
 g_return_if_fail (GTK_WIDGET_REALIZED (plug)); \
@@ -435,6 +437,10 @@ G_BEGIN_DECLS
 G_CALLBACK (_xpp_provider_signal), plug); \
 \
 ((XfcePanelPluginFunc) construct_func) (xpp); \
+\
+ebox = gtk_bin_get_child (GTK_BIN (xpp)); \
+if (ebox != NULL  GTK_IS_EVENT_BOX (ebox)) \
+  gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE); \
   } \
   \
   static gboolean \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfdesktop:master l10n: Updated Hungarian (hu) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to dd452de6056ebda76c07de1cfd574fba793e951d (commit)
   from ceafdac977172dee8543066cb832e6792d89bdf8 (commit)

commit dd452de6056ebda76c07de1cfd574fba793e951d
Author: Gabor Kelemen kelem...@gnome.hu
Date:   Sat Jan 29 22:04:06 2011 +0100

l10n: Updated Hungarian (hu) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/hu.po |  256 --
 1 files changed, 115 insertions(+), 141 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index a14300d..d4e570a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 # Hungarian translation of xfdesktop
 # Copyright (C) 2009, 2010. Free Software Foundation, Inc.
 # This file is distributed under the same license as the xfdesktop package.
-#
+# 
 # Somogyi Peter jerry@gnu, 2003.
 # Egmont Koblinger egm...@uhulinux.hu, 2003.
 # SZERVÁC Attila sas@321, 2004-2009.
@@ -10,15 +10,15 @@ msgid 
 msgstr 
 Project-Id-Version: xfdesktop\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 17:29+\n
 PO-Revision-Date: 2010-11-28 01:13+0100\n
 Last-Translator: Gabor Kelemen kelemeng at gnome dot hu\n
 Language-Team: Hungarian gnome at fsf dot hu\n
-Language: \n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Plural-Forms:  nplurals=2; plural=(n != 1);\n
+Language: \n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
 X-Generator: KBabel 1.11.4\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
@@ -27,7 +27,7 @@ msgid Backdrop list file is not valid
 msgstr A háttérképek listája érvénytelen
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -36,127 +36,126 @@ msgstr 
 %s\n
 iMéret: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Saját mappa
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Fájlrendszer
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Kuka
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Cserélhető eszközök
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Nem hozható létre a háttérlista („%s”)
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Háttérlistahiba
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Háttérlista létrehozása/betöltése
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
 msgstr A fájl („%s”) nem érvényes háttérlistafájl. Felül kívánja írni?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Érvénytelen listafájl
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr A fájl felülírásával a tartalma elvész.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Csere
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr A háttérlista kiírása meghiúsult ide: („%s”)
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Képfájlok hozzáadása
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Képfájlok
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Minden fájl
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr %d. képernyő, %d. monitor (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr %d. képernyő, %d. monitor
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr %d. képernyő
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr %d. monitor (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr %d. monitor
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Beállításkezelő foglalat
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr FOGLALATAZONOSÍTÓ
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid Version 

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated Hungarian (hu) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to 8163b837ff0e94b97eb34f982c2b77f27d2e3e07 (commit)
   from af91644b35fd5c37299224064fc5ec1ece5adde3 (commit)

commit 8163b837ff0e94b97eb34f982c2b77f27d2e3e07
Author: Gabor Kelemen kelem...@gnome.hu
Date:   Sat Jan 29 22:05:44 2011 +0100

l10n: Updated Hungarian (hu) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/hu.po |  250 --
 1 files changed, 112 insertions(+), 138 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index a14300d..6c7b599 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 # Hungarian translation of xfdesktop
 # Copyright (C) 2009, 2010. Free Software Foundation, Inc.
 # This file is distributed under the same license as the xfdesktop package.
-#
+# 
 # Somogyi Peter jerry@gnu, 2003.
 # Egmont Koblinger egm...@uhulinux.hu, 2003.
 # SZERVÁC Attila sas@321, 2004-2009.
@@ -10,15 +10,15 @@ msgid 
 msgstr 
 Project-Id-Version: xfdesktop\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 17:35+\n
 PO-Revision-Date: 2010-11-28 01:13+0100\n
 Last-Translator: Gabor Kelemen kelemeng at gnome dot hu\n
 Language-Team: Hungarian gnome at fsf dot hu\n
-Language: \n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Plural-Forms:  nplurals=2; plural=(n != 1);\n
+Language: \n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
 X-Generator: KBabel 1.11.4\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
@@ -27,7 +27,7 @@ msgid Backdrop list file is not valid
 msgstr A háttérképek listája érvénytelen
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -36,127 +36,126 @@ msgstr 
 %s\n
 iMéret: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Saját mappa
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Fájlrendszer
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Kuka
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Cserélhető eszközök
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Nem hozható létre a háttérlista („%s”)
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Háttérlistahiba
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Háttérlista létrehozása/betöltése
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
 msgstr A fájl („%s”) nem érvényes háttérlistafájl. Felül kívánja írni?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Érvénytelen listafájl
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr A fájl felülírásával a tartalma elvész.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Csere
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr A háttérlista kiírása meghiúsult ide: („%s”)
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Képfájlok hozzáadása
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Képfájlok
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Minden fájl
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr %d. képernyő, %d. monitor (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr %d. képernyő, %d. monitor
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr %d. képernyő
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr %d. monitor (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr %d. monitor
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Beállításkezelő foglalat
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr FOGLALATAZONOSÍTÓ
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid 

[Xfce4-commits] xfce-utils:master Update translators, week 04.

[Transifex]

Updating branch refs/heads/master
 to b630b5e2c1d6ba4f7d3205605152b8421d678281 (commit)
   from ea60e6609de81bd0f8b8700dfb70437bac253001 (commit)

commit b630b5e2c1d6ba4f7d3205605152b8421d678281
Author: Transifex norep...@xfce.org
Date:   Sun Jan 30 00:00:05 2011 +0100

Update translators, week 04.

 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 019bdad..bbade5a 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-01-23 00:00:07
+#define TRANSLATORS_H_STAMP 2011-01-30 00:00:04
 #define ATSIGN @
 #define DOTSIGN .
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] exo:master Fix gio-unix 2.27 detection (bug #7124).

[Nick Schermer]

Updating branch refs/heads/master
 to acc27174635e14f63d5b4143d8a3775f01a54c0d (commit)
   from d7299c288171891c3a4cbcffcfd31ddf8537ded5 (commit)

commit acc27174635e14f63d5b4143d8a3775f01a54c0d
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 30 00:19:16 2011 +0100

Fix gio-unix 2.27 detection (bug #7124).

 configure.in.in |   11 +--
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 8652d3a..677f80a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -155,10 +155,9 @@ XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], 
[2.18.0], [gio-unix], [GI
 GIOMODULEDIR=
 BUILD_GIOMODULE=
 if test x$GIO_UNIX_FOUND = xyes; then
-  dnl Do not build the module after GIO 2.27
-  XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX_227], [gio-unix-2.0], [2.27.0], 
[gio-unix], [GIO-Unix too new], [yes])
-
-  if test x$GIO_UNIX_227_FOUND != xyes; then
+  if $PKG_CONFIG --atleast-version=2.27.0 gio-unix-2.0 /dev/null 21; 
then
+BUILD_GIOMODULE=no
+  else
 dnl A GIO version = 2.18 and  2.27 was found
 BUILD_GIOMODULE=yes
 
@@ -176,7 +175,7 @@ if test x$GIO_UNIX_FOUND = xyes; then
 fi
 AC_SUBST([GIOMODULEDIR])
 AM_CONDITIONAL([HAVE_GIOMODULEDIR], [test x$GIOMODULEDIR != x])
-AM_CONDITIONAL([BUILD_GIOMODULE], [test x$BUILD_GIOMODULE != x])
+AM_CONDITIONAL([BUILD_GIOMODULE], [test x$BUILD_GIOMODULE = xyes])
 
 dnl *
 dnl *** Check for X11 ***
@@ -358,7 +357,7 @@ dnl ***
 echo
 echo Build Configuration:
 echo
-if test x$GIO_UNIX_227_FOUND = xyes; then
+if test x$BUILD_GIOMODULE = xno; then
 echo * Build GIO module: no (not needed after glib 2.27)
 elif test x$GIO_UNIX_FOUND = xyes; then
 echo * Build GIO module: yes
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfdesktop:master l10n: Updated German (de) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to 4cfa2aa14de75e863670c47846718922daf49213 (commit)
   from 1eaf0c2a84aa8d0d1814071275b6013e4073c984 (commit)

commit 4cfa2aa14de75e863670c47846718922daf49213
Author: Christoph Wickert christoph.wick...@googlemail.com
Date:   Sun Jan 30 01:19:15 2011 +0100

l10n: Updated German (de) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/de.po |  340 +-
 1 files changed, 138 insertions(+), 202 deletions(-)

diff --git a/po/de.po b/po/de.po
index 08377c0..b54738d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,19 +6,19 @@
 # Fabian Nowak timyst...@arcor.de, 2005-2008.
 # Nico Schümann n...@prog.nico22.de, 2007.
 # Enrico Tröger enr...@xfce.org, 2007-2009.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop 4.6.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 23:12+\n
 PO-Revision-Date: 2009-01-24 08:56+0100\n
 Last-Translator: Enrico Tröger enr...@xfce.org\n
 Language-Team: German xfce-i18n...@xfce.org\n
-Language: de\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: de\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
@@ -27,7 +27,7 @@ msgid Backdrop list file is not valid
 msgstr Liste mit Hintergrundbildern ist ungültig
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -36,129 +36,126 @@ msgstr 
 %s\n
 iGröße: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Persönliches Verzeichnis
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Dateiystem
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Papierkorb
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Entfernbare Datenträger
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Kann die Liste mit Hintergrundbildern »%s« nicht erstellen
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Fehler
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Liste mit Hintergrundbildern erstellen/laden
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-Die Datei »%s« ist keine gültige Liste mit Hintergrundbildern. Soll sie 
-überschrieben werden?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr Die Datei »%s« ist keine gültige Liste mit Hintergrundbildern. Soll 
sie überschrieben werden?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Ungültige Listendatei
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Beim Überschreiben der Datei gehen die Inhalte verloren.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Ersetzen
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Konnte Liste mit Hintergrundbildern nicht in »%s« schreiben.
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Bilddatei(en) hinzufügen
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Bilddateien
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Alle Dateien
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Bildschirm %d, Monitor %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Bildschirm %d, Monitor %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Bildschirm %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Bildschirm %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Bildschirm %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Socket für die Sitzungsverwaltung
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr SOCKET-NUMMER
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid 

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated German (de) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to 57de9a9a4021845e5d5b7cb7ce7101b89949bdb3 (commit)
   from 8163b837ff0e94b97eb34f982c2b77f27d2e3e07 (commit)

commit 57de9a9a4021845e5d5b7cb7ce7101b89949bdb3
Author: Christoph Wickert christoph.wick...@googlemail.com
Date:   Sun Jan 30 01:19:07 2011 +0100

l10n: Updated German (de) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/de.po |  334 +-
 1 files changed, 135 insertions(+), 199 deletions(-)

diff --git a/po/de.po b/po/de.po
index 08377c0..a72479e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,19 +6,19 @@
 # Fabian Nowak timyst...@arcor.de, 2005-2008.
 # Nico Schümann n...@prog.nico22.de, 2007.
 # Enrico Tröger enr...@xfce.org, 2007-2009.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop 4.6.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 23:31+\n
 PO-Revision-Date: 2009-01-24 08:56+0100\n
 Last-Translator: Enrico Tröger enr...@xfce.org\n
 Language-Team: German xfce-i18n...@xfce.org\n
-Language: de\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: de\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
@@ -27,7 +27,7 @@ msgid Backdrop list file is not valid
 msgstr Liste mit Hintergrundbildern ist ungültig
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -36,129 +36,126 @@ msgstr 
 %s\n
 iGröße: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Persönliches Verzeichnis
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Dateiystem
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Papierkorb
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Entfernbare Datenträger
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Kann die Liste mit Hintergrundbildern »%s« nicht erstellen
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Fehler
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Liste mit Hintergrundbildern erstellen/laden
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-Die Datei »%s« ist keine gültige Liste mit Hintergrundbildern. Soll sie 
-überschrieben werden?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr Die Datei »%s« ist keine gültige Liste mit Hintergrundbildern. Soll 
sie überschrieben werden?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Ungültige Listendatei
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Beim Überschreiben der Datei gehen die Inhalte verloren.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Ersetzen
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Konnte Liste mit Hintergrundbildern nicht in »%s« schreiben.
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Bilddatei(en) hinzufügen
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Bilddateien
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr Alle Dateien
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Bildschirm %d, Monitor %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Bildschirm %d, Monitor %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Bildschirm %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Bildschirm %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Bildschirm %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Socket für die Sitzungsverwaltung
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr SOCKET-NUMMER
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid 

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated English (United Kingdom) (en_GB) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to 3a48cb3afa31a8da12ff232e7f5427ad2b7d4056 (commit)
   from 57de9a9a4021845e5d5b7cb7ce7101b89949bdb3 (commit)

commit 3a48cb3afa31a8da12ff232e7f5427ad2b7d4056
Author: Jeff Bailes thepizzak...@gmail.com
Date:   Sun Jan 30 02:08:26 2011 +0100

l10n: Updated English (United Kingdom) (en_GB) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/en_GB.po |  354 +++
 1 files changed, 136 insertions(+), 218 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index 59f2195..be81a22 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,20 +4,20 @@
 # Zuza Software Foundation (Translate.org.za), 2004.
 # Translate.org.za i...@translate.org.za, 2007.
 # Jeff Bailes thepizzak...@gmail.com, 2009.
-#
-#
+# 
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop 4.6.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 23:31+\n
 PO-Revision-Date: 2009-01-27 13:37+1100\n
 Last-Translator: \n
 Language-Team: \n
-Language: \n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: \n
+Language: \n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
@@ -26,7 +26,7 @@ msgid Backdrop list file is not valid
 msgstr Choose backdrop list filename
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -35,128 +35,126 @@ msgstr 
 %s\n
 iSize: %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr Home
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr Filesystem
 
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr Wastebasket
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr Removable Devices
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr Cannot create backdrop list \%s\
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr Backdrop List Error
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr Create/Load Backdrop List
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr Invalid List File
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr Overwriting the file will cause its contents to be lost.
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr Replace
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr Failed to write backdrop list to \%s\
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr Add Image File(s)
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr Image files
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr All files
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr Screen %d, Monitor %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr Screen %d, Monitor %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr Screen %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr Monitor %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr Monitor %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr Settings manager socket
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr SOCKET ID
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid Version information
 msgstr Version information
 
-#: ../settings/main.c:1498
+#: ../settings/main.c:1521
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Type '%s --help' for usage.
 
-#: 

[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated Japanese (ja) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.8
 to a44e0a74fa13faae358e7298bb0119ef948a5eef (commit)
   from 3a48cb3afa31a8da12ff232e7f5427ad2b7d4056 (commit)

commit a44e0a74fa13faae358e7298bb0119ef948a5eef
Author: Masato Hashimoto hash...@xfce.org
Date:   Sun Jan 30 05:49:48 2011 +0100

l10n: Updated Japanese (ja) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ja.po |  274 +++---
 1 files changed, 119 insertions(+), 155 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 8186a88..868f58b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,24 +1,24 @@
 # $Id$
-#
+# 
 # Japanese translations for xfdesktop package.
 # Copyright (C) 2003-2007 The Xfce development team.
 # This file is distributed under the same license as the xfdesktop package.
 # Zhao Ji zhao...@awz.ne.jp, 2003.
 # Daichi Kawahata dai...@xfce.org, 2005-2007.
 # Nobuhiro Iwamatsu iwama...@nigauri.org, 2008.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop 4.5.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-29 23:31+\n
 PO-Revision-Date: 2010-11-05 19:38+0900\n
 Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n
 Language-Team: Japanese xfce-users...@ml.fdiary.net\n
-Language: ja\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: ja\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
 #, c-format
@@ -26,7 +26,7 @@ msgid Backdrop list file is not valid
 msgstr 画像リストファイルが正しくありません
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -35,130 +35,128 @@ msgstr 
 %s\n
 iサイズ: %d x %d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr ホーム
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr ファイルシステム
 
 # FIXME: wtf
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr ゴミ箱
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr リムーバブルデバイス
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr 画像リスト \%s\ を作成できません
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr 画像リストエラー
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr 画像リストの作成/読み込み
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-ファイル \%s\ は正常な画像リストファイルではありません。上書きしますか?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr ファイル \%s\ は正常な画像リストファイルではありません。上書きしますか?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr 不正なリストファイル
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr 上書きするとその内容は失われます。
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr 置換
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr 画像リスト \%s\ に書き込めませんでした
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr 画像ファイルの追加
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr 画像ファイル
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr すべてのファイル
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr 画面 %d, モニタ %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr 画面 %d, モニタ %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr 画面 %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr モニタ %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr モニタ %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr 設定マネージャソケット
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr SOCKET ID
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid Version information
 msgstr バージョン情報
 
-#: ../settings/main.c:1498
+#: ../settings/main.c:1521
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr '%s --help' で使用方法が表示されます。
 
-#: ../settings/main.c:1510
+#: ../settings/main.c:1533
 msgid The Xfce 

[Xfce4-commits] xfdesktop:master l10n: Updated Japanese (ja) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to fe6ce622fcd4e589e4d69b2852b2edb0c8235a90 (commit)
   from 4cfa2aa14de75e863670c47846718922daf49213 (commit)

commit fe6ce622fcd4e589e4d69b2852b2edb0c8235a90
Author: Masato Hashimoto hash...@xfce.org
Date:   Sun Jan 30 06:17:39 2011 +0100

l10n: Updated Japanese (ja) translation to 100%

New status: 199 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ja.po |  280 +++---
 1 files changed, 122 insertions(+), 158 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 8186a88..893a836 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,24 +1,24 @@
 # $Id$
-#
+# 
 # Japanese translations for xfdesktop package.
 # Copyright (C) 2003-2007 The Xfce development team.
 # This file is distributed under the same license as the xfdesktop package.
 # Zhao Ji zhao...@awz.ne.jp, 2003.
 # Daichi Kawahata dai...@xfce.org, 2005-2007.
 # Nobuhiro Iwamatsu iwama...@nigauri.org, 2008.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop 4.5.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:44+0100\n
+POT-Creation-Date: 2011-01-30 05:12+\n
 PO-Revision-Date: 2010-11-05 19:38+0900\n
 Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n
 Language-Team: Japanese xfce-users...@ml.fdiary.net\n
-Language: ja\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: ja\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
 #, c-format
@@ -26,7 +26,7 @@ msgid Backdrop list file is not valid
 msgstr 画像リストファイルが正しくありません
 
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:162
+#: ../settings/main.c:163
 #, c-format
 msgid 
 %s\n
@@ -35,130 +35,128 @@ msgstr 
 %s\n
 iサイズ: %d x %d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247
-#: ../src/xfdesktop-special-file-icon.c:413
+#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256
+#: ../src/xfdesktop-special-file-icon.c:419
 msgid Home
 msgstr ホーム
 
-#: ../settings/main.c:274
+#: ../settings/main.c:291
 msgid Filesystem
 msgstr ファイルシステム
 
 # FIXME: wtf
-#: ../settings/main.c:276
+#: ../settings/main.c:293
 msgid Trash
 msgstr ゴミ箱
 
-#: ../settings/main.c:278
+#: ../settings/main.c:295
 msgid Removable Devices
 msgstr リムーバブルデバイス
 
-#: ../settings/main.c:458
+#: ../settings/main.c:475
 #, c-format
 msgid Cannot create backdrop list \%s\
 msgstr 画像リスト \%s\ を作成できません
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:479 ../settings/main.c:802
 msgid Backdrop List Error
 msgstr 画像リストエラー
 
-#: ../settings/main.c:487
+#: ../settings/main.c:504
 msgid Create/Load Backdrop List
 msgstr 画像リストの作成/読み込み
 
-#: ../settings/main.c:511
+#: ../settings/main.c:528
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-ファイル \%s\ は正常な画像リストファイルではありません。上書きしますか?
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr ファイル \%s\ は正常な画像リストファイルではありません。上書きしますか?
 
-#: ../settings/main.c:516
+#: ../settings/main.c:533
 msgid Invalid List File
 msgstr 不正なリストファイル
 
-#: ../settings/main.c:519
+#: ../settings/main.c:536
 msgid Overwriting the file will cause its contents to be lost.
 msgstr 上書きするとその内容は失われます。
 
-#: ../settings/main.c:521
+#: ../settings/main.c:538
 msgid Replace
 msgstr 置換
 
-#: ../settings/main.c:775
+#: ../settings/main.c:798
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr 画像リスト \%s\ に書き込めませんでした
 
-#: ../settings/main.c:802
+#: ../settings/main.c:825
 msgid Add Image File(s)
 msgstr 画像ファイルの追加
 
-#: ../settings/main.c:811
+#: ../settings/main.c:834
 msgid Image files
 msgstr 画像ファイル
 
-#: ../settings/main.c:816
+#: ../settings/main.c:839
 msgid All files
 msgstr すべてのファイル
 
-#: ../settings/main.c:1248
+#: ../settings/main.c:1271
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr 画面 %d, モニタ %d (%s)
 
-#: ../settings/main.c:1252
+#: ../settings/main.c:1275
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr 画面 %d, モニタ %d
 
-#: ../settings/main.c:1255
+#: ../settings/main.c:1278
 #, c-format
 msgid Screen %d
 msgstr 画面 %d
 
-#: ../settings/main.c:1260
+#: ../settings/main.c:1283
 #, c-format
 msgid Monitor %d (%s)
 msgstr モニタ %d (%s)
 
-#: ../settings/main.c:1264
+#: ../settings/main.c:1287
 #, c-format
 msgid Monitor %d
 msgstr モニタ %d
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid Settings manager socket
 msgstr 設定マネージャソケット
 
-#: ../settings/main.c:1477
+#: ../settings/main.c:1500
 msgid SOCKET ID
 msgstr SOCKET ID
 
-#: ../settings/main.c:1478
+#: ../settings/main.c:1501
 msgid Version information
 msgstr バージョン情報
 
-#: ../settings/main.c:1498
+#: ../settings/main.c:1521
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr '%s --help' で使用方法が表示されます。
 
-#: ../settings/main.c:1510
+#: ../settings/main.c:1533
 msgid The Xfce 

[Xfce4-commits] orage:master 4.8.0.5: Fix BUG 7204: orage-4.8.0 fails to compile with libnotify-0.7 API

[Juha Kautto]

Updating branch refs/heads/master
 to bfa601ba135f84163eded2bb2e060e21d9ca08ce (commit)
   from 3f8833c836991b8e2707f8035918ff7d7e630841 (commit)

commit bfa601ba135f84163eded2bb2e060e21d9ca08ce
Author: Juha Kautto j...@xfce.org
Date:   Sun Jan 30 09:52:54 2011 +0200

4.8.0.5: Fix BUG 7204: orage-4.8.0 fails to compile with libnotify-0.7 API

libnotify was changed quite a lot in version 0.7.0. Making Orage compatible
with it.

 configure.in.in |2 +-
 src/reminder.c  |   15 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 9a2e92d..fac4e9a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto j...@xfce.org
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.8.0.4-git])
+m4_define([orage_version], [4.8.0.5-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/reminder.c b/src/reminder.c
index fb9ff23..fccef05 100644
--- a/src/reminder.c
+++ b/src/reminder.c
@@ -60,6 +60,12 @@
 #define ORAGE_DEBUG 1
 */
 
+/* Compatibility macro for  libnotify-0.7 */
+/* NOTIFY_CHECK_VERSION was created in 0.5.2 */
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
 typedef struct _orage_ddmmhh_hbox
 {
 GtkWidget *time_hbox
@@ -557,12 +563,19 @@ static void create_notify_reminder(alarm_struct *l_alarm)
 g_strlcat(heading, l_alarm-action_time, 90);
 g_strlcat(heading, \b, 10);
 }
+/* since version 0.7.0, libnotify does not have the widget parameter in 
+   notify_notification_new and it does not have function
+   notify_notification_attach_to_status_icon at all */
+#if NOTIFY_CHECK_VERSION(0, 7, 0)
+n = notify_notification_new(heading, l_alarm-description, NULL);
+#else
 n = notify_notification_new(heading, l_alarm-description, NULL, NULL);
-l_alarm-active_alarm-active_notify = n;
 if (g_par.trayIcon 
  gtk_status_icon_is_embedded((GtkStatusIcon *)g_par.trayIcon))
 notify_notification_attach_to_status_icon(n
 , (GtkStatusIcon *)g_par.trayIcon);
+#endif
+l_alarm-active_alarm-active_notify = n;
 
 if (l_alarm-notify_timeout == -1)
 notify_notification_set_timeout(n, NOTIFY_EXPIRES_NEVER);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits