[Xfce4-commits] xfce4-settings:xfce-4.6 l10n: Updated Dutch (Flemish) (nl) translation to 45%

[Transifex]

Updating branch refs/heads/xfce-4.6
 to 8c5f366819268e26ec6e40b9957cdca0c6813b62 (commit)
   from b17b2ccdf26bc6da11320b7f3cde7f4285bba006 (commit)

commit 8c5f366819268e26ec6e40b9957cdca0c6813b62
Author: Timo Verbeek timoverbee...@hotmail.com
Date:   Thu Jan 28 12:51:06 2010 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 45%

New status: 107 messages complete with 55 fuzzies and 75 untranslated.

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

 po/nl.po |  359 --
 1 files changed, 136 insertions(+), 223 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 2fafa32..0039b1a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,24 +2,24 @@
 # Dutch translations for xfce4_settings package.
 # Copyright (C) 2008 THE xfce4_settings'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4_settings 
package.
-#
+# 
 # XFCE step...@xfce.org, 2008.
 # Balaam's Miracle bal...@balaamsmiracle.com, 2008.
-#: ../xfsettingsd/main.c:127
 msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2009-01-25 20:50+0100\n
+POT-Creation-Date: 2010-01-28 12:10+0100\n
 PO-Revision-Date: 2008-06-21 15:11+0200\n
 Last-Translator: Stephan Arts step...@xfce.org\n
 Language-Team: Nederlands nl...@li.org\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
+Plural-Forms: nplurals=2; plural=(n != 1);\n
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
+#, fuzzy
 msgid bBounce Keys/b
 msgstr bKaatstoetsen/b
 
@@ -49,14 +49,12 @@ msgstr Acceptatie_tijd:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
 #: 
../dialogs/accessibility-settings/xfce4-accessibility-settings.desktop.in.h:1
-#, fuzzy
 msgid Accessibility
 msgstr Toegankelijkheid
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
-#, fuzzy
 msgid Configure keyboard and mouse accessibility
-msgstr Configureer plaktoetsen, trage toetsen en andere hulpmiddelen
+msgstr Configureer toetsenbord en muis toegankelijkheid 
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
 msgid Disable sticky keys if _two keys are pressed
@@ -68,9 +66,8 @@ msgid K_eystroke delay:
 msgstr Ve_rtraging voor trage toetsen:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
-#, fuzzy
 msgid Keyboa_rd
-msgstr Toetsenbord
+msgstr Toetsenbo_rd
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
 msgid Maximum _speed:
@@ -81,14 +78,14 @@ msgid R_epeat interval:
 msgstr Herhalings_interval:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:15
+#, fuzzy
 msgid The amount of time, in milliseconds, required between keystrokes
-msgstr 
+msgstr De hoeveelheid tijd in milliseconden nodig tussen toetsaanslagen
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid 
-The amount of time, in milliseconds, that must elapse before a keystroke 
-will be accepted
-msgstr 
+#, fuzzy
+msgid The amount of time, in milliseconds, that must elapse before a 
keystroke will be accepted
+msgstr De hoeveelheid tijd in milliseconden die moet verstrijken voordat er 
een toetsaanslag zal worden aanvaard
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid The maximum pointer speed after acceleration
@@ -103,9 +100,7 @@ msgid The time, in milliseconds, between repeated motion 
events
 msgstr 
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid 
-The time, in milliseconds, between the initial key press and first repeated 
-motion event
+msgid The time, in milliseconds, between the initial key press and first 
repeated motion event
 msgstr 
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
@@ -113,58 +108,43 @@ msgid The time, in milliseconds, to get to maximum speed
 msgstr 
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid 
-To help prevent accidental keystrokes, slow keys requires that a key is held 
-for a certain minimum amount of time before the keystroke will be accepted
+msgid To help prevent accidental keystrokes, slow keys requires that a key is 
held for a certain minimum amount of time before the keystroke will be accepted
 msgstr 
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
-msgid 
-To help prevent accidental multiple keystrokes, bounce keys imposes a 
-minimum delay between keystrokes
+msgid To help prevent accidental multiple keystrokes, bounce keys imposes a 
minimum delay between keystrokes
 msgstr 
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
 #, fuzzy
 msgid Use _bounce keys
-msgstr _Kaatstoetsen inschakelen
+msgstr _Kaatstoetsen gebruiken
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
-#, fuzzy
 msgid Use _sticky keys

[Xfce4-commits] xfce4-settings:xfce-4.6 l10n: Updated Dutch (Flemish) (nl) translation to 50%

[Transifex]

Updating branch refs/heads/xfce-4.6
 to 7f8320a1925178abc5bdc3dfc4c975218a2f613e (commit)
   from 8c5f366819268e26ec6e40b9957cdca0c6813b62 (commit)

commit 7f8320a1925178abc5bdc3dfc4c975218a2f613e
Author: Timo Verbeek timoverbee...@hotmail.com
Date:   Thu Jan 28 13:20:49 2010 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 50%

New status: 120 messages complete with 54 fuzzies and 63 untranslated.

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

 po/nl.po |   39 +++
 1 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 0039b1a..c79183a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -44,6 +44,7 @@ msgid Acceleration _time:
 msgstr Versnellings_tijd:
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
+#, fuzzy
 msgid Acceptance _delay:
 msgstr Acceptatie_tijd:
 
@@ -353,13 +354,13 @@ msgid Sub-_pixel order:
 msgstr Sub-_pixel volgorde:
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:29
+#, fuzzy
 msgid This font will be used as the default font used when drawing user 
interface text
-msgstr 
+msgstr Dit lettertype wordt gebruikt als de standaard lettertype dat gebruikt 
wordt bij het opstellen gebruikersinterface tekst
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:30
-#, fuzzy
 msgid _Fonts
-msgstr _Lettertype
+msgstr _Lettertypes
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:31
 #, fuzzy
@@ -372,9 +373,8 @@ msgid _Icons
 msgstr Pictogrammen
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
-#, fuzzy
 msgid _Settings
-msgstr Muis-instellingen
+msgstr _Instellingen
 
 #: ../dialogs/appearance-settings/main.c:675
 #: ../dialogs/appearance-settings/main.c:750
@@ -433,7 +433,7 @@ msgstr Test de nieuwe beeldscherm instellingen
 #: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
 msgid Configure screen settings and layout
-msgstr 
+msgstr Configureer scherminstellingen en uiterlijk
 
 #: ../dialogs/display-settings/display-dialog.glade.h:3
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
@@ -658,7 +658,7 @@ msgstr 
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
 msgid The time, in milliseconds, before a pressed key begins repeating
-msgstr 
+msgstr De tijd begint in milliseconden, voordat een ingedrukte toets herhaalt 
word
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
 #, fuzzy
@@ -715,15 +715,15 @@ msgstr Snelkoppeling
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:425
 msgid Active
-msgstr 
+msgstr Actief
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:429
 msgid Layout
-msgstr 
+msgstr Uiterlijk
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:430
 msgid Variant
-msgstr 
+msgstr Variant
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:933
 msgid Shortcut command may not be empty.
@@ -732,7 +732,7 @@ msgstr Snelkoppeling opdracht mag niet leeg zijn.
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1040
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1041
 msgid Reset to Defaults
-msgstr 
+msgstr Herstel standaardwaarden
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid This will reset all shortcuts to their default values. Do you really 
want to do this?
@@ -744,15 +744,16 @@ msgstr 
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1113
 msgid Warning
-msgstr 
+msgstr Waarschuwing
 
 #: ../dialogs/mouse-settings/main.c:100
 msgid Active device in the dialog
-msgstr 
+msgstr Actief apparaat in het dialoogvenster
 
 #: ../dialogs/mouse-settings/main.c:100
+#, fuzzy
 msgid DEVICE NAME
-msgstr 
+msgstr Apparaatnaam
 
 #. sort the names but keep Default on top
 #: ../dialogs/mouse-settings/main.c:356 ../dialogs/mouse-settings/main.c:358
@@ -783,23 +784,21 @@ msgid bPreview/b
 msgstr bVoorbeeld/b
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
-#, fuzzy
 msgid bSize/b
-msgstr bStijl/b
+msgstr bGroote/b
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:1
 msgid Configure pointer device behavior and appearance
-msgstr 
+msgstr Configureer pointer gedrag en het uiterlijk
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
 msgid Cursor _Size:
 msgstr Aanwijzer_grootte:
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
-#, fuzzy
 msgid De_vices
-msgstr Apparaten
+msgstr App_araten
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:2
@@ -808,7 +807,7 @@ msgstr Muis
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
 msgid Re_set to Defaults
-msgstr 
+msgstr Herstel Standaardwaarden
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
 msgid Re_verse scroll direction
___
Xfce4-commits mailing list

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

[Transifex]

Updating branch refs/heads/master
 to 8cdea0f32cd5ad0083291e6a05f85abd07552ae6 (commit)
   from 004a71ea008a13b3eeecad4f91d3432981f6344d (commit)

commit 8cdea0f32cd5ad0083291e6a05f85abd07552ae6
Author: Jari Rahkonen jari.rahko...@pp1.inet.fi
Date:   Thu Jan 28 13:24:07 2010 +0100

l10n: Updated Finnish (fi) translation to 100%

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

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

 po/fi.po |  236 --
 1 files changed, 91 insertions(+), 145 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 1482b5c..57b3702 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,31 +1,31 @@
 # Finnish translation for Xfce4 Screenshooter Plugin
-# Copyright (C) 2008 Jérôme Guelfucci
+# Copyright (C) 2008-2010 Jérôme Guelfucci
 # This file is distributed under the same license as the xfce4-screenshooter 
package.
 # Elias Julkunen elias.julku...@gmail.com, 2008.
-# Jari Rahkonen jari.rahko...@pp1.inet.fi, 2008-2009.
+# Jari Rahkonen jari.rahko...@pp1.inet.fi, 2008-2010.
 #
 msgid 
 msgstr 
 Project-Id-Version: xfce4-screenshooter\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2009-11-29 11:58+0100\n
-PO-Revision-Date: 2009-03-28 22:12+0200\n
+POT-Creation-Date: 2010-01-28 06:01+0100\n
+PO-Revision-Date: 20010-01-28 14:22+0200\n
 Last-Translator: Jari Rahkonen jari.rahko...@pp1.inet.fi\n
 Language-Team: Finnish\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 
-#: ../lib/screenshooter-dialogs.c:478
+#: ../lib/screenshooter-dialogs.c:453
 #, c-format
 msgid %.2fKb of %.2fKb
-msgstr 
+msgstr %.2fkt / %.2fkt
 
-#: ../lib/screenshooter-dialogs.c:560
+#: ../lib/screenshooter-dialogs.c:535
 msgid Transfer
 msgstr Siirto
 
-#: ../lib/screenshooter-dialogs.c:581
+#: ../lib/screenshooter-dialogs.c:556
 msgid 
 span weight=\bold\ stretch=\semiexpanded\The screenshot is being 
 transferred to:/span
@@ -33,49 +33,49 @@ msgstr 
 span weight=\bold\ stretch=\semiexpanded\Kuvakaappausta siirretään 
 kohteeseen:/span
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:672 ../lib/screenshooter-dialogs.c:689
+#: ../lib/screenshooter-dialogs.c:880 ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid Screenshot
 msgstr Kuvakaappaus
 
-#: ../lib/screenshooter-dialogs.c:709
+#: ../lib/screenshooter-dialogs.c:684
 msgid Take a screenshot
 msgstr Kaappaa kuva
 
-#: ../lib/screenshooter-dialogs.c:724
+#: ../lib/screenshooter-dialogs.c:699
 msgid Preferences
 msgstr Asetukset
 
-#: ../lib/screenshooter-dialogs.c:754
+#: ../lib/screenshooter-dialogs.c:729
 msgid span weight=\bold\ stretch=\semiexpanded\Region to capture/span
 msgstr span weight=\bold\ stretch=\semiexpanded\Kaapattava alue/span
 
-#: ../lib/screenshooter-dialogs.c:774
+#: ../lib/screenshooter-dialogs.c:749
 msgid Entire screen
 msgstr Koko näyttö
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:756 ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid Take a screenshot of the entire screen
 msgstr Kaappaa kuva koko näytöstä
 
-#: ../lib/screenshooter-dialogs.c:789
+#: ../lib/screenshooter-dialogs.c:764
 msgid Active window
 msgstr Aktiivinen ikkuna
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:771 ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid Take a screenshot of the active window
 msgstr Kaappaa kuva aktiivisesta ikkunasta
 
-#: ../lib/screenshooter-dialogs.c:804
+#: ../lib/screenshooter-dialogs.c:779
 msgid Select a region
 msgstr Valitse alue
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:784 ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
 msgid 
 Select a region to be captured by clicking a point of the screen without 
@@ -85,111 +85,108 @@ msgstr 
 Aseta hiiren osoitin kaapattavan alueen kulmaan, paina hiiren vasen painike 
 pohjaan, siirrä osoitin alueen vastakkaiseen kulmaan ja päästä painike ylös.
 
-#: ../lib/screenshooter-dialogs.c:819
+#: ../lib/screenshooter-dialogs.c:794
 msgid Capture the mouse pointer
 msgstr Sisällytä hiiren osoitin
 
-#: ../lib/screenshooter-dialogs.c:824
-#, fuzzy
+#: ../lib/screenshooter-dialogs.c:799
 msgid Display the mouse pointer on the screenshot
-msgstr Älä sisällytä hiiren osoitinta kuvakaappaukseen
+msgstr Näytä hiiren osoitin kaapatussa kuvassa
 
-#: ../lib/screenshooter-dialogs.c:840
+#: ../lib/screenshooter-dialogs.c:815
 msgid 
 span weight=\bold\ stretch=\semiexpanded\Delay before capturing/span
 msgstr span weight=\bold\ stretch=\semiexpanded\Kaappausviive/span
 
-#: 

[Xfce4-commits] xfce4-panel:devel Make icon hiding work again with GtkBuilder and Xfconf.

[Nick Schermer]

Updating branch refs/heads/devel
 to fa2481116f11d003f9b1f47ec05f499a19d055a5 (commit)
   from a4c620e80c6ab063fa32f8e353898d3965bea653 (commit)

commit fa2481116f11d003f9b1f47ec05f499a19d055a5
Author: Nick Schermer n...@xfce.org
Date:   Wed Jan 20 21:04:58 2010 +0100

Make icon hiding work again with GtkBuilder and Xfconf.

 plugins/systray/systray-box.c|  342 +-
 plugins/systray/systray-dialog.glade |   10 +-
 plugins/systray/systray-manager.c|   28 +--
 plugins/systray/systray.c|  337 -
 4 files changed, 473 insertions(+), 244 deletions(-)

diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 5807df0..51c0177 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -28,6 +28,7 @@
 #include gtk/gtk.h
 #include libxfce4panel/libxfce4panel.h
 #include common/panel-private.h
+#include common/panel-xfconf.h
 
 #include systray-box.h
 #include systray-socket.h
@@ -40,28 +41,46 @@
 
 
 
-static void systray_box_finalize   (GObject *object);
-static void systray_box_size_request   (GtkWidget   *widget,
-GtkRequisition  *requisition);
-static void systray_box_size_allocate  (GtkWidget   *widget,
-GtkAllocation   *allocation);
-static gboolean systray_box_expose_event   (GtkWidget   *widget,
-GdkEventExpose  *event);
-static void systray_box_add(GtkContainer*container,
-GtkWidget   *child);
-static void systray_box_remove (GtkContainer*container,
-GtkWidget   *child);
-static void systray_box_forall (GtkContainer*container,
-gboolean 
include_internals,
-GtkCallback  callback,
-gpointer 
callback_data);
-static GTypesystray_box_child_type (GtkContainer*container);
-static void systray_box_button_set_arrow   (SystrayBox  *box);
-static gboolean systray_box_button_press_event (GtkWidget   *widget,
-GdkEventButton  *event,
-GtkWidget   *box);
-static void systray_box_button_clicked (GtkToggleButton *button,
-SystrayBox  *box);
+static void systray_box_get_property  (GObject *object,
+   guintprop_id,
+   GValue  *value,
+   GParamSpec  *pspec);
+static void systray_box_set_property  (GObject *object,
+   guintprop_id,
+   const GValue*value,
+   GParamSpec  *pspec);
+static void systray_box_finalize  (GObject *object);
+static void systray_box_size_request  (GtkWidget   *widget,
+   GtkRequisition  
*requisition);
+static void systray_box_size_allocate (GtkWidget   *widget,
+   GtkAllocation   
*allocation);
+static gboolean systray_box_expose_event  (GtkWidget   *widget,
+   GdkEventExpose  *event);
+static void systray_box_add   (GtkContainer*container,
+   GtkWidget   *child);
+static void systray_box_remove(GtkContainer*container,
+   GtkWidget   *child);
+static void systray_box_forall(GtkContainer*container,
+   gboolean 
include_internals,
+   GtkCallback  callback,
+   gpointer 
callback_data);
+static GTypesystray_box_child_type(GtkContainer*container);
+static void systray_box_names_collect_visible (gpointer key,
+   gpointer value,
+   gpointer user_data);
+static void systray_box_names_collect_hidden  (gpointer key,
+   gpointer 

[Xfce4-commits] terminal:master l10n: Updated Indonesian (id) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to 30f4176a27ee45075b5614a0d31be1346cf40d57 (commit)
   from 9dc015a453361660e50f3061312190275e0910a2 (commit)

commit 30f4176a27ee45075b5614a0d31be1346cf40d57
Author: Andhika Padmawan andhika.padma...@gmail.com
Date:   Thu Jan 28 15:24:27 2010 +0100

l10n: Updated Indonesian (id) translation to 100%

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

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

 doc/po/id.po |  192 ++
 1 files changed, 99 insertions(+), 93 deletions(-)

diff --git a/doc/po/id.po b/doc/po/id.po
index e4ad7b3..b41146b 100644
--- a/doc/po/id.po
+++ b/doc/po/id.po
@@ -1,13 +1,13 @@
 # Indonesian translations for Terminal package.
 # Copyright (C) 2003-2006 os-cillation e.K.
 # This file is distributed under the same license as the Terminal package.
-# Andhika Padmawan andhika.padma...@gmail.com, 2009
+# Andhika Padmawan andhika.padma...@gmail.com, 2010.
 #
 msgid 
 msgstr 
 Project-Id-Version: terminal 0.2.12\n
 POT-Creation-Date: 2009-12-14 18:06+0100\n
-PO-Revision-Date: 2009-07-26 00:36-0400\n
+PO-Revision-Date: 2010-01-28 09:21-0500\n
 Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n
 Language-Team: Indonesian translation-team...@lists.sourceforge.net\n
 MIME-Version: 1.0\n
@@ -15,9 +15,8 @@ msgstr 
 Content-Transfer-Encoding: 8bit\n
 
 #: Terminal.1.xml:14(contrib) Terminal.1.xml:22(contrib)
-#, fuzzy
 msgid Developer
-msgstr Pengembang Inti Xfce
+msgstr Pengembang
 
 #: Terminal.1.xml:15(firstname) Terminal.xml:63(firstname)
 msgid Nick
@@ -57,38 +56,35 @@ msgstr be...@xfce.org
 
 #: Terminal.1.xml:37(manvolnum)
 msgid 1
-msgstr 
+msgstr 1
 
 #: Terminal.1.xml:38(refmiscinfo)
 msgid 0.4.2git-fa00dd5
-msgstr 
+msgstr 0.4.2git-fa00dd5
 
 #: Terminal.1.xml:39(refmiscinfo)
 msgid Xfce
-msgstr 
+msgstr Xfce
 
 #: Terminal.1.xml:44(refpurpose)
-#, fuzzy
 msgid A Terminal emulator for X
-msgstr Emulator Terminal
+msgstr Emulator terminal untuk X
 
 #: Terminal.1.xml:48(title)
 msgid Synopsis
-msgstr 
+msgstr Sinopsis
 
 #: Terminal.1.xml:50(command)
-#, fuzzy
 msgid Terminal
-msgstr Emulator Terminal
+msgstr Terminal
 
 #: Terminal.1.xml:51(arg)
 msgid OPTION
-msgstr 
+msgstr OPSI
 
 #: Terminal.1.xml:56(title)
-#, fuzzy
 msgid Description
-msgstr os-cillation
+msgstr Keterangan
 
 #: Terminal.1.xml:57(para) Terminal.xml:93(para)
 msgid 
@@ -129,22 +125,23 @@ msgstr 
 
 #: Terminal.1.xml:79(title)
 msgid Options
-msgstr 
+msgstr Opsi
 
 #: Terminal.1.xml:82(title)
 msgid Option Summary
-msgstr 
+msgstr Ringkasan Opsi
 
 #: Terminal.1.xml:83(para)
 msgid 
 Here is a summary of all the options, grouped by type. Explanations are in 
 the following sections.
 msgstr 
+Di sini adalah ringkasan untuk semua opsi, dikelompokkan berdasarkan tipe. 
+Penjelasannya di bagian berikut.
 
 #: Terminal.1.xml:89(link) Terminal.1.xml:144(title)
-#, fuzzy
 msgid General Options
-msgstr Pengaturan umum
+msgstr Opsi umum
 
 #: Terminal.1.xml:91(para)
 msgid 
@@ -153,20 +150,26 @@ msgid 
 linkend=\options-general-default-display\/; xref linkend=\options-
 general-default-working-directory\/
 msgstr 
+xref linkend=\options-general-help\/; xref linkend=\options-general-
+version\/; xref linkend=\options-general-disable-server\/; xref 
+linkend=\options-general-default-display\/; xref linkend=\options-
+general-default-working-directory\/
 
 #: Terminal.1.xml:101(link) Terminal.1.xml:194(title)
 msgid Window or Tab Separators
-msgstr 
+msgstr Pemisah Jendela atau Tab
 
 #: Terminal.1.xml:103(para)
 msgid 
 xref linkend=\options-separators-tab\/; xref linkend=\options-
 separators-window\/
 msgstr 
+xref linkend=\options-separators-tab\/; xref linkend=\options-
+separators-window\/
 
 #: Terminal.1.xml:110(link) Terminal.1.xml:217(title)
 msgid Tab Options
-msgstr 
+msgstr Opsi Tab
 
 #: Terminal.1.xml:112(para)
 msgid 
@@ -174,11 +177,13 @@ msgid 
 \/; xref linkend=\options-tab-working-directory\/; xref linkend=
 \options-tab-title\/; xref linkend=\options-tab-hold\/
 msgstr 
+xref linkend=\options-tab-execute\/; xref linkend=\options-tab-command
+\/; xref linkend=\options-tab-working-directory\/; xref linkend=
+\options-tab-title\/; xref linkend=\options-tab-hold\/
 
 #: Terminal.1.xml:122(link) Terminal.1.xml:267(title)
-#, fuzzy
 msgid Window Options
-msgstr opsi tersembunyi
+msgstr Opsi Jendela
 
 #: Terminal.1.xml:124(para)
 msgid 
@@ -192,10 +197,19 @@ msgid 
 linkend=\options-window-show-toolbars\/, xref linkend=\options-window-
 hide-toolbars\/
 msgstr 
+xref linkend=\options-window-display\/; xref linkend=\options-window-
+geometry\/; xref linkend=\options-window-role\/; xref linkend=
+\options-window-startup-id\/; xref linkend=\options-window-icon\/; 
+xref linkend=\options-window-fullscreen\/; xref linkend=\options-
+window-maximize\/; xref linkend=\options-window-show-menubar\/, xref 
+linkend=\options-window-hide-menubar\/; xref 

[Xfce4-commits] libxfce4ui:master Fix bold labels in xfce_gtk_frame_box_new().

[Nick Schermer]

Updating branch refs/heads/master
 to 3234f3e1efb29e8a4ff27e68f1d6ecdb42a11ea2 (commit)
   from b649c3b30cde15f111918084afda0ef1d7009358 (commit)

commit 3234f3e1efb29e8a4ff27e68f1d6ecdb42a11ea2
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 18:51:54 2010 +0100

Fix bold labels in xfce_gtk_frame_box_new().

 libxfce4ui/xfce-gtk-extensions.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libxfce4ui/xfce-gtk-extensions.c b/libxfce4ui/xfce-gtk-extensions.c
index 340e7ba..54110b0 100644
--- a/libxfce4ui/xfce-gtk-extensions.c
+++ b/libxfce4ui/xfce-gtk-extensions.c
@@ -116,8 +116,9 @@ xfce_gtk_frame_box_new (const gchar  *label,
   if (G_LIKELY (label != NULL))
 {
   /* create bold label */
-  markup_label = g_strdup_printf (b%s/b, label);
+  markup_label = g_markup_printf_escaped (b%s/b, label);
   frame_label = gtk_label_new (markup_label);
+  gtk_label_set_use_markup (GTK_LABEL (frame_label), TRUE);
   g_free (markup_label);
   gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5);
   gtk_frame_set_label_widget (GTK_FRAME (frame), frame_label);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:xfce-4.6 l10n: Updated Italian (it) translation to 100%

[Transifex]

Updating branch refs/heads/xfce-4.6
 to 9b55ebc054566be5ebb0fbd6f6b7ea60ef0adb6b (commit)
   from 61f5ef3548d3d55e4f73eb4025295e90217e1c12 (commit)

commit 9b55ebc054566be5ebb0fbd6f6b7ea60ef0adb6b
Author: Cristian Marchi cri.pe...@gmail.com
Date:   Thu Jan 28 19:00:03 2010 +0100

l10n: Updated Italian (it) translation to 100%

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

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

 po/it.po |  466 -
 1 files changed, 244 insertions(+), 222 deletions(-)

diff --git a/po/it.po b/po/it.po
index f5c615a..dc18de1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,17 +8,29 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-session 4.4.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2008-12-26 20:57-0800\n
-PO-Revision-Date: 2009-02-04 00:54+0100\n
-Last-Translator: Fabio Riga u...@aruba.it\n
+POT-Creation-Date: 2010-01-28 18:10+0100\n
+PO-Revision-Date: 2010-01-28 18:59+0100\n
+Last-Translator: Cristian Marchi cri.pe...@gmail.com\n
 Language-Team: Italian xfce-it-translat...@googlegroups.com\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 
+# GLOSSARIO
+# failed = non riuscito
+# failsafe session = sessione di ripristino
+# helper = assistente
+# hibernate = ibernare
+# idle state= inattivo
+# log in = accesso
+# log out = uscire
+# restart, reboot = riavviare
+# shutdown = spegnere
+# splash theme = tema di avvio
+# suspend = sospendere
 #: ../engines/balou/balou-theme.c:110
 msgid No description given
-msgstr Nessuna descrizione
+msgstr Nessuna descrizione fornita
 
 #: ../engines/balou/config.c:321
 msgid Choose theme file to install...
@@ -31,11 +43,11 @@ msgstr Impossibile installare il tema di avvio dal file 
\%s\.
 
 #: ../engines/balou/config.c:336
 msgid Theme File Error
-msgstr Errore file del tema
+msgstr Errore nel file del tema
 
 #: ../engines/balou/config.c:339
 msgid Please check that the file is a valid splash theme archive.
-msgstr Verificare che il file sia un tema di avvio archiviato valido.
+msgstr Verificare che il file sia un archivio del tema di avvio valido.
 
 #: ../engines/balou/config.c:393
 #, c-format
@@ -52,11 +64,11 @@ msgstr _Installa un nuovo tema
 
 #: ../engines/balou/config.c:620
 msgid _Remove theme
-msgstr _Rimuovi tema
+msgstr _Rimuovi il tema
 
 #: ../engines/balou/config.c:637
 msgid _Export theme
-msgstr _Esporta tema
+msgstr _Esporta il tema
 
 #: ../engines/balou/config.c:852
 msgid Balou theme
@@ -72,7 +84,7 @@ msgstr Balou
 
 #: ../engines/balou/config.c:981
 msgid Balou Splash Engine
-msgstr Motore di avvio Baluo
+msgstr Motore di avvio Balou
 
 #: ../engines/mice/mice.c:369
 msgid Mice
@@ -88,7 +100,7 @@ msgstr Configura il tema Semplice...
 
 #: ../engines/simple/simple.c:352
 msgid Font
-msgstr Tipo di carattere
+msgstr Carattere
 
 #: ../engines/simple/simple.c:362
 msgid Colors
@@ -96,11 +108,11 @@ msgstr Colori
 
 #: ../engines/simple/simple.c:370
 msgid Background color:
-msgstr Colore di sfondo:
+msgstr Colore dello sfondo:
 
 #: ../engines/simple/simple.c:383
 msgid Text color:
-msgstr Colore testo:
+msgstr Colore del testo:
 
 #: ../engines/simple/simple.c:396
 msgid Image
@@ -112,7 +124,7 @@ msgstr Usa immagine personalizzata
 
 #: ../engines/simple/simple.c:408
 msgid Choose image...
-msgstr Scegli un immagine...
+msgstr Selezionare un'immagine...
 
 #: ../engines/simple/simple.c:414
 msgid Images
@@ -132,11 +144,11 @@ msgstr Motore di avvio Semplice
 
 #: ../settings/main.c:43
 msgid Settings manager socket
-msgstr 
+msgstr Socket del gestore delle impostazioni
 
 #: ../settings/main.c:43
 msgid SOCKET ID
-msgstr 
+msgstr SOCKET ID
 
 #: ../settings/main.c:44
 msgid Version information
@@ -154,47 +166,48 @@ msgstr Il gruppo di sviluppo di Xfce. Tutti i diritti 
riservati.
 #: ../settings/main.c:77
 #, c-format
 msgid Please report bugs to %s.
-msgstr 
+msgstr Segnalare i problemi a %s.
 
 #: ../settings/main.c:84
 msgid Session Settings
-msgstr Impostazioni di sessione
+msgstr Impostazioni della sessione
 
-#: ../settings/main.c:86 ../xfce4-session/main.c:278
+#: ../settings/main.c:86
+#: ../xfce4-session/main.c:281
 msgid Unable to contact settings server
-msgstr 
+msgstr Impossibile contattare il server delle impostazioni
 
 #: ../settings/main.c:100
 msgid Internal Error
-msgstr 
+msgstr Errore interno
 
 #: ../settings/main.c:101
 msgid Unable to create user interface from embedded definition data
-msgstr 
+msgstr Impossibile creare l'interfaccia utente dai dati di definizione 
inclusi
 
 #: ../settings/main.c:102
 msgid This is likely a problem with your Xfce installation
-msgstr 
+msgstr Probabilmente si tratta di un problema con la propria installazione di 
Xfce
 
 #: ../settings/main.c:115
 msgid _Application Autostart
-msgstr 
+msgstr _Avvio automatico
 
 #: ../settings/session-editor.c:57
 msgid If running
-msgstr 
+msgstr Se in esecuzione
 
 

[Xfce4-commits] terminal:master l10n: Updated French (fr) translation to 81%

[Transifex]

Updating branch refs/heads/master
 to b68e51d00cd62e507629a928d97bfe548417a435 (commit)
   from 2e089827f712178bb957110908cfdd01b920a10d (commit)

commit b68e51d00cd62e507629a928d97bfe548417a435
Author: Steve Dodier sidnio...@gmail.com
Date:   Thu Jan 28 19:47:41 2010 +0100

l10n: Updated French (fr) translation to 81%

New status: 309 messages complete with 35 fuzzies and 34 untranslated.

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

 doc/po/fr.po |   12 +++-
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/po/fr.po b/doc/po/fr.po
index f7539b4..f2f4521 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -103,25 +103,27 @@ msgid @PACKAGE_NAME@ emulates the 
applicationxterm/application application
 msgstr @PACKAGE_NAME@ émule l'application applicationxterm/application 
développée par le X Consortium. À son tour, l'application 
applicationxterm/application émule le terminal DEC VT102 ainsi que les 
séquences d'échappement du DEC VT220. Une séquence d'échappement est une série 
de caractères commençant par keycapEsc/keycap. @PACKAGE_NAME@ accepte et 
comprend toutes les formes de séquences d'échappement des terminaux VT102 et 
VT220, comme celles servant à positionner le curseur ou à effacer l'écran.
 
 #: Terminal.1.xml79(title)
+#, fuzzy
 msgid Options
-msgstr 
+msgstr Options
 
 #: Terminal.1.xml82(title)
+#, fuzzy
 msgid Option Summary
-msgstr 
+msgstr Résumé des options
 
 #: Terminal.1.xml83(para)
+#, fuzzy
 msgid Here is a summary of all the options, grouped by type. Explanations are 
in the following sections.
-msgstr 
+msgstr Voici un résumé de toutes les options, regroupées par type. Elles sont 
expliquées dans les sections suivantes.
 
 #: Terminal.1.xml89(link) Terminal.1.xml144(title)
-#, fuzzy
 msgid General Options
 msgstr Préférences générales
 
 #: Terminal.1.xml91(para)
 msgid xref linkend=\options-general-help\/; xref 
linkend=\options-general-version\/; xref 
linkend=\options-general-disable-server\/; xref 
linkend=\options-general-default-display\/; xref 
linkend=\options-general-default-working-directory\/
-msgstr 
+msgstr xref linkend=\options-general-help\/; xref 
linkend=\options-general-version\/; xref 
linkend=\options-general-disable-server\/; xref 
linkend=\options-general-default-display\/; xref 
linkend=\options-general-default-working-directory\/
 
 #: Terminal.1.xml101(link) Terminal.1.xml194(title)
 msgid Window or Tab Separators
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Port the panel plugin to libxfce4ui.

[Nick Schermer]

Updating branch refs/heads/master
 to 3cd8a45a9d6c9ae25f46883835ab549ffe790751 (commit)
   from 504890be4d2ec737ec8ed013852b2a04a1fbc063 (commit)

commit 3cd8a45a9d6c9ae25f46883835ab549ffe790751
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Wed Jan 20 08:32:25 2010 +0100

Port the panel plugin to libxfce4ui.

 panel-plugin/Makefile.am  |4 ++--
 panel-plugin/xfsm-logout-plugin.c |   19 +++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 7b390ad..bd04430 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -6,7 +6,7 @@ plugin_cflags = \
$(LIBX11_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
-   $(LIBXFCEGUI4_CFLAGS) \
+   $(LIBXFCE4UI_CFLAGS) \
$(GTK_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-DLOCALEDIR=\$(localedir)\
@@ -15,7 +15,7 @@ plugin_libs = \
$(LIBX11_LIBS) \
$(LIBXFCE4PANEL_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
-   $(LIBXFCEGUI4_LIBS) \
+   $(LIBXFCE4UI_LIBS) \
$(GTK_LIBS) \
$(DBUS_GLIB_LIBS)
 
diff --git a/panel-plugin/xfsm-logout-plugin.c 
b/panel-plugin/xfsm-logout-plugin.c
index 316cf3a..d839acb 100644
--- a/panel-plugin/xfsm-logout-plugin.c
+++ b/panel-plugin/xfsm-logout-plugin.c
@@ -42,7 +42,7 @@
 #include gtk/gtk.h
 
 #include libxfce4util/libxfce4util.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 #include libxfce4panel/libxfce4panel.h
 
 #include xfsm-logout-plugin-ui.h
@@ -142,7 +142,13 @@ static void
 xfsm_logout_plugin_lock_screen(GtkAction *action,
   gpointer user_data)
 {
-xfce_exec(xflock4, FALSE, FALSE, NULL);
+GError *error = NULL;
+
+if (!g_spawn_command_line_async(xflock4, error)) {
+xfce_dialog_show_error (NULL,
+error,
+_(Xfclock4 could not be launched));
+}
 }
 
 static gboolean
@@ -301,12 +307,9 @@ 
xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
 GError *error = NULL;
 
 if(!xfsm_logout_plugin_do_dbus_call(logout_plugin, type, error)) {
-xfce_message_dialog(NULL, _(Session Error),
-GTK_STOCK_DIALOG_ERROR,
-_(dialog_strings[type].error_text),
-error-message,
-GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT,
-NULL);
+xfce_dialog_show_warning (NULL,
+  error-message,
+  _(dialog_strings[type].error_text));
 g_error_free(error);
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Port xfce4-tips to libxfce4ui.

[Nick Schermer]

Updating branch refs/heads/master
 to 45fd97a2ab1751f5d933595a864ea6278380d7a7 (commit)
   from 3cd8a45a9d6c9ae25f46883835ab549ffe790751 (commit)

commit 45fd97a2ab1751f5d933595a864ea6278380d7a7
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 18:07:03 2010 +0100

Port xfce4-tips to libxfce4ui.

 xfce4-tips/main.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xfce4-tips/main.c b/xfce4-tips/main.c
index 60fcbd4..a288b1b 100644
--- a/xfce4-tips/main.c
+++ b/xfce4-tips/main.c
@@ -34,7 +34,7 @@
 #include string.h
 #endif
 
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Replace xfce_gdk_screen_get_fullname with custom code.

[Nick Schermer]

Updating branch refs/heads/master
 to 771544d326e7335922bc3cb9b5e2900085e6e0db (commit)
   from 45fd97a2ab1751f5d933595a864ea6278380d7a7 (commit)

commit 771544d326e7335922bc3cb9b5e2900085e6e0db
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 18:22:19 2010 +0100

Replace xfce_gdk_screen_get_fullname with custom code.

This function has not been implemented in libxfce4ui because xfce4-session
is the only application to use. Copy and adapt the code from libxfcegui4.

 libxfsm/xfsm-util.c |   39 ++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/libxfsm/xfsm-util.c b/libxfsm/xfsm-util.c
index d664d9e..1a76a79 100644
--- a/libxfsm/xfsm-util.c
+++ b/libxfsm/xfsm-util.c
@@ -75,7 +75,44 @@ xfsm_start_application (gchar  **command,
   if (screen != NULL)
 {
   if (client_machine != NULL)
-screen_name = xfce_gdk_screen_get_fullname (screen);
+{
+  const gchar *name;
+  const gchar *np;
+  GdkDisplay  *display;
+  gchar   *hostname;
+  gcharbuffer[256];
+  gchar   *bp;
+
+  display = gdk_screen_get_display (screen);
+
+  name = gdk_display_get_name (display);
+  if (*name == ':')
+{
+  hostname = xfce_gethostname ();
+  g_strlcpy (buffer, hostname, 256);
+  g_free (hostname);
+
+  bp = buffer + strlen (buffer);
+
+  for (np = name; *np != '\0'  *np != '.'  bp  buffer + 255; )
+*bp++ = *np++;
+  *bp = '\0';
+}
+  else
+{
+  g_strlcpy (buffer, name, 256);
+
+  for (bp = buffer + strlen (buffer) - 1; *bp != ':'; --bp)
+if (*bp == '.')
+  {
+*bp = '\0';
+break;
+  }
+}
+
+  screen_name = g_strdup_printf (%s.%d, buffer,
+ gdk_screen_get_number (screen));
+}
   else
 screen_name = gdk_screen_make_display_name (screen);
   argv[argc++] = g_strdup (env);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Port the settings dialog to libxfce4ui.

[Nick Schermer]

Updating branch refs/heads/master
 to 68d8c335e2ae1afe2d5f469560f0db8d95d51550 (commit)
   from 771544d326e7335922bc3cb9b5e2900085e6e0db (commit)

commit 68d8c335e2ae1afe2d5f469560f0db8d95d51550
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 18:33:49 2010 +0100

Port the settings dialog to libxfce4ui.

 settings/main.c|   12 +---
 settings/xfae-window.c |   10 --
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index 893248b..287fff9 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -29,6 +29,7 @@
 #include glade/glade.h
 
 #include libxfce4util/libxfce4util.h
+#include libxfce4ui/libxfce4ui.h
 
 #include xfae-window.h
 #include xfce4-session-settings-common.h
@@ -80,12 +81,9 @@ main(int argc,
 }
 
 if(G_UNLIKELY(!xfconf_init(error))) {
-xfce_message_dialog(NULL, _(Session Settings),
-GTK_STOCK_DIALOG_ERROR,
-_(Unable to contact settings server),
-error-message,
-GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT,
-NULL);
+xfce_dialog_show_error (NULL,
+error,
+_(Unable to contact settings server));
 g_error_free(error);
 return EXIT_FAILURE;
 }
@@ -120,7 +118,7 @@ main(int argc,
 g_object_unref(gxml);
 
 while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP)
-xfce_spawn_command_line_on_screen(xfhelp4 xfce4-session.html, 
FALSE, FALSE, NULL);
+g_spawn_command_line_async(xfhelp4 xfce4-session.html, NULL);
 
 gtk_widget_destroy(dialog);
 } else {
diff --git a/settings/xfae-window.c b/settings/xfae-window.c
index 269dfef..839e731 100644
--- a/settings/xfae-window.c
+++ b/settings/xfae-window.c
@@ -28,9 +28,7 @@
 #include xfae-dialog.h
 #include xfae-model.h
 
-#include glib.h
-#include glib/gi18n.h
-#include gtk/gtk.h
+#include libxfce4ui/libxfce4ui.h
 
 static void xfae_window_add (XfaeWindow   *window);
 static void xfae_window_remove  (XfaeWindow   *window);
@@ -276,7 +274,7 @@ xfae_window_add (XfaeWindow *window)
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (window-treeview));
   if (!xfae_model_add (XFAE_MODEL (model), name, descr, command, error))
 {
-  xfce_dialog_show_error (0, error, _(Error));
+  xfce_dialog_show_error (NULL, error, _(Error));
   g_error_free (error);
 }
 
@@ -302,7 +300,7 @@ xfae_window_remove (XfaeWindow *window)
 {
   if (!xfae_model_remove (XFAE_MODEL (model), iter, error))
 {
-  xfce_dialog_show_error (0, error, _(Error));
+  xfce_dialog_show_error (NULL, error, _(Error));
   g_error_free (error);
 }
 }
@@ -325,7 +323,7 @@ xfae_window_item_toggled (XfaeWindow *window,
 {
   if (!xfae_model_toggle (XFAE_MODEL (model), iter, error))
 {
-  xfce_dialog_show_error (0, error, _(Error));
+  xfce_dialog_show_error (NULL, error, _(Error));
   g_error_free (error);
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Use gtk functions to get the icons.

[Nick Schermer]

Updating branch refs/heads/master
 to f8799778d2f6d3d9f54bee89392a7376d5bf5ebd (commit)
   from 9693d6f71bf1821f1233b01fada35801f677ebf7 (commit)

commit f8799778d2f6d3d9f54bee89392a7376d5bf5ebd
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 23:57:06 2010 +0100

Use gtk functions to get the icons.

 xfce4-session/shutdown.c |   76 ++---
 1 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c
index 5853604..cd6cc6b 100644
--- a/xfce4-session/shutdown.c
+++ b/xfce4-session/shutdown.c
@@ -168,6 +168,7 @@ gboolean
 shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, 
gboolean *saveSession)
 {
   gboolean accessibility;
+  GtkIconTheme *icon_theme;
   XfsmFadeout *fadeout = NULL;
   GdkDisplay *display;
   GdkScreen *screen;
@@ -214,6 +215,8 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
   g_return_val_if_fail(saveSession != NULL, FALSE);
   g_return_val_if_fail(shutdownType != NULL, FALSE);
 
+  icon_theme = gtk_icon_theme_get_default ();
+
   /* destroy any previously running shutdown helper first */
   if (shutdown_helper != NULL)
 {
@@ -396,9 +399,18 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (logout_button), vbox2);
 
-  icon = xfce_themed_icon_load (system-log-out, 32);
+  icon = gtk_icon_theme_load_icon (icon_theme,
+   system-log-out,
+   32,
+   GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+   NULL);
   if (!icon)
-icon = xfce_themed_icon_load (xfsm-logout, 32);
+icon = gtk_icon_theme_load_icon (icon_theme,
+ xfsm-logout,
+ 32,
+ GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ NULL);
+
   image = gtk_image_new_from_pixbuf (icon);
   gtk_widget_show (image);
   gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0);
@@ -421,9 +433,19 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (reboot_button), vbox2);
 
-  icon = xfce_themed_icon_load (system-reboot, 32);
+  icon = gtk_icon_theme_load_icon (icon_theme,
+   system-reboot,
+   32,
+   GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+   NULL);
+ 
   if (!icon)
-icon = xfce_themed_icon_load (xfsm-reboot, 32);
+icon = gtk_icon_theme_load_icon (icon_theme,
+ xfsm-reboot,
+ 32,
+ GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ NULL);
+ 
   image = gtk_image_new_from_pixbuf (icon);
   gtk_widget_show (image);
   gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0);
@@ -449,14 +471,24 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (halt_button), vbox2);
 
-  icon = xfce_themed_icon_load (system-shutdown, 32);
+  icon = gtk_icon_theme_load_icon (icon_theme,
+   system-shutdown,
+   32,
+   GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+   NULL);
+
   if (!icon)
-icon = xfce_themed_icon_load (xfsm-shutdown, 32);
+icon = gtk_icon_theme_load_icon (icon_theme,
+ xfsm-shutdown,
+ 32,
+ GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ NULL);
+
   image = gtk_image_new_from_pixbuf (icon);
   gtk_widget_show (image);
   gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0);
   g_object_unref (icon);
-  
+
   label = gtk_label_new (_(Shut Down));
   gtk_widget_show (label);
   gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
@@ -468,7 +500,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
 show_suspend = xfsm_shutdown_helper_supports (shutdown_helper, 
XFSM_SHUTDOWN_SUSPEND);
   if (show_hibernate)
 show_hibernate = xfsm_shutdown_helper_supports (shutdown_helper, 
XFSM_SHUTDOWN_HIBERNATE);
-  
+
   if (kiosk_can_shutdown  (show_suspend || show_hibernate))
 {
   hbox = gtk_hbox_new (FALSE, BORDER);
@@ -491,9 +523,19 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (suspend_button), vbox2);
 
-  icon = xfce_themed_icon_load 

[Xfce4-commits] xfce4-session:master Import initial work from perldude's patch.

[Nick Schermer]

Updating branch refs/heads/master
 to 504890be4d2ec737ec8ed013852b2a04a1fbc063 (commit)
   from 25ddcb50714883c34ba6a97606a230dbba1f641a (commit)

commit 504890be4d2ec737ec8ed013852b2a04a1fbc063
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Wed Jan 20 08:16:32 2010 +0100

Import initial work from perldude's patch.

 configure.in.in|2 +-
 engines/balou/Makefile.am  |2 +-
 engines/balou/config.c |   33 +
 engines/mice/Makefile.am   |8 
 engines/simple/Makefile.am |6 +++---
 engines/simple/simple.c|   22 +++---
 libxfsm/Makefile.am|4 ++--
 libxfsm/xfsm-util.c|   22 +++---
 settings/Makefile.am   |4 ++--
 settings/main.c|5 ++---
 settings/module.c  |   10 +-
 settings/session-editor.c  |4 ++--
 settings/splash-settings.c |   12 ++--
 settings/xfae-dialog.c |6 +++---
 settings/xfae-dialog.h |6 +++---
 settings/xfae-model.c  |   13 -
 settings/xfae-model.h  |6 +++---
 settings/xfae-window.c |   20 +++-
 xfce4-session/Makefile.am  |4 ++--
 xfce4-session/main.c   |2 +-
 xfce4-session/shutdown.c   |8 +---
 21 files changed, 103 insertions(+), 96 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 905f23a..9b09044 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -70,7 +70,7 @@ XDT_I18N([...@linguas@])
 
 dnl Check for required packages
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.6.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.6.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
 XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12])
 XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
index d9743b8..387d374 100644
--- a/engines/balou/Makefile.am
+++ b/engines/balou/Makefile.am
@@ -18,7 +18,7 @@ libbalou_la_SOURCES = 
\
 
 libbalou_la_CFLAGS =   \
-I$(top_srcdir) \
-   $(LIBXFCEGUI4_CFLAGS)   \
+   $(LIBXFCE4UI_CFLAGS)\
$(XFCONF_CFLAGS)\
-DBALOU_EXPORT_THEME=\$(libexecdir)/balou-export-theme\   \
-DBALOU_INSTALL_THEME=\$(libexecdir)/balou-install-theme\
diff --git a/engines/balou/config.c b/engines/balou/config.c
index e618d60..4f0d355 100644
--- a/engines/balou/config.c
+++ b/engines/balou/config.c
@@ -7,12 +7,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- * 
 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -39,7 +39,7 @@
 
 #include gmodule.h
 
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 #include libxfsm/xfsm-splash-engine.h
 
@@ -393,7 +393,7 @@ config_remove_theme (GtkWidget *item,
 
   if (!result || status != 0)
 {
-  xfce_err (_(Unable to remove splash theme \%s\ from directory 
+  xfce_dialog_show_error (NULL, NULL, _(Unable to remove splash theme 
\%s\ from directory 
   %s.), name, directory);
 }
   else
@@ -417,7 +417,7 @@ config_do_export_theme (const gchar *name,
   gchar   *themerc;
   gchar   *argv[4];
   gint status;
-  
+
   resource = g_strconcat (name, /balou/themerc, NULL);
   themerc = xfce_resource_lookup (XFCE_RESOURCE_THEMES, resource);
   g_free (resource);
@@ -478,18 +478,19 @@ config_export_theme (GtkWidget *item,
 return;
 
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (treeview));
-  dialog = xfce_file_chooser_new (_(Choose theme filename...),
-  GTK_WINDOW (toplevel),
-  XFCE_FILE_CHOOSER_ACTION_SAVE,
-  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-  GTK_STOCK_SAVE, GTK_RESPONSE_OK,
-  NULL);
+
+  dialog = gtk_file_chooser_dialog_new (_(Choose theme filename...),
+GTK_WINDOW (toplevel),
+   

[Xfce4-commits] xfce4-session:master Use the new API to launch command lines.

[Nick Schermer]

Updating branch refs/heads/master
 to 4db997ae46afe91c3eecaf145e0bcfa46272ef20 (commit)
   from 4aee9c13fb775ad1c8ca923e12023c621124d361 (commit)

commit 4db997ae46afe91c3eecaf145e0bcfa46272ef20
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 23:58:52 2010 +0100

Use the new API to launch command lines.

 xfce4-session/xfsm-startup.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
index 9f8f08f..0972af5 100644
--- a/xfce4-session/xfsm-startup.c
+++ b/xfce4-session/xfsm-startup.c
@@ -389,7 +389,11 @@ xfsm_startup_autostart_xdg (void)
 
   /* try to launch the command */
   xfsm_verbose (Autostart: running command \%s\\n, exec);
-  if (!xfce_exec (exec, terminal, startup_notify, error))
+  if (!xfce_spawn_command_line_on_screen (gdk_screen_get_default (),
+  exec,
+  terminal,
+  startup_notify,
+  error))
 {
   g_warning (Unable to launch \%s\ (specified by %s): %s, 
exec, files[n], error-message);
   g_error_free (error);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Fix typos in the panel plugin.

[Nick Schermer]

Updating branch refs/heads/master
 to 9693d6f71bf1821f1233b01fada35801f677ebf7 (commit)
   from 0f03c6c55e258453cffd0170aab6ccac48fd4bb9 (commit)

commit 9693d6f71bf1821f1233b01fada35801f677ebf7
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 23:54:12 2010 +0100

Fix typos in the panel plugin.

 panel-plugin/xfsm-logout-plugin.c |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/xfsm-logout-plugin.c 
b/panel-plugin/xfsm-logout-plugin.c
index d839acb..99bb015 100644
--- a/panel-plugin/xfsm-logout-plugin.c
+++ b/panel-plugin/xfsm-logout-plugin.c
@@ -144,7 +144,7 @@ xfsm_logout_plugin_lock_screen(GtkAction *action,
 {
 GError *error = NULL;
 
-if (!g_spawn_command_line_async(xflock4, error)) {
+if (!g_spawn_command_line_async(xflock4, error)) {
 xfce_dialog_show_error (NULL,
 error,
 _(Xfclock4 could not be launched));
@@ -309,7 +309,8 @@ 
xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
 if(!xfsm_logout_plugin_do_dbus_call(logout_plugin, type, error)) {
 xfce_dialog_show_warning (NULL,
   error-message,
-  _(dialog_strings[type].error_text));
+  %s,
+  dialog_strings[type].error_text);
 g_error_free(error);
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Simplify the casts in the session editor.

[Nick Schermer]

Updating branch refs/heads/master
 to 1a08a52e6f8750f09f6a82a5f1410caaf2297551 (commit)
   from 99fef1bfdca9866d54a1e0e883044e4c91bac481 (commit)

commit 1a08a52e6f8750f09f6a82a5f1410caaf2297551
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Sun Jan 24 22:47:48 2010 +0100

Simplify the casts in the session editor.

 settings/session-editor.c |   15 ---
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/settings/session-editor.c b/settings/session-editor.c
index d29a764..1bd324f 100644
--- a/settings/session-editor.c
+++ b/settings/session-editor.c
@@ -699,7 +699,8 @@ session_editor_populate_treeview(GtkTreeView *treeview)
 void
 session_editor_init(GtkBuilder *builder)
 {
-GObject *treeview, *btn_save, *btn_quit, *dlg_saving;
+GObject *btn_save, *btn_quit, *dlg_saving;
+GtkTreeView *treeview;
 GtkTreeSelection *sel;
 
 dbus_g_object_register_marshaller(g_cclosure_marshal_VOID__STRING,
@@ -712,12 +713,12 @@ session_editor_init(GtkBuilder *builder)
   G_TYPE_NONE, G_TYPE_UINT, G_TYPE_UINT,
   G_TYPE_INVALID);
 
-treeview = gtk_builder_get_object(builder, treeview_clients);
-sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-session_editor_populate_treeview(GTK_TREE_VIEW(treeview));
+treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, 
treeview_clients));
+sel = gtk_tree_view_get_selection(treeview);
+session_editor_populate_treeview(treeview);
 
 dlg_saving = gtk_builder_get_object(builder, dialog_saving);
-g_object_set_data(G_OBJECT(dlg_saving), pbar,
+g_object_set_data(dlg_saving, pbar,
   GTK_WIDGET(gtk_builder_get_object(builder, 
progress_save_session)));
 
 btn_save = gtk_builder_get_object(builder, btn_save_session);
@@ -726,7 +727,7 @@ session_editor_init(GtkBuilder *builder)
 
 btn_quit = gtk_builder_get_object(builder, btn_quit_client);
 g_signal_connect(btn_quit, clicked,
-   G_CALLBACK(session_editor_quit_client), treeview);
+ G_CALLBACK(session_editor_quit_client), treeview);
 g_signal_connect(sel, changed,
-   G_CALLBACK(session_editor_sel_changed_btn), 
GTK_WIDGET(btn_quit));
+ G_CALLBACK(session_editor_sel_changed_btn), 
GTK_WIDGET(btn_quit));
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Update the build system for libxfce4ui.

[Nick Schermer]

Updating branch refs/heads/master
 to 0f03c6c55e258453cffd0170aab6ccac48fd4bb9 (commit)
   from cd25664c090036790eef891893208ca826d84439 (commit)

commit 0f03c6c55e258453cffd0170aab6ccac48fd4bb9
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 23:53:01 2010 +0100

Update the build system for libxfce4ui.

 libxfsm/xfsm-util.h|1 +
 xfce4-session-logout/Makefile.am   |4 ++--
 xfce4-session-logout/main.c|2 +-
 xfce4-session/xfsm-chooser.c   |2 +-
 xfce4-session/xfsm-dns.c   |2 +-
 xfce4-session/xfsm-global.c|2 +-
 xfce4-session/xfsm-legacy.c|2 +-
 xfce4-session/xfsm-manager.c   |2 +-
 xfce4-session/xfsm-splash-screen.c |2 +-
 xfce4-session/xfsm-startup.c   |2 +-
 xfce4-tips/Makefile.am |4 ++--
 11 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/libxfsm/xfsm-util.h b/libxfsm/xfsm-util.h
index d7b9d9b..7bab34c 100644
--- a/libxfsm/xfsm-util.h
+++ b/libxfsm/xfsm-util.h
@@ -27,6 +27,7 @@
 #include gtk/gtk.h
 
 #include libxfce4util/libxfce4util.h
+#include libxfce4ui/libxfce4ui.h
 
 G_BEGIN_DECLS;
 
diff --git a/xfce4-session-logout/Makefile.am b/xfce4-session-logout/Makefile.am
index 354c760..2e73c3d 100644
--- a/xfce4-session-logout/Makefile.am
+++ b/xfce4-session-logout/Makefile.am
@@ -10,11 +10,11 @@ xfce4_session_logout_SOURCES =  
\
 xfce4_session_logout_CFLAGS =  \
-I$(top_srcdir) \
$(DBUS_CFLAGS)  \
-   $(LIBXFCEGUI4_CFLAGS)
+   $(LIBXFCE4UI_CFLAGS)
 
 xfce4_session_logout_LDFLAGS = \
$(DBUS_LIBS)\
-   $(LIBXFCEGUI4_LIBS)
+   $(LIBXFCE4UI_LIBS)
 
 EXTRA_DIST =   \
$(man_MANS)
diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c
index cfeadc9..a0765dc 100644
--- a/xfce4-session-logout/main.c
+++ b/xfce4-session-logout/main.c
@@ -38,7 +38,7 @@
 #include dbus/dbus.h
 
 #include gtk/gtk.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 
 /* copied from xfce4-session/shutdown.h -- ORDER MATTERS.  The numbers
diff --git a/xfce4-session/xfsm-chooser.c b/xfce4-session/xfsm-chooser.c
index b23a5b9..1ccea77 100644
--- a/xfce4-session/xfsm-chooser.c
+++ b/xfce4-session/xfsm-chooser.c
@@ -34,7 +34,7 @@
 #endif
 
 #include libxfce4util/libxfce4util.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 #include libxfsm/xfsm-splash-engine.h
 #include libxfsm/xfsm-util.h
diff --git a/xfce4-session/xfsm-dns.c b/xfce4-session/xfsm-dns.c
index 3b5d5fa..2237c68 100644
--- a/xfce4-session/xfsm-dns.c
+++ b/xfce4-session/xfsm-dns.c
@@ -51,7 +51,7 @@
 
 #include gtk/gtk.h
 
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 #include libxfsm/xfsm-util.h
 
diff --git a/xfce4-session/xfsm-global.c b/xfce4-session/xfsm-global.c
index 9aa98d0..e582403 100644
--- a/xfce4-session/xfsm-global.c
+++ b/xfce4-session/xfsm-global.c
@@ -43,7 +43,7 @@
 #endif
 
 #include libxfce4util/libxfce4util.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 #include xfce4-session/shutdown.h
 #include xfce4-session/xfsm-global.h
diff --git a/xfce4-session/xfsm-legacy.c b/xfce4-session/xfsm-legacy.c
index eb85794..2860d26 100644
--- a/xfce4-session/xfsm-legacy.c
+++ b/xfce4-session/xfsm-legacy.c
@@ -71,7 +71,7 @@
 
 #include gdk/gdkx.h
 
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 #include libwnck/libwnck.h
 
diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index 6aa3543..8c78975 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -74,7 +74,7 @@
 #include libwnck/libwnck.h
 
 #include xfsm-shutdown-helper.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 #include libxfsm/xfsm-splash-engine.h
 #include libxfsm/xfsm-util.h
diff --git a/xfce4-session/xfsm-splash-screen.c 
b/xfce4-session/xfsm-splash-screen.c
index bbb3dd7..feb71cc 100644
--- a/xfce4-session/xfsm-splash-screen.c
+++ b/xfce4-session/xfsm-splash-screen.c
@@ -34,7 +34,7 @@
 
 #include xfconf/xfconf.h
 #include libxfce4util/libxfce4util.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 #include libxfsm/xfsm-splash-engine.h
 #include libxfsm/xfsm-util.h
diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
index ddf6ad4..9f8f08f 100644
--- a/xfce4-session/xfsm-startup.c
+++ b/xfce4-session/xfsm-startup.c
@@ -46,7 +46,7 @@
 
 #include glib/gstdio.h
 
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 #include libxfsm/xfsm-util.h
 
diff --git a/xfce4-tips/Makefile.am b/xfce4-tips/Makefile.am
index 

[Xfce4-commits] xfce4-session:master Fix identation.

[Nick Schermer]

Updating branch refs/heads/master
 to 339121445f484ec5b4e3a1584caa06da1ad6f06f (commit)
   from 1a08a52e6f8750f09f6a82a5f1410caaf2297551 (commit)

commit 339121445f484ec5b4e3a1584caa06da1ad6f06f
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Mon Jan 25 23:50:19 2010 +0100

Fix identation.

 settings/main.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index 8588dd4..93c0498 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -137,7 +137,7 @@ main(int argc,
 g_signal_connect(dialog, delete-event, G_CALLBACK(gtk_main_quit), 
NULL);
 
 gtk_widget_show(dialog);
-gtk_main ();
+gtk_main();
 } else {
 GtkWidget *plug, *plug_child;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Add a local function to get the display full name.

[Nick Schermer]

Updating branch refs/heads/master
 to cd25664c090036790eef891893208ca826d84439 (commit)
   from 68d8c335e2ae1afe2d5f469560f0db8d95d51550 (commit)

commit cd25664c090036790eef891893208ca826d84439
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 23:51:36 2010 +0100

Add a local function to get the display full name.

 libxfsm/xfsm-util.c  |   78 +++---
 libxfsm/xfsm-util.h  |3 ++
 xfce4-session/shutdown.c |2 +-
 xfce4-session/xfsm-global.c  |2 +-
 xfce4-session/xfsm-manager.c |2 +-
 5 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/libxfsm/xfsm-util.c b/libxfsm/xfsm-util.c
index 1a76a79..2639153 100644
--- a/libxfsm/xfsm-util.c
+++ b/libxfsm/xfsm-util.c
@@ -76,41 +76,10 @@ xfsm_start_application (gchar  **command,
 {
   if (client_machine != NULL)
 {
-  const gchar *name;
-  const gchar *np;
-  GdkDisplay  *display;
-  gchar   *hostname;
-  gcharbuffer[256];
-  gchar   *bp;
-
-  display = gdk_screen_get_display (screen);
-
-  name = gdk_display_get_name (display);
-  if (*name == ':')
-{
-  hostname = xfce_gethostname ();
-  g_strlcpy (buffer, hostname, 256);
-  g_free (hostname);
-
-  bp = buffer + strlen (buffer);
-
-  for (np = name; *np != '\0'  *np != '.'  bp  buffer + 255; )
-*bp++ = *np++;
-  *bp = '\0';
-}
-  else
-{
-  g_strlcpy (buffer, name, 256);
-
-  for (bp = buffer + strlen (buffer) - 1; *bp != ':'; --bp)
-if (*bp == '.')
-  {
-*bp = '\0';
-break;
-  }
-}
-
-  screen_name = g_strdup_printf (%s.%d, buffer,
+  gchar *display_name =
+xfsm_gdk_display_get_fullname (gdk_screen_get_display (screen));
+
+  screen_name = g_strdup_printf (%s.%d, display_name,
  gdk_screen_get_number (screen));
 }
   else
@@ -225,3 +194,42 @@ xfsm_open_config (void)
   return xfconf_channel_get (xfce4-session);
 }
 
+gchar*
+xfsm_gdk_display_get_fullname (GdkDisplay *display)
+{
+  const gchar *name;
+  const gchar *np;
+  gchar   *hostname;
+  gcharbuffer[256];
+  gchar   *bp;
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  name = gdk_display_get_name (display);
+  if (*name == ':')
+{
+  hostname = xfce_gethostname ();
+  g_strlcpy (buffer, hostname, 256);
+  g_free (hostname);
+
+  bp = buffer + strlen (buffer);
+
+  for (np = name; *np != '\0'  *np != '.'  bp  buffer + 255; )
+*bp++ = *np++;
+  *bp = '\0';
+}
+  else
+{
+  g_strlcpy (buffer, name, 256);
+
+  for (bp = buffer + strlen (buffer) - 1; *bp != ':'; --bp)
+if (*bp == '.')
+  {
+*bp = '\0';
+break;
+  }
+}
+
+  return g_strdup (buffer);
+}
+
diff --git a/libxfsm/xfsm-util.h b/libxfsm/xfsm-util.h
index d479bee..d7b9d9b 100644
--- a/libxfsm/xfsm-util.h
+++ b/libxfsm/xfsm-util.h
@@ -50,6 +50,9 @@ void xfsm_window_grab_input (GtkWindow *window);
 
 XfconfChannel *xfsm_open_config (void);
 
+gchar *xfsm_gdk_display_get_fullname (GdkDisplay *display);
+
+
 G_END_DECLS;
 
 #endif /* !__XFSM_UTIL_H__ */
diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c
index 96252e8..5853604 100644
--- a/xfce4-session/shutdown.c
+++ b/xfce4-session/shutdown.c
@@ -96,7 +96,7 @@ screenshot_save (const gchar *session_name, GdkPixmap *pm, 
GdkRectangle *area)
 {
   /* determine thumb file */
   dpy = gdk_drawable_get_display (GDK_DRAWABLE (pm));
-  display_name = xfce_gdk_display_get_fullname (dpy);
+  display_name = xfsm_gdk_display_get_fullname (dpy);
   resource = g_strconcat (sessions/thumbs-, display_name,
   /, session_name, .png, NULL);
   filename = xfce_resource_save_location (XFCE_RESOURCE_CACHE,
diff --git a/xfce4-session/xfsm-global.c b/xfce4-session/xfsm-global.c
index 9d6a434..9aa98d0 100644
--- a/xfce4-session/xfsm-global.c
+++ b/xfce4-session/xfsm-global.c
@@ -150,7 +150,7 @@ xfsm_load_session_preview (const gchar *name)
 
   /* determine thumb file */
   display = gdk_display_get_default ();
-  display_name = xfce_gdk_display_get_fullname (display);
+  display_name = xfsm_gdk_display_get_fullname (display);
   resource = g_strconcat (sessions/thumbs-, display_name,
   /, name, .png, NULL);
   filename = xfce_resource_save_location (XFCE_RESOURCE_CACHE, resource, TRUE);
diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index 4f9e60e..6aa3543 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -726,7 

[Xfce4-commits] xfce4-session:master First try for centering dialogs.

[Nick Schermer]

Updating branch refs/heads/master
 to 516732b546ad404d3c786e6b857043211b645e94 (commit)
   from f8799778d2f6d3d9f54bee89392a7376d5bf5ebd (commit)

commit 516732b546ad404d3c786e6b857043211b645e94
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 23:57:59 2010 +0100

First try for centering dialogs.

 xfce4-session/shutdown.c   |   12 +++-
 xfce4-session/xfsm-dns.c   |5 -
 xfce4-session/xfsm-splash-screen.c |8 
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c
index cd6cc6b..3a3aae7 100644
--- a/xfce4-session/shutdown.c
+++ b/xfce4-session/shutdown.c
@@ -601,9 +601,10 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
   /* create small border */
   if (!accessibility)
 xfsm_window_add_border (GTK_WINDOW (dialog));
-  
+
   /* center dialog on target monitor */
-  gtk_window_center_on_monitor (GTK_WINDOW (dialog), screen, monitor);
+  gtk_window_set_screen (GTK_WINDOW (dialog), screen);
+  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 
   /* save portion of the root window covered by the dialog */
   if (!accessibility  shutdown_helper != NULL)
@@ -656,7 +657,8 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
   gtk_widget_show (entry);
 
   /* center dialog on target monitor */
-  xfce_gtk_window_center_on_monitor (GTK_WINDOW (dialog), screen, monitor);
+  gtk_window_set_screen (GTK_WINDOW (dialog), screen);
+  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 
   gtk_widget_show_now (dialog);
   gtk_widget_grab_focus (entry);
@@ -697,8 +699,8 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
   gtk_widget_show (label);
 
   /* center dialog on target monitor */
-  xfce_gtk_window_center_on_monitor (GTK_WINDOW (dialog),
- screen, monitor);
+  gtk_window_set_screen (GTK_WINDOW (dialog), screen);
+  gtk_window_set_position (GTK_WINDOW (dialog), 
GTK_WIN_POS_CENTER);
 
   gtk_widget_show_now (dialog);
 
diff --git a/xfce4-session/xfsm-dns.c b/xfce4-session/xfsm-dns.c
index 2237c68..aab3bcb 100644
--- a/xfce4-session/xfsm-dns.c
+++ b/xfce4-session/xfsm-dns.c
@@ -137,6 +137,8 @@ xfsm_dns_check (void)
 {
   if (msgbox == NULL)
 {
+  GdkScreen *screen = xfce_gdk_screen_get_active (NULL);
+
   queryhostname (hostname, 256, TRUE);
 
   msgbox = gtk_message_dialog_new (NULL, 0,
@@ -153,8 +155,9 @@ xfsm_dns_check (void)
   _(Try again), RESPONSE_TRY_AGAIN,
   NULL);
 
+  gtk_window_set_screen (GTK_WINDOW (msgbox), screen);
   xfsm_window_add_border (GTK_WINDOW (msgbox));
-  xfce_gtk_window_center_on_monitor_with_pointer (GTK_WINDOW (msgbox));
+  gtk_window_set_position (GTK_WINDOW (msgbox), GTK_WIN_POS_CENTER);
 }
 
   gtk_dialog_set_default_response (GTK_DIALOG (msgbox), 
RESPONSE_TRY_AGAIN);
diff --git a/xfce4-session/xfsm-splash-screen.c 
b/xfce4-session/xfsm-splash-screen.c
index feb71cc..f22ac57 100644
--- a/xfce4-session/xfsm-splash-screen.c
+++ b/xfce4-session/xfsm-splash-screen.c
@@ -66,7 +66,8 @@ xfsm_splash_screen_new (GdkDisplay  *display,
   XfconfChannel*channel;
 
   /* locate monitor with pointer */
-  screen = xfce_gdk_display_locate_monitor_with_pointer (display, monitor);
+  screen = xfce_gdk_screen_get_active (monitor);
+
   if (G_UNLIKELY (screen == NULL))
 {
   screen  = gdk_display_get_screen (display, 0);
@@ -139,9 +140,8 @@ xfsm_splash_screen_run (XfsmSplashScreen *splash,
 }
   else
 {
-  xfce_gtk_window_center_on_monitor (GTK_WINDOW (dialog),
- splash-engine.primary_screen,
- splash-engine.primary_monitor);
+  gtk_window_set_screen (GTK_WINDOW (dialog), 
splash-engine.primary_screen);
+  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 
   result = gtk_dialog_run (GTK_DIALOG (dialog));
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Use the new API to create mixed buttons.

[Nick Schermer]

Updating branch refs/heads/master
 to 4aee9c13fb775ad1c8ca923e12023c621124d361 (commit)
   from 516732b546ad404d3c786e6b857043211b645e94 (commit)

commit 4aee9c13fb775ad1c8ca923e12023c621124d361
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 22 23:58:22 2010 +0100

Use the new API to create mixed buttons.

 xfce4-session/xfsm-chooser.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xfce4-session/xfsm-chooser.c b/xfce4-session/xfsm-chooser.c
index 1ccea77..7ed0e0a 100644
--- a/xfce4-session/xfsm-chooser.c
+++ b/xfce4-session/xfsm-chooser.c
@@ -236,7 +236,7 @@ xfsm_chooser_init (XfsmChooser *chooser)
   gtk_widget_show (chooser-tree);
 
   /* Logout button */
-  button = xfce_create_mixed_button (GTK_STOCK_QUIT, _(Log out));
+  button = xfce_gtk_button_new_mixed (GTK_STOCK_QUIT, _(Log out));
   gtk_tooltips_set_tip (chooser-tooltips, button,
 _(Cancel the login attempt and return to 
   the login screen.),
@@ -246,7 +246,7 @@ xfsm_chooser_init (XfsmChooser *chooser)
   gtk_widget_show (button);
 
   /* New button */
-  button = xfce_create_mixed_button (GTK_STOCK_NEW, _(New session));
+  button = xfce_gtk_button_new_mixed (GTK_STOCK_NEW, _(New session));
   gtk_tooltips_set_tip (chooser-tooltips, button,
 _(Create a new session.),
 NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Fix the response handling of the settings dialog.

[Nick Schermer]

Updating branch refs/heads/master
 to 99fef1bfdca9866d54a1e0e883044e4c91bac481 (commit)
   from 44df9f7e55887fbecd7c948473cfa8d297a3cee3 (commit)

commit 99fef1bfdca9866d54a1e0e883044e4c91bac481
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Sun Jan 24 18:18:34 2010 +0100

Fix the response handling of the settings dialog.

The close button and the help button did not work anymore. Add a handler
for the response and delete-event signals.

 settings/main.c   |   18 +++---
 settings/xfce4-session-settings.glade |4 
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index e5ebecc..8588dd4 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -44,6 +44,17 @@ static GOptionEntry option_entries[] =
 { NULL }
 };
 
+static void xfce4_session_settings_dialog_response (GtkDialog *dialog, gint 
response, gpointer userdata)
+{
+if (response == GTK_RESPONSE_HELP) {
+   g_signal_stop_emission_by_name(dialog, response);
+   g_spawn_command_line_async(xfhelp4 xfce4-session.html, NULL);
+}
+else {
+  gtk_widget_destroy(GTK_WIDGET(dialog));
+  gtk_main_quit ();
+}
+}
 
 int
 main(int argc,
@@ -122,10 +133,11 @@ main(int argc,
 if(G_UNLIKELY(opt_socket_id == 0)) {
 GtkWidget *dialog = GTK_WIDGET(gtk_builder_get_object(builder, 
xfce4_session_settings_dialog));
 
-while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP)
-g_spawn_command_line_async(xfhelp4 xfce4-session.html, NULL);
+g_signal_connect(dialog, response, 
G_CALLBACK(xfce4_session_settings_dialog_response), NULL);
+g_signal_connect(dialog, delete-event, G_CALLBACK(gtk_main_quit), 
NULL);
 
-gtk_widget_destroy(dialog);
+gtk_widget_show(dialog);
+gtk_main ();
 } else {
 GtkWidget *plug, *plug_child;
 
diff --git a/settings/xfce4-session-settings.glade 
b/settings/xfce4-session-settings.glade
index d84e17e..f09cf9e 100644
--- a/settings/xfce4-session-settings.glade
+++ b/settings/xfce4-session-settings.glade
@@ -716,6 +716,10 @@
 /child
   /object
 /child
+action-widgets
+  action-widget response=-11button1/action-widget
+  action-widget response=-7button2/action-widget
+/action-widgets
   /object
   object class=GtkDialog id=dialog_saving
 property name=border_width5/property
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Fix screen/monitor issues introduced while porting.

[Nick Schermer]

Updating branch refs/heads/master
 to 0ba455094a0ff6351b4ddaff28f20611a3d368d6 (commit)
   from b42cf9f4297a0aa69678c842e72aee9f77eedfc8 (commit)

commit 0ba455094a0ff6351b4ddaff28f20611a3d368d6
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Mon Jan 25 23:51:33 2010 +0100

Fix screen/monitor issues introduced while porting.

 settings/module.c  |4 ++--
 xfce4-session/shutdown.c   |5 +
 xfce4-session/xfsm-splash-screen.c |2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/settings/module.c b/settings/module.c
index 4892f72..082dfba 100644
--- a/settings/module.c
+++ b/settings/module.c
@@ -203,8 +203,8 @@ module_test (Module *module,
   bzero (engine, sizeof (engine));
 
   /* locate monitor with pointer */
-  screen = gdk_display_get_screen (display, monitor);
-  if (G_UNLIKELY (screen == NULL))
+  screen = xfce_gdk_screen_get_active (monitor);
+  if (G_UNLIKELY (screen == NULL) || (gdk_screen_get_display(screen) != 
display))
 {
   screen  = gdk_display_get_screen (display, 0);
   monitor = 0;
diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c
index 3a3aae7..4b69e9d 100644
--- a/xfce4-session/shutdown.c
+++ b/xfce4-session/shutdown.c
@@ -170,7 +170,6 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
   gboolean accessibility;
   GtkIconTheme *icon_theme;
   XfsmFadeout *fadeout = NULL;
-  GdkDisplay *display;
   GdkScreen *screen;
   GtkWidget *dialog;
   GtkWidget *label;
@@ -266,10 +265,8 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType 
*shutdownType, gboolea
*/
   gtk_rc_reparse_all ();
 
-  display = gdk_display_get_default();
-
   /* get screen with pointer */
-  screen = gdk_display_get_screen(display, monitor);
+  screen = xfce_gdk_screen_get_active (monitor);
   if (screen == NULL)
 {
   screen = gdk_screen_get_default ();
diff --git a/xfce4-session/xfsm-splash-screen.c 
b/xfce4-session/xfsm-splash-screen.c
index f22ac57..d22a098 100644
--- a/xfce4-session/xfsm-splash-screen.c
+++ b/xfce4-session/xfsm-splash-screen.c
@@ -68,7 +68,7 @@ xfsm_splash_screen_new (GdkDisplay  *display,
   /* locate monitor with pointer */
   screen = xfce_gdk_screen_get_active (monitor);
 
-  if (G_UNLIKELY (screen == NULL))
+  if (G_UNLIKELY (screen == NULL) || (gdk_screen_get_display (screen) != 
display))
 {
   screen  = gdk_display_get_screen (display, 0);
   monitor = 0;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Improve some error messages.

[Nick Schermer]

Updating branch refs/heads/master
 to ece9e4db0f7df4e04be7c9f3d55c3aab17dcaed9 (commit)
   from 0ba455094a0ff6351b4ddaff28f20611a3d368d6 (commit)

commit ece9e4db0f7df4e04be7c9f3d55c3aab17dcaed9
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Wed Jan 27 22:27:15 2010 +0100

Improve some error messages.

 settings/xfae-window.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/xfae-window.c b/settings/xfae-window.c
index 839e731..fa048a3 100644
--- a/settings/xfae-window.c
+++ b/settings/xfae-window.c
@@ -274,7 +274,7 @@ xfae_window_add (XfaeWindow *window)
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (window-treeview));
   if (!xfae_model_add (XFAE_MODEL (model), name, descr, command, error))
 {
-  xfce_dialog_show_error (NULL, error, _(Error));
+  xfce_dialog_show_error (NULL, error, _(Error when adding %s), 
name);
   g_error_free (error);
 }
 
@@ -300,7 +300,7 @@ xfae_window_remove (XfaeWindow *window)
 {
   if (!xfae_model_remove (XFAE_MODEL (model), iter, error))
 {
-  xfce_dialog_show_error (NULL, error, _(Error));
+  xfce_dialog_show_error (NULL, error, _(Error when removing the 
current item));
   g_error_free (error);
 }
 }
@@ -323,7 +323,7 @@ xfae_window_item_toggled (XfaeWindow *window,
 {
   if (!xfae_model_toggle (XFAE_MODEL (model), iter, error))
 {
-  xfce_dialog_show_error (NULL, error, _(Error));
+  xfce_dialog_show_error (NULL, error, _(Error when toggling the 
current item));
   g_error_free (error);
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Fix warning when setting the default filter.

[Nick Schermer]

Updating branch refs/heads/master
 to 03defe7279d31c6ea6fa14232a30fe4434e5645d (commit)
   from 8f30d3dbd24aa678d0331b8369abf4a2fcdc0e3d (commit)

commit 03defe7279d31c6ea6fa14232a30fe4434e5645d
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 19:09:46 2010 +0100

Fix warning when setting the default filter.

 engines/simple/simple.c |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/engines/simple/simple.c b/engines/simple/simple.c
index f4da626..da4e5e3 100644
--- a/engines/simple/simple.c
+++ b/engines/simple/simple.c
@@ -419,14 +419,13 @@ config_configure (XfsmSplashConfig *config,
   gtk_file_filter_set_name (filter, _(Images));
   gtk_file_filter_add_pixbuf_formats (filter);
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (button), filter);
+  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (button), filter);
 
   filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _(All files));
   gtk_file_filter_add_pattern (filter, *);
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (button), filter);
 
-  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (button), 0);
-
   path = xfsm_splash_rc_read_entry (config-rc, Image, NULL);
   if (path != NULL)
 path_locale = g_filename_from_utf8 (path, -1, NULL, NULL, NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Pack the widgets in the returned bin of the framebox.

[Nick Schermer]

Updating branch refs/heads/master
 to c59e0733a7fcf79778b6f51d4846981070dbd88c (commit)
   from 9b5077215b589fc5fb96173adad950d1b7ed8601 (commit)

commit c59e0733a7fcf79778b6f51d4846981070dbd88c
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 18:57:47 2010 +0100

Pack the widgets in the returned bin of the framebox.

This fixes the following warning:
(xfce4-session-settings:3386): Gtk-WARNING **: Attempting to add a
widget with type GtkFontButton to a GtkFrame, but as a GtkBin subclass
a GtkFrame can only contain one widget at a time; it already contains
a widget of type GtkAlignment

 engines/balou/config.c  |5 +++--
 engines/simple/simple.c |   13 +++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/engines/balou/config.c b/engines/balou/config.c
index 4f0d355..19d3fa4 100644
--- a/engines/balou/config.c
+++ b/engines/balou/config.c
@@ -847,16 +847,17 @@ config_create (XfsmSplashRc *rc)
   GtkWidget *swin;
   GtkWidget *vbox;
   gchar *theme;
+  GtkWidget *bin;
 
   theme = xfsm_splash_rc_read_entry (rc, Theme, Default);
 
   page = gtk_vbox_new (FALSE, BORDER);
   gtk_container_set_border_width (GTK_CONTAINER (page), BORDER);
 
-  frame = xfce_gtk_frame_box_new (_(Balou theme), NULL);
+  frame = xfce_gtk_frame_box_new (_(Balou theme), bin);
   gtk_box_pack_start (GTK_BOX (page), frame, TRUE, TRUE, 0);
   vbox = gtk_vbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_container_add (GTK_CONTAINER (bin), vbox);
 
   swin = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
diff --git a/engines/simple/simple.c b/engines/simple/simple.c
index 233e03e..f4da626 100644
--- a/engines/simple/simple.c
+++ b/engines/simple/simple.c
@@ -341,6 +341,7 @@ config_configure (XfsmSplashConfig *config,
   GdkColor color;
   GtkBox  *dbox;
   gcharbuffer[32];
+  GtkWidget   *bin;
 
   dialog = gtk_dialog_new_with_buttons (_(Configure Simple...),
 GTK_WINDOW (parent),
@@ -353,22 +354,22 @@ config_configure (XfsmSplashConfig *config,
 
   dbox = GTK_BOX (GTK_DIALOG (dialog)-vbox);
 
-  frame = xfce_gtk_frame_box_new (_(Font), NULL);
+  frame = xfce_gtk_frame_box_new (_(Font), bin);
   gtk_box_pack_start (dbox, frame, FALSE, FALSE, 6);
   gtk_widget_show (frame);
 
   font = xfsm_splash_rc_read_entry (config-rc, Font, DEFAULT_FONT);
   btn_font = gtk_font_button_new_with_font (font);
   g_free (font);
-  gtk_container_add (GTK_CONTAINER (frame), btn_font);
+  gtk_container_add (GTK_CONTAINER (bin), btn_font);
   gtk_widget_show (btn_font);
 
-  frame = xfce_gtk_frame_box_new (_(Colors), NULL);
+  frame = xfce_gtk_frame_box_new (_(Colors), bin);
   gtk_box_pack_start (dbox, frame, FALSE, FALSE, 6);
   gtk_widget_show (frame);
 
   table = gtk_table_new (2, 2, FALSE);
-  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_container_add (GTK_CONTAINER (bin), table);
   gtk_widget_show (table);
 
   label = gtk_label_new (_(Background color:));
@@ -397,12 +398,12 @@ config_configure (XfsmSplashConfig *config,
 GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (sel_fg);
 
-  frame = xfce_gtk_frame_box_new (_(Image), NULL);
+  frame = xfce_gtk_frame_box_new (_(Image), bin);
   gtk_box_pack_start (dbox, frame, FALSE, FALSE, 6);
   gtk_widget_show (frame);
 
   vbox = gtk_vbox_new (FALSE, 6);
-  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_container_add (GTK_CONTAINER (bin), vbox);
   gtk_widget_show (vbox);
 
   checkbox = gtk_check_button_new_with_label (_(Use custom image));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Unref the builder at the end of the program.

[Nick Schermer]

Updating branch refs/heads/master
 to b42cf9f4297a0aa69678c842e72aee9f77eedfc8 (commit)
   from 339121445f484ec5b4e3a1584caa06da1ad6f06f (commit)

commit b42cf9f4297a0aa69678c842e72aee9f77eedfc8
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Mon Jan 25 23:50:45 2010 +0100

Unref the builder at the end of the program.

 settings/main.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index 93c0498..71eb929 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -150,13 +150,13 @@ main(int argc,
 gtk_widget_reparent(plug_child, plug);
 gtk_widget_show(plug_child);
 
-g_object_unref(builder);
-
 /* Stop startup notification */
 gdk_notify_startup_complete();
 
 gtk_main();
 }
 
+g_object_unref(builder);
+
 return EXIT_SUCCESS;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Fix orientation properties in glade file.

[Nick Schermer]

Updating branch refs/heads/master
 to 9b5077215b589fc5fb96173adad950d1b7ed8601 (commit)
   from d98536274785cbf3650bf00097fd2e60f9236824 (commit)

commit 9b5077215b589fc5fb96173adad950d1b7ed8601
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 18:12:33 2010 +0100

Fix orientation properties in glade file.

 settings/xfce4-session-settings.glade |  153 -
 1 files changed, 112 insertions(+), 41 deletions(-)

diff --git a/settings/xfce4-session-settings.glade 
b/settings/xfce4-session-settings.glade
index f09cf9e..c815bc5 100644
--- a/settings/xfce4-session-settings.glade
+++ b/settings/xfce4-session-settings.glade
@@ -1,16 +1,19 @@
 ?xml version=1.0?
-!--Generated with glade3 3.4.5 on Wed Nov 12 20:45:14 2008 --
 interface
+  !-- interface-requires gtk+ 2.12 --
+  !-- interface-requires libxfce4ui 4.5 --
+  !-- interface-naming-policy toplevel-contextual --
   object class=XfceTitledDialog id=xfce4_session_settings_dialog
 property name=title translatable=yesSession and Startup/property
-property name=window_positionGTK_WIN_POS_CENTER_ON_PARENT/property
+property name=window_positioncenter-on-parent/property
 property name=icon_namexfce4-session/property
-property name=type_hintGDK_WINDOW_TYPE_HINT_DIALOG/property
+property name=type_hintdialog/property
 property name=has_separatorFalse/property
 property name=subtitle translatable=yesCustomize desktop startup and 
splash screen/property
 child internal-child=vbox
   object class=GtkVBox id=dialog-vbox1
 property name=visibleTrue/property
+property name=orientationvertical/property
 property name=spacing2/property
 child
   object class=GtkNotebook id=plug-child
@@ -21,11 +24,12 @@
   object class=GtkVBox id=vbox1
 property name=visibleTrue/property
 property name=border_width12/property
+property name=orientationvertical/property
 child
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=label_xalign0/property
-property name=shadow_typeGTK_SHADOW_NONE/property
+property name=shadow_typenone/property
 child
   object class=GtkAlignment id=alignment2
 property name=visibleTrue/property
@@ -34,10 +38,11 @@
 property name=left_padding12/property
 child
   object class=GtkCheckButton 
id=chk_display_chooser
+property name=label translatable=yes_Display 
chooser on login/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
-property name=tooltip-text 
translatable=yesDisplay the session chooser every time Xfce starts/property
-property name=label translatable=yes_Display 
chooser on login/property
+property name=receives_defaultFalse/property
+property name=tooltip_text 
translatable=yesDisplay the session chooser every time Xfce starts/property
 property name=use_underlineTrue/property
 property name=draw_indicatorTrue/property
   /object
@@ -54,13 +59,14 @@
   /object
   packing
 property name=expandFalse/property
+property name=position0/property
   /packing
 /child
 child
   object class=GtkFrame id=frame2
 property name=visibleTrue/property
 property name=label_xalign0/property
-property name=shadow_typeGTK_SHADOW_NONE/property
+property name=shadow_typenone/property
 child
   object class=GtkAlignment id=alignment3
 property name=visibleTrue/property
@@ -70,26 +76,30 @@
 child
   object class=GtkVBox id=vbox2
 property name=visibleTrue/property
+property name=orientationvertical/property
 property name=spacing6/property
 child
   object class=GtkCheckButton 
id=chk_session_autosave
+property name=label 
translatable=yesAutomatically save session on _logout/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
-property name=tooltip-text 
translatable=yesAlways save the session 

[Xfce4-commits] xfce4-session:master Send the full error to the error dialog.

[Nick Schermer]

Updating branch refs/heads/master
 to 8f30d3dbd24aa678d0331b8369abf4a2fcdc0e3d (commit)
   from c59e0733a7fcf79778b6f51d4846981070dbd88c (commit)

commit 8f30d3dbd24aa678d0331b8369abf4a2fcdc0e3d
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 19:06:22 2010 +0100

Send the full error to the error dialog.

 engines/balou/config.c |   15 ---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/engines/balou/config.c b/engines/balou/config.c
index 19d3fa4..4349fcc 100644
--- a/engines/balou/config.c
+++ b/engines/balou/config.c
@@ -366,6 +366,8 @@ config_remove_theme (GtkWidget *item,
   gchar*name;
   gchar*argv[4];
   gint  status;
+  GError   *error = NULL;
+  gchar*error_msg = NULL;
 
   iter = (GtkTreeIter *) g_object_get_data (G_OBJECT (menu), iter);
   if (G_UNLIKELY (iter == NULL))
@@ -389,12 +391,18 @@ config_remove_theme (GtkWidget *item,
   argv[3] = NULL;
 
   result = g_spawn_sync (NULL, argv, NULL, 0, NULL, NULL,
- NULL, NULL, status, NULL);
+ NULL, error_msg, status, NULL);
 
   if (!result || status != 0)
 {
-  xfce_dialog_show_error (NULL, NULL, _(Unable to remove splash theme 
\%s\ from directory 
-  %s.), name, directory);
+  if (!error  error_msg)
+g_set_error_literal (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, 
error_msg);
+
+  xfce_dialog_show_error (NULL, error,
+  _(Unable to remove splash theme \%s\ from 
directory %s.),
+  name, directory);
+  if (error)
+g_error_free (error);
 }
   else
 {
@@ -403,6 +411,7 @@ config_remove_theme (GtkWidget *item,
 
   g_free (directory);
   g_free (name);
+  g_free (error_msg);
 }
 #endif
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Use error dialog like in the origional code.

[Nick Schermer]

Updating branch refs/heads/master
 to 2845efd09f75b1d96b765d84b0657f0221f2b6db (commit)
   from 03defe7279d31c6ea6fa14232a30fe4434e5645d (commit)

commit 2845efd09f75b1d96b765d84b0657f0221f2b6db
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 19:14:20 2010 +0100

Use error dialog like in the origional code.

 panel-plugin/xfsm-logout-plugin.c |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/panel-plugin/xfsm-logout-plugin.c 
b/panel-plugin/xfsm-logout-plugin.c
index 99bb015..893ad88 100644
--- a/panel-plugin/xfsm-logout-plugin.c
+++ b/panel-plugin/xfsm-logout-plugin.c
@@ -307,10 +307,10 @@ 
xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
 GError *error = NULL;
 
 if(!xfsm_logout_plugin_do_dbus_call(logout_plugin, type, error)) {
-xfce_dialog_show_warning (NULL,
-  error-message,
-  %s,
-  dialog_strings[type].error_text);
+xfce_dialog_show_error (NULL,
+error,
+%s,
+dialog_strings[type].error_text);
 g_error_free(error);
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master No need to stop any emission.

[Nick Schermer]

Updating branch refs/heads/master
 to 6006cde3628f09dcedb9f58a8e87715bcffaf0d9 (commit)
   from a0bfec50373444222652ae00deeac39c12ce3d6f (commit)

commit 6006cde3628f09dcedb9f58a8e87715bcffaf0d9
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 19:32:29 2010 +0100

No need to stop any emission.

 settings/main.c |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index a81b71e..a1d016d 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -47,7 +47,6 @@ static GOptionEntry option_entries[] =
 static void xfce4_session_settings_dialog_response (GtkDialog *dialog, gint 
response, gpointer userdata)
 {
 if (response == GTK_RESPONSE_HELP) {
-   g_signal_stop_emission_by_name(dialog, response);
g_spawn_command_line_async(xfhelp4 xfce4-session.html, NULL);
 }
 else {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Improve the error messages.

[Nick Schermer]

Updating branch refs/heads/master
 to 121cdb77d44500963fdcbf0f9f675980294b42ff (commit)
   from 5f742e77d8bc25a42ec41ca6b35f9d8f9e36fc26 (commit)

commit 121cdb77d44500963fdcbf0f9f675980294b42ff
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 19:46:29 2010 +0100

Improve the error messages.

 settings/xfae-window.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/xfae-window.c b/settings/xfae-window.c
index fa048a3..48c9edc 100644
--- a/settings/xfae-window.c
+++ b/settings/xfae-window.c
@@ -274,7 +274,7 @@ xfae_window_add (XfaeWindow *window)
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (window-treeview));
   if (!xfae_model_add (XFAE_MODEL (model), name, descr, command, error))
 {
-  xfce_dialog_show_error (NULL, error, _(Error when adding %s), 
name);
+  xfce_dialog_show_error (NULL, error, _(Failed adding \%s\), 
name);
   g_error_free (error);
 }
 
@@ -300,7 +300,7 @@ xfae_window_remove (XfaeWindow *window)
 {
   if (!xfae_model_remove (XFAE_MODEL (model), iter, error))
 {
-  xfce_dialog_show_error (NULL, error, _(Error when removing the 
current item));
+  xfce_dialog_show_error (NULL, error, _(Failed to remove item));
   g_error_free (error);
 }
 }
@@ -323,7 +323,7 @@ xfae_window_item_toggled (XfaeWindow *window,
 {
   if (!xfae_model_toggle (XFAE_MODEL (model), iter, error))
 {
-  xfce_dialog_show_error (NULL, error, _(Error when toggling the 
current item));
+  xfce_dialog_show_error (NULL, error, _(Failed to toggle item));
   g_error_free (error);
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Fix compiler warning.

[Nick Schermer]

Updating branch refs/heads/master
 to d98536274785cbf3650bf00097fd2e60f9236824 (commit)
   from ece9e4db0f7df4e04be7c9f3d55c3aab17dcaed9 (commit)

commit d98536274785cbf3650bf00097fd2e60f9236824
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 18:02:42 2010 +0100

Fix compiler warning.

 xfce4-session/chooser-icon.h |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xfce4-session/chooser-icon.h b/xfce4-session/chooser-icon.h
index 248ca85..0189a8f 100644
--- a/xfce4-session/chooser-icon.h
+++ b/xfce4-session/chooser-icon.h
@@ -8,7 +8,7 @@ static const GdkPixdata chooser_icon_data = {
   52, /* width */
   42, /* height */
   /* pixel_data: */
-  (guchar 
*)\377\0\0\0\0\341\0\0\0\0\202!!-\0\2\37\37*\2\23\23\32\5\213\0\0\0\0\202
+  (guint8 
*)\377\0\0\0\0\341\0\0\0\0\202!!-\0\2\37\37*\2\23\23\32\5\213\0\0\0\0\202
   !!-\0\2\32\32#\2\21\21\27\6\236\0\0\0\0\10!!-\0!!-\1!!-\4!!-\13'4\33
   \247\255\265r\232\237\243\243\17\17\24\11\206\0\0\0\0\11!!-\0!!-\1!!
   -\4!!-\12!\.\24*,;%\252\262\274\207\225\234\243\250\15\15\22\17\232
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Use an error dialog here.

[Nick Schermer]

Updating branch refs/heads/master
 to a0bfec50373444222652ae00deeac39c12ce3d6f (commit)
   from 2845efd09f75b1d96b765d84b0657f0221f2b6db (commit)

commit a0bfec50373444222652ae00deeac39c12ce3d6f
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 19:19:36 2010 +0100

Use an error dialog here.

Bit less information in the dialog, but the error returned from
gtk_builder_add_from_string() will give the user more information
about the actually problem.

 settings/main.c |9 -
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index 71eb929..a81b71e 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -108,13 +108,12 @@ main(int argc,
 gtk_builder_add_from_string(builder,
 xfce4_session_settings_ui,
 xfce4_session_settings_ui_length,
-NULL);
+error);
 
 if(!builder) {
-xfce_message_dialog(NULL, _(Internal Error), GTK_STOCK_DIALOG_ERROR,
-_(Unable to create user interface from embedded 
definition data),
-_(This is likely a problem with your Xfce 
installation),
-GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+xfce_dialog_show_error(NULL, error,
+   _(Unable to create user interface from 
embedded definition data));
+g_error_free (error);
 return EXIT_FAILURE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Use correct function to center a window on the screen.

[Nick Schermer]

Updating branch refs/heads/master
 to 5f742e77d8bc25a42ec41ca6b35f9d8f9e36fc26 (commit)
   from 6006cde3628f09dcedb9f58a8e87715bcffaf0d9 (commit)

commit 5f742e77d8bc25a42ec41ca6b35f9d8f9e36fc26
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 19:33:12 2010 +0100

Use correct function to center a window on the screen.

 settings/splash-settings.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/settings/splash-settings.c b/settings/splash-settings.c
index ef72db3..b874aa6 100644
--- a/settings/splash-settings.c
+++ b/settings/splash-settings.c
@@ -306,7 +306,7 @@ splash_selection_changed (GtkTreeSelection *selection)
   /* centering must be delayed! */
   if (!splash_centered)
 {
-  gtk_window_set_position(GTK_WINDOW(splash_dialog), GTK_WIN_POS_CENTER);
+  xfce_gtk_window_center_on_active_screen(GTK_WINDOW(splash_dialog));
   splash_centered = TRUE;
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:jeromeg/libxfce4ui Deleting branch jeromeg/libxfce4ui

[well, not really]

Deleting branch refs/heads/jeromeg/libxfce4ui

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfconf:master Merge xml files in reversed order (bug #6079).

[Nick Schermer]

Updating branch refs/heads/master
 to 13e913b7683da0d3eb1c9d78ac0908d62368e5d5 (commit)
   from cdadb1e4cc22dbf480843482dea3335b3a966534 (commit)

commit 13e913b7683da0d3eb1c9d78ac0908d62368e5d5
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 20:42:23 2010 +0100

Merge xml files in reversed order (bug #6079).

 xfconfd/xfconf-backend-perchannel-xml.c |9 +
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/xfconfd/xfconf-backend-perchannel-xml.c 
b/xfconfd/xfconf-backend-perchannel-xml.c
index 2df722e..a0d1b38 100644
--- a/xfconfd/xfconf-backend-perchannel-xml.c
+++ b/xfconfd/xfconf-backend-perchannel-xml.c
@@ -1664,7 +1664,7 @@ 
xfconf_backend_perchannel_xml_load_channel(XfconfBackendPerchannelXml *xbpx,
 {
 XfconfChannel *channel = NULL;
 gchar *filename_stem, **filenames, *user_file;
-gint i;
+gint i, length;
 XfconfProperty *prop;
 
 TRACE(entering);
@@ -1689,9 +1689,10 @@ 
xfconf_backend_perchannel_xml_load_channel(XfconfBackendPerchannelXml *xbpx,
 prop-name = g_strdup(/);
 channel-properties = g_node_new(prop);
 
-/* read in system files */
-for(i = 0; filenames[i]; ++i) {
-if(user_file  !strcmp(filenames[i], user_file))
+/* read in system files, we do this in reversed order */
+length = g_strv_length(filenames);
+for(i = length - 1; i = 0; --i) {
+if(!g_strcmp0(user_file, filenames[i]))
 continue;
 xfconf_backend_perchannel_xml_merge_file(xbpx, filenames[i], TRUE,
  channel, NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfconf:master Make the comment from the previous commit useful.

[Nick Schermer]

Updating branch refs/heads/master
 to 37d1b93d84286f31a2d350cf852eea7ba9e58ba2 (commit)
   from 13e913b7683da0d3eb1c9d78ac0908d62368e5d5 (commit)

commit 37d1b93d84286f31a2d350cf852eea7ba9e58ba2
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 20:47:41 2010 +0100

Make the comment from the previous commit useful.

 xfconfd/xfconf-backend-perchannel-xml.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xfconfd/xfconf-backend-perchannel-xml.c 
b/xfconfd/xfconf-backend-perchannel-xml.c
index a0d1b38..f45f0f9 100644
--- a/xfconfd/xfconf-backend-perchannel-xml.c
+++ b/xfconfd/xfconf-backend-perchannel-xml.c
@@ -1689,7 +1689,8 @@ 
xfconf_backend_perchannel_xml_load_channel(XfconfBackendPerchannelXml *xbpx,
 prop-name = g_strdup(/);
 channel-properties = g_node_new(prop);
 
-/* read in system files, we do this in reversed order */
+/* read in system files, we do this in reversed order to properly 
+ * follow the xdg spec, see bug #6079 for more information */
 length = g_strv_length(filenames);
 for(i = length - 1; i = 0; --i) {
 if(!g_strcmp0(user_file, filenames[i]))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master Change CWD before spawning applications in ThunarLauncher.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to c70f431334ab8256087f43813240ce01cd028f34 (commit)
   from ad4d0cf0ac997e33e567e1b1553428dcbc08e660 (commit)

commit c70f431334ab8256087f43813240ce01cd028f34
Author: Jannis Pohlmann jan...@xfce.org
Date:   Thu Jan 28 19:48:18 2010 +0100

Change CWD before spawning applications in ThunarLauncher.

Before launching files with a GAppInfo, ThunarLauncher now changes the
current working directory of the Thunar process to its own current
directory, which usually also is the current directory of the window. It
remembers the original directory Thunar was launched from and resets the
CWD right after the files have been launched.

This is done transparently by adding a function
thunar_g_app_info_launch() that handles the CWD state internally. It
calls another new function, thunar_util_change_working_directory() that
is based on getcwd/_getcwd (the latter being used on Windows) and
chdir().

 configure.in.in|4 +-
 thunar/thunar-gio-extensions.c |   55 +++
 thunar/thunar-gio-extensions.h |   62 ++--
 thunar/thunar-launcher.c   |7 -
 thunar/thunar-util.c   |   48 +++
 thunar/thunar-util.h   |   18 ++-
 6 files changed, 155 insertions(+), 39 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index d4cbc5d..b4fc97e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -119,8 +119,8 @@ dnl *** Check for standard headers ***
 dnl **
 AC_CHECK_HEADERS([ctype.h errno.h fcntl.h grp.h limits.h locale.h memory.h \
   paths.h pwd.h sched.h signal.h stdarg.h stdlib.h string.h \
-  sys/mman.h sys/stat.h sys/time.h sys/types.h sys/uio.h \
-  sys/wait.h time.h])
+  sys/mman.h sys/param.h sys/stat.h sys/time.h sys/types.h \
+  sys/uio.h sys/wait.h time.h])
 
 dnl 
 dnl *** Check for standard functions ***
diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
index 599ce87..f4b68e5 100644
--- a/thunar/thunar-gio-extensions.c
+++ b/thunar/thunar-gio-extensions.c
@@ -27,8 +27,10 @@
 #include exo/exo.h
 #include libxfce4util/libxfce4util.h
 
+#include thunar/thunar-file.h
 #include thunar/thunar-gio-extensions.h
 #include thunar/thunar-private.h
+#include thunar/thunar-util.h
 
 
 
@@ -467,3 +469,56 @@ thunar_g_volume_is_present (GVolume *volume)
 
   return has_media;
 }
+
+
+
+gboolean
+thunar_g_app_info_launch (GAppInfo  *info,
+  GFile *working_directory,
+  GList *path_list,
+  GAppLaunchContext *context,
+  GError   **error)
+{
+  gboolean result = FALSE;
+  gchar   *new_path = NULL;
+  gchar   *old_path = NULL;
+
+  _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE);
+  _thunar_return_val_if_fail (working_directory == NULL || G_IS_FILE 
(working_directory), FALSE);
+  _thunar_return_val_if_fail (path_list != NULL, FALSE);
+  _thunar_return_val_if_fail (G_IS_APP_LAUNCH_CONTEXT (context), FALSE);
+  _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /* check if we want to set the working directory of the spawned app */
+  if (working_directory != NULL)
+{
+  /* determine the working directory path */
+  new_path = g_file_get_path (working_directory);
+  if (new_path != NULL)
+{
+  /* switch to the desired working directory, remember that of Thunar 
itself */
+  old_path = thunar_util_change_working_directory (new_path);
+
+  /* forget about the new working directory path */
+  g_free (new_path);
+}
+}
+
+  /* launch the paths with the specified app info */
+  result = g_app_info_launch (info, path_list, context, error);
+
+  /* check if we need to reset the working directory to the one Thunar was
+   * opened from */
+  if (old_path != NULL)
+{
+  /* switch to Thunar's original working directory */
+  new_path = thunar_util_change_working_directory (old_path);
+
+  /* clean up */
+  g_free (new_path);
+  g_free (old_path);
+}
+
+  return result;
+}
+
diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
index 69219cc..c5f 100644
--- a/thunar/thunar-gio-extensions.h
+++ b/thunar/thunar-gio-extensions.h
@@ -29,23 +29,23 @@ GFile*thunar_g_file_new_for_home (void);
 GFile*thunar_g_file_new_for_root (void);
 GFile*thunar_g_file_new_for_trash(void);
 GFile*thunar_g_file_new_for_desktop  (void);
-GFile*thunar_g_file_new_for_user_special_dir (GUserDirectory  dir);
-
-gboolean  thunar_g_file_is_root  (GFile  *file);
-gboolean  

[Xfce4-commits] xfdesktop:master Make the settings dialog smaller with long filenames.

[Nick Schermer]

Updating branch refs/heads/master
 to 27cd5e4abfd268cbe82a8d611b08be2af72d8a2e (commit)
   from d7f265a62a54de1a38cbf98e82e0c59faaa9055d (commit)

commit 27cd5e4abfd268cbe82a8d611b08be2af72d8a2e
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 21:38:45 2010 +0100

Make the settings dialog smaller with long filenames.

This makes the dialog suitable for small screens like netbooks.

 .../xfdesktop-settings-appearance-frame-ui.xml |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/settings/xfdesktop-settings-appearance-frame-ui.xml 
b/settings/xfdesktop-settings-appearance-frame-ui.xml
index 3896436..3a4fed6 100644
--- a/settings/xfdesktop-settings-appearance-frame-ui.xml
+++ b/settings/xfdesktop-settings-appearance-frame-ui.xml
@@ -92,7 +92,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=eventsGDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK/property
-property 
name=hscrollbar_policyGTK_POLICY_NEVER/property
+property 
name=hscrollbar_policyGTK_POLICY_AUTOMATIC/property
 property 
name=vscrollbar_policyGTK_POLICY_AUTOMATIC/property
 property 
name=shadow_typeGTK_SHADOW_ETCHED_IN/property
 child
@@ -412,6 +412,7 @@
   /object
   packing
 property name=position1/property
+property name=expandFalse/property
   /packing
 /child
   /object
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Update to use git and new macros.

[Nick Schermer]

Updating branch refs/heads/master
 to ad65e5f6ec29d79f8e4f9ff75a186b01dd318696 (commit)
   from 121cdb77d44500963fdcbf0f9f675980294b42ff (commit)

commit ad65e5f6ec29d79f8e4f9ff75a186b01dd318696
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 21:50:55 2010 +0100

Update to use git and new macros.

Also bump version to 4.7.0git and silence the build.

 configure.in.in |   28 +---
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index d74a9ba..a1eb10a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -8,12 +8,14 @@ dnl
 
 dnl Version information
 m4_define([xfsm_version_major], [4])
-m4_define([xfsm_version_minor], [6])
-m4_define([xfsm_version_micro], [1])
-m4_define([xfsm_version_nano], [])
+m4_define([xfsm_version_minor], [7])
+m4_define([xfsm_version_micro], [0])
+m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version
 m4_define([xfsm_version_build], [...@revision@])
-m4_define([xfsm_version_tag], [])
-m4_define([xfsm_version], 
[xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(),
 [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [svn], 
[xfsm_version_tag()[-r]xfsm_version_build()], [])])
+m4_define([xfsm_version_tag], [git])
+m4_define([xfsm_version], 
[xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(),
 [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], 
[xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])])
+
+m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], 
[minimum])])
 
 dnl Initialize autoconf
 AC_COPYRIGHT([Copyright (c) 2003-2009
@@ -29,6 +31,7 @@ dnl Initialize automake
 AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl check for UNIX variants
 AC_USE_SYSTEM_EXTENSIONS
@@ -69,13 +72,13 @@ dnl Check for i18n support
 XDT_I18N([...@linguas@])
 
 dnl Check for required packages
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.6.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
-XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.22])
 XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
 
 dnl we provide a panel plugin now
 XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0],
@@ -96,7 +99,10 @@ XDT_CHECK_OPTIONAL_PACKAGE([GNOME_KEYRING], 
[gnome-keyring-1], [2.22],
[Extra gnome-keyring compatibility support], [no])
 
 dnl Check for debugging support
-BM_DEBUG_SUPPORT()
+XDT_FEATURE_DEBUG([xfsm_debug_default])
+
+dnl Check for linker optimizations
+XDT_FEATURE_LINKER_OPTS()
 
 dnl Check for iceauth
 AC_PATH_PROG([ICEAUTH], [iceauth])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Put $(AM_V_GEN) in the Makefiles.

[Nick Schermer]

Updating branch refs/heads/master
 to a906368b5ba730bc4ce27485e71183234ac1bdb1 (commit)
   from 58f692877c4b6bb5e0f25039ea260652ebacc936 (commit)

commit a906368b5ba730bc4ce27485e71183234ac1bdb1
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 22:14:38 2010 +0100

Put $(AM_V_GEN) in the Makefiles.

 engines/mice/Makefile.am   |4 ++--
 engines/simple/Makefile.am |4 ++--
 panel-plugin/Makefile.am   |2 +-
 settings/Makefile.am   |   12 ++--
 xfce4-session/Makefile.am  |   10 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/engines/mice/Makefile.am b/engines/mice/Makefile.am
index b856c31..9363ddb 100644
--- a/engines/mice/Makefile.am
+++ b/engines/mice/Makefile.am
@@ -44,10 +44,10 @@ BUILT_SOURCES = 
\
preview.h
 
 preview.h: $(srcdir)/preview.png
-   gdk-pixbuf-csource --static --raw --stream --name=preview $  $@
+   $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=preview 
$  $@
 
 slide.h: $(srcdir)/slide.png
-   gdk-pixbuf-csource --static --raw --stream --name=slide $  $@
+   $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=slide $ 
 $@
 
 DISTCLEANFILES =   \
$(BUILT_SOURCES)
diff --git a/engines/simple/Makefile.am b/engines/simple/Makefile.am
index c63d7ea..ca5d0f5 100644
--- a/engines/simple/Makefile.am
+++ b/engines/simple/Makefile.am
@@ -35,10 +35,10 @@ BUILT_SOURCES = 
\
preview.h
 
 fallback.h: $(srcdir)/fallback.png
-   gdk-pixbuf-csource --static --raw --stream --name=fallback $  $@
+   $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=fallback 
$  $@
 
 preview.h: $(srcdir)/preview.png
-   gdk-pixbuf-csource --static --raw --stream --name=preview $  $@
+   $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=preview 
$  $@
 
 DISTCLEANFILES =   \
$(BUILT_SOURCES)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index bd04430..54b 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -71,7 +71,7 @@ xfsm-logout-plugin.desktop.in: $(srcdir)/$(dfile)
 if MAINTAINER_MODE
 
 xfsm-logout-plugin-ui.h: $(srcdir)/xfsm-logout-plugin-ui.xml Makefile
-   exo-csource --static --name=logout_plugin_ui $  $@
+   $(AM_V_GEN) exo-csource --static --name=logout_plugin_ui $  $@
 
 BUILT_SOURCES = xfsm-logout-plugin-ui.h
 
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 87a4847..ecf6eed 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -62,25 +62,25 @@ BUILT_SOURCES = \
nopreview.h
 
 nopreview.h: $(srcdir)/nopreview.png
-   gdk-pixbuf-csource --static --raw --stream --name=nopreview $  $@
+   $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=nopreview 
$  $@
 
 xfce4-session-marshal.h: stamp-xfce4-session-marshal.h
@true
 stamp-xfce4-session-marshal.h: xfce4-session-marshal.list Makefile
-   glib-genmarshal --prefix=xfce4_session_marshal 
xfce4-session-marshal.list --header  xfce4-session-marshal.h
+   $(AM_V_GEN) glib-genmarshal --prefix=xfce4_session_marshal 
xfce4-session-marshal.list --header  xfce4-session-marshal.h
echo timestamp  $(@F)
 xfce4-session-marshal.c: xfce4-session-marshal.list Makefile
-   echo '#include xfce4-session-marshal.h'  $@
+   $(AM_V_GEN) echo '#include xfce4-session-marshal.h'  $@
glib-genmarshal --prefix=xfce4_session_marshal 
xfce4-session-marshal.list --body  xfce4-session-marshal.c
 
 xfce4-session-settings_ui.h: xfce4-session-settings.glade
-   exo-csource --static --strip-comments --strip-content 
--name=xfce4_session_settings_ui $ $@
+   $(AM_V_GEN) exo-csource --static --strip-comments --strip-content 
--name=xfce4_session_settings_ui $ $@
 
 xfsm-client-dbus-client.h: $(top_srcdir)/xfce4-session/xfsm-client-dbus.xml 
Makefile
-   dbus-binding-tool --mode=glib-client 
$(top_srcdir)/xfce4-session/xfsm-client-dbus.xml  $@
+   $(AM_V_GEN) dbus-binding-tool --mode=glib-client 
$(top_srcdir)/xfce4-session/xfsm-client-dbus.xml  $@
 
 xfsm-manager-dbus-client.h: $(top_srcdir)/xfce4-session/xfsm-manager-dbus.xml 
Makefile
-   dbus-binding-tool --mode=glib-client 
$(top_srcdir)/xfce4-session/xfsm-manager-dbus.xml  $@
+   $(AM_V_GEN) dbus-binding-tool --mode=glib-client 
$(top_srcdir)/xfce4-session/xfsm-manager-dbus.xml  $@
 
 endif
 
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index ca498c0..d8416a2 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -95,22 +95,22 @@ BUILT_SOURCES = 
\
chooser-icon.h
 
 chooser-icon.h: $(srcdir)/chooser-icon.png
-   gdk-pixbuf-csource --static --raw --stream 

[Xfce4-commits] xfce4-session:master Build ChangeLog during make dist.

[Nick Schermer]

Updating branch refs/heads/master
 to 3b4a9bfc377c23005ccf71ac3f6a94c5195d5951 (commit)
   from a906368b5ba730bc4ce27485e71183234ac1bdb1 (commit)

commit 3b4a9bfc377c23005ccf71ac3f6a94c5195d5951
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 28 22:19:46 2010 +0100

Build ChangeLog during make dist.

 ChangeLog|  849 --
 ChangeLog.pre-xfce-devel |  245 -
 Makefile.am  |   10 +-
 3 files changed, 9 insertions(+), 1095 deletions(-)

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 3610a96..000
--- a/ChangeLog
+++ /dev/null
@@ -1,849 +0,0 @@
-2009-06-04 Brian Tarricone bj...@cornell.edu
-
-   * xfce4-session/xfsm-global.c: Add timing information to verbose
- log printouts.
-   * xfce4-session/xfsm-{manager,startup}.c: Fix a couple warnings.
-
-2009-04-15  Stephan Arts step...@xfce.org
-
-   * == Released 4.6.1 ===
-   * configure.ac.in: Update version info
-
-2009-04-02 Brian Tarricone bj...@cornell.edu
-
-   * xfce4-session/sm-layer.c: Fix default value for /security/EnableTcp
- so it's disabled if the property isn't in xfconf (bug 5126).
-
-2009-03-01 Brian Tarricone bj...@cornell.edu
-
-   * settings/xfae-model.c: Don't crash in xfae_item_free() when passed
- a NULL pointer (bug 5020).
-
-2009-02-25  Stephan Arts step...@xfce.org
-
-   * == Released 4.6.0 ==
-   * NEWS: Update News
-   * configure,in.in: Update version number and dependencies
-
-2009-02-18 Brian Tarricone bj...@cornell.edu
-
-   * settings/xfce4-session-settings.glade: Don't mark gtk stock ids as
- translatable.  Patch from Stefan Stuhr (bug 4719).
-
-2009-02-13 Jannis Pohlmann jan...@xfce.org
-
-   * settings/xfae-window.c: Fix a crash in xfce4-session-settings when
- trying to add a new autostarted application. XfaeWindow is no longer
- a GtkWindow and can thus not be used as a parent in
- gtk_window_set_transient_for() anymore (bug 4934).
-
-2009-02-01 Brian Tarricone bj...@cornell.edu
-
-   * xfce4-session/xfsm-shutdown-helper.c: Fix sudo shutdown helper;
- use the correct offset into the command string table.  Also
- ignore EINTR on errors, as the shutdown helper sometimes gets
- killed before replying to the SM (bug 4849).
-
-2009-01-26 Brian Tarricone bj...@cornell.edu
-
-   * xfce4-session/main.c: Respect the ICEAUTHORITY environment
- variable (bug 4369).
-
-2009-01-26 Jannis Pohlmann jan...@xfce.org
-
-   * == Released 4.5.99.1 ==
-   * NEWS: Update NEWS file for the release.
-   * configure.in.in: Bump version number.
-
-2009-01-14 Jannis Pohlmann jan...@xfce.org
-
-   * configure.in.in: Post-release version bump.
-
-2009-01-12 Stephan Arts step...@xfce.org
-
-   * === Release 4.5.93 ===
-   * configure.in.in: Bump version number
-
-2009-01-11 Jannis Pohlmann jan...@xfce.org
-
-   * NEWS: Update NEWS for the upcoming 4.5.93 release.
-
-2008-12-26 Brian Tarricone bj...@cornell.edu
-
-   * engines/balou/config.c: Use xfce_message_dialog() instead of
- xfce_err(), fix string a bit.
-
-2008-12-03 Brian Tarricone bj...@cornell.edu
-
-   * xfce4-session/shutdown.c: Change Log off text to Log out to be
- consistent with the rest of the UI.
-
-2008-11-27 Brian Tarricone bj...@cornell.edu
-
-   * xfce4-session/xfsm-manager.c: On suspend/hibernate, ignore errors
- of type DBUS_GERROR_NO_REPLY, not type _TIMEOUT (bug 4628).
-
-2008-11-27 Brian Tarricone bj...@cornell.edu
-
-   * configure.in.in: Check for pwd.h and getpwuid ().
-   * xfce4-session/shutdown.c: Display the currently logged-in user
- in a label in the shutdown dialog (bug 3083).
-
-2008-11-15 Brian Tarricone bj...@cornell.edu
-
-   * xfce4-session/xfsm-startup.c: Be sure to properly signal that
- startup is complete when running from the failsafe session.
-
-2008-11-15 Brian Tarricone bj...@cornell.edu
-
-   * xfce4-session/xfsm-manager.c: Fix autostart getting run twice when
- the failsafe session is used (bug 4486).
-
-2008-11-14  Stephan Arts step...@xfce.org
-
-   * NEWS, po/POTFILES.in, configure.in.in: Update files for 4.6 beta2
- release
-
-2008-11-12 Brian Tarricone bj...@cornell.edu
-
-   * settings/main.c: Hook up Help button.
-   * settings/xfce4-session-settings.glade: Fix Help button response
- and button order.
-   * settings/xfce-session-settings.desktop.in: Mark dialog as
- supporting startup notification.
-
-2008-11-06 Brian Tarricone bj...@cornell.edu
-
-   * settings/xfce4-session.xml: Add xfce4-settings-helper to the
- default failsafe session.
-
-2008-11-06 Brian Tarricone bj...@cornell.edu
-
-   * xfce4-session/xfsm-manager.c: Fix a problem: client
- 

[Xfce4-commits] midori:master Always hide findbar on hotkey if visible, or when it loses focus

[Christian Dywan]

Updating branch refs/heads/master
 to ca9420bdfcce62702b6e30afd1f0e1f38f556f6e (commit)
   from b947e5d662d64dc73fc3ad0c031cb0d312ad627a (commit)

commit ca9420bdfcce62702b6e30afd1f0e1f38f556f6e
Author: Christian Dywan christ...@twotoasts.de
Date:   Thu Jan 28 22:35:21 2010 +0100

Always hide findbar on hotkey if visible, or when it loses focus

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 27f9b2e..0973ebe 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -202,6 +202,9 @@ midori_search_action_get_icon (KatzeItem*item,
GtkWidget*widget,
const gchar** icon_name);
 
+static void
+_midori_browser_find_done (MidoriBrowser* browser);
+
 static GtkAction*
 _action_by_name (MidoriBrowser* browser,
  const gchar*   name)
@@ -2537,7 +2540,9 @@ static void
 _action_find_activate (GtkAction* action,
MidoriBrowser* browser)
 {
-if (!GTK_WIDGET_VISIBLE (browser-find))
+if (GTK_WIDGET_VISIBLE (browser-find))
+_midori_browser_find_done (browser);
+else
 {
 GtkWidget* view;
 const gchar* text;
@@ -2613,8 +2618,7 @@ midori_browser_find_text_focus_out_event_cb (GtkWidget*   
  entry,
  GdkEventFocus* event,
  MidoriBrowser* browser)
 {
-if (browser-find_typing)
-_midori_browser_find_done (browser);
+_midori_browser_find_done (browser);
 return FALSE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Re-implement search engines in the completion

[Christian Dywan]

Updating branch refs/heads/master
 to b947e5d662d64dc73fc3ad0c031cb0d312ad627a (commit)
   from 7065767a613936c8f03998df61278ba71897942b (commit)

commit b947e5d662d64dc73fc3ad0c031cb0d312ad627a
Author: Christian Dywan christ...@twotoasts.de
Date:   Thu Jan 28 22:19:00 2010 +0100

Re-implement search engines in the completion

 midori/midori-browser.c|   14 -
 midori/midori-locationaction.c |   42 +--
 midori/midori-preferences.c|2 +
 midori/midori-websettings.c|2 +-
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 44e94c7..27f9b2e 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -6640,7 +6640,12 @@ midori_browser_settings_notify (MidoriWebSettings* 
web_settings,
 g_value_get_string (value)  *g_value_get_string (value));
 else if (name == g_intern_string (search-engines-in-completion))
 {
-/* Do nothing */
+if (g_value_get_boolean (value))
+midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION (
+_action_by_name (browser, Location)), 
browser-search_engines);
+else
+midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION (
+_action_by_name (browser, Location)), NULL);
 }
 else if (name == g_intern_string (location-entry-search))
 {
@@ -6854,6 +6859,13 @@ midori_browser_set_property (GObject*  object,
 
 /* FIXME: Disconnect handlers */
 katze_object_assign (browser-search_engines, g_value_dup_object 
(value));
+if (katze_object_get_boolean (browser-settings,
+  search-engines-in-completion))
+midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION (
+_action_by_name (browser, Location)), 
browser-search_engines);
+else
+midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION (
+_action_by_name (browser, Location)), NULL);
 midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION (
 _action_by_name (browser, Search)), browser-search_engines);
 /* FIXME: Connect to updates */
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 5098794..a059364 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -34,6 +34,7 @@ struct _MidoriLocationAction
 
 gchar* text;
 gchar* uri;
+KatzeArray* search_engines;
 gdouble progress;
 gchar* secondary_icon;
 
@@ -373,7 +374,7 @@ midori_location_action_popup_timeout_cb (gpointer data)
 }
 
 result = sqlite3_step (statement);
-if (result != SQLITE_ROW)
+if (result != SQLITE_ROW  !action-search_engines)
 {
 sqlite3_finalize (statement);
 midori_location_action_popdown_completion (action);
@@ -432,7 +433,7 @@ midori_location_action_popup_timeout_cb (gpointer data)
 gtk_list_store_clear (store);
 
 matches = 0;
-do
+while (result == SQLITE_ROW)
 {
 const unsigned char* uri = sqlite3_column_text (statement, 0);
 const unsigned char* title = sqlite3_column_text (statement, 1);
@@ -445,8 +446,27 @@ midori_location_action_popup_timeout_cb (gpointer data)
 matches++;
 result = sqlite3_step (statement);
 }
-while (result == SQLITE_ROW);
-/* TODO: Suggest _(Search with %s) or opening hostname as actions */
+
+if (action-search_engines)
+{
+gint i = 0;
+KatzeItem* item;
+while ((item = katze_array_get_nth_item (action-search_engines, i)))
+{
+gchar* uri;
+gchar* title;
+
+uri = sokoke_search_uri (katze_item_get_uri (item), action-key);
+title = g_strdup_printf (_(Search with %s), katze_item_get_name 
(item));
+gtk_list_store_insert_with_values (store, NULL, matches,
+URI_COL, uri, TITLE_COL, title, YALIGN_COL, 0.25,
+FAVICON_COL, NULL, -1);
+g_free (uri);
+g_free (title);
+i++;
+}
+matches += i;
+}
 
 if (!GTK_WIDGET_VISIBLE (action-popup))
 {
@@ -547,6 +567,7 @@ static void
 midori_location_action_init (MidoriLocationAction* location_action)
 {
 location_action-text = location_action-uri = NULL;
+location_action-search_engines = NULL;
 location_action-progress = 0.0;
 location_action-secondary_icon = NULL;
 location_action-default_icon = NULL;
@@ -565,6 +586,7 @@ midori_location_action_finalize (GObject* object)
 
 katze_assign (location_action-text, NULL);
 katze_assign (location_action-uri, NULL);
+katze_assign (location_action-search_engines, NULL);
 
 katze_assign (location_action-key, NULL);
 if (location_action-popup)
@@ -1455,15 +1477,21 @@ midori_location_action_set_title_for_uri 

[Xfce4-commits] midori:master Initially pressing Up in completion should select the last match

[Christian Dywan]

Updating branch refs/heads/master
 to 8c62689981c1bb31805cb0b7452581907966be6a (commit)
   from ca9420bdfcce62702b6e30afd1f0e1f38f556f6e (commit)

commit 8c62689981c1bb31805cb0b7452581907966be6a
Author: Christian Dywan christ...@twotoasts.de
Date:   Thu Jan 28 23:15:49 2010 +0100

Initially pressing Up in completion should select the last match

 midori/midori-locationaction.c |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index a059364..a3e5cd8 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -853,7 +853,12 @@ midori_location_action_key_press_event_cb (GtkEntry*
entry,
 if (event-keyval == GDK_Down || event-keyval == GDK_KP_Down)
 selected = MIN (selected + 1, matches -1);
 else if (event-keyval == GDK_Up || event-keyval == GDK_KP_Up)
-selected = MAX (selected - 1, 0);
+{
+if (selected == -1)
+selected = matches - 1;
+else
+selected = MAX (selected - 1, 0);
+}
 else if (event-keyval == GDK_Page_Down)
 selected = MIN (selected + 14, matches -1);
 else if (event-keyval == GDK_Page_Up)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Destroy the thumb_view with WebKitGTK+ 1.1.14

[Christian Dywan]

Updating branch refs/heads/master
 to 88becdd669372ee2e8243241acaa53252d1b1f66 (commit)
   from 8c62689981c1bb31805cb0b7452581907966be6a (commit)

commit 88becdd669372ee2e8243241acaa53252d1b1f66
Author: Christian Dywan christ...@twotoasts.de
Date:   Thu Jan 28 23:28:37 2010 +0100

Destroy the thumb_view with WebKitGTK+  1.1.14

 midori/midori-view.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 4797954..071cf9d 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4643,8 +4643,8 @@ thumb_view_load_status_cb (MidoriView* thumb_view,
 g_signal_handlers_disconnect_by_func (
thumb_view, thumb_view_load_status_cb, view);
 
-/* Destroying the view here may trigger a WebKitGTK+ bug */
-#if !WEBKIT_CHECK_VERSION (1, 1, 14)
+/* Destroying the view here may trigger a WebKitGTK+ 1.1.14 bug */
+#if !WEBKIT_CHECK_VERSION (1, 1, 14) || WEBKIT_CHECK_VERSION (1, 1, 15)
 gtk_widget_destroy (GTK_WIDGET (thumb_view));
 view-thumb_view = NULL;
 #endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] www:master Remove dead link to the graphical installer.

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to 8289798cb4ce4c8bb1e309c8dd93011a2a7f1249 (commit)
   from 37b822d5180d6241127cae37c9aa194a3693d0ed (commit)

commit 8289798cb4ce4c8bb1e309c8dd93011a2a7f1249
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Sun Jan 17 11:09:34 2010 +0100

Remove dead link to the graphical installer.

 i18n/download/en.nav.php |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/i18n/download/en.nav.php b/i18n/download/en.nav.php
index 31ea91c..dd27c3e 100644
--- a/i18n/download/en.nav.php
+++ b/i18n/download/en.nav.php
@@ -3,7 +3,6 @@
lia href=/download#stableStable release/a
ul
lia href=/download#sourceSource Code/a/li
-   lia href=/download#installerGraphical 
installer/a/li
lia href=/download#binariesBinaries/a/li
/ul
/li
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] www:master Fix transifex links. Spotted by David Mohr.

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to 66c03cef76d2dcd2dd8018fe9348c85c60a61d1d (commit)
   from 8289798cb4ce4c8bb1e309c8dd93011a2a7f1249 (commit)

commit 66c03cef76d2dcd2dd8018fe9348c85c60a61d1d
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Jan 29 00:15:04 2010 +0100

Fix transifex links. Spotted by David Mohr.

 i18n/development/index.en.php |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/development/index.en.php b/i18n/development/index.en.php
index 0d1bea9..da8fb2c 100644
--- a/i18n/development/index.en.php
+++ b/i18n/development/index.en.php
@@ -37,8 +37,8 @@ is there for you if you have any questions.
 
 p
 Xfce is translated into dozens of languages. Translations are currently 
managed using
-a href=http://wiki.xfce.org/translations/transifex;Transifex/a,
-and the a href=http://i18n.xfce.org/;i18n wiki/a contains instructions on 
how to contribute.
+a href=https://translations.xfce.org/;Transifex/a,
+and the a href=https://translations.xfce.org/help/;help page/a contains 
instructions on how to contribute.
 If you have any questions, the
 a href=http://foo-projects.org/mailman/listinfo/xfce-i18n/;Xfce i18n 
mailing list/a
 is there for you!
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfburn:master Remove accessible attribute of xfburn_device, since this can change pretty much at any time. Now check for unmount whenever we try to grab the drive.

[David Mohr]

Updating branch refs/heads/master
 to 4bf5494c29d3fa87657c99251e57bd5a999d1285 (commit)
   from e87158a7b255aafc4a23773ed673b62ab197 (commit)

commit 4bf5494c29d3fa87657c99251e57bd5a999d1285
Author: David Mohr squis...@xfce.org
Date:   Thu Jan 28 21:45:35 2010 -0700

Remove accessible attribute of xfburn_device, since this can change
pretty much at any time. Now check for unmount whenever we try to grab
the drive.

 xfburn/xfburn-device.c  |   39 ++-
 xfburn/xfburn-hal-manager.c |2 ++
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/xfburn/xfburn-device.c b/xfburn/xfburn-device.c
index 18cc275..73727db 100644
--- a/xfburn/xfburn-device.c
+++ b/xfburn/xfburn-device.c
@@ -70,7 +70,7 @@ typedef struct _XfburnDevicePrivate XfburnDevicePrivate;
 struct _XfburnDevicePrivate {
   gchar *name;
   gchar *addr;
-  gboolean accessible;
+  gboolean details_known;
 
   gint buffer_size;
   gboolean dummy_write;
@@ -107,9 +107,6 @@ xfburn_device_get_property (GObject *object, guint 
property_id,
 case PROP_ADDRESS:
   g_value_set_string (value, priv-addr);
   break;
-case PROP_ACCESSIBLE:
-  g_value_set_boolean (value, priv-accessible);
-  break;
 case PROP_SUPPORTED_SPEEDS:
   g_value_set_pointer (value, priv-supported_speeds);
   break;
@@ -170,9 +167,6 @@ xfburn_device_set_property (GObject *object, guint 
property_id,
 case PROP_ADDRESS:
   priv-addr = g_value_dup_string (value);
   break;
-case PROP_ACCESSIBLE:
-  priv-accessible = g_value_get_boolean (value);
-  break;
 case PROP_SUPPORTED_SPEEDS:
   priv-supported_speeds = g_value_get_pointer (value);
   break;
@@ -250,9 +244,6 @@ xfburn_device_class_init (XfburnDeviceClass *klass)
   g_object_class_install_property (object_class, PROP_ADDRESS, 
g_param_spec_string (address, _(Device 
address),
 _(Device address), 
, G_PARAM_READWRITE));
-  g_object_class_install_property (object_class, PROP_ACCESSIBLE, 
-   g_param_spec_string (accessible, _(Is 
the device accessible),
-_(Is the device 
accessible), FALSE, G_PARAM_READABLE));
   g_object_class_install_property (object_class, PROP_SUPPORTED_SPEEDS, 
g_param_spec_pointer (supported-speeds, 
_(Burn speeds supported by the device),
 _(Burn speeds 
supported by the device), G_PARAM_READABLE));
@@ -411,7 +402,7 @@ xfburn_device_fillin_libburn_info (XfburnDevice *device, 
struct burn_drive_info
 {
   XfburnDevicePrivate *priv = GET_PRIVATE (device);
 
-  priv-accessible = TRUE;
+  priv-details_known = TRUE;
 
   priv-cdr = drive-write_cdr;
   priv-cdrw = drive-write_cdrw;
@@ -439,6 +430,9 @@ xfburn_device_grab (XfburnDevice * device, struct 
burn_drive_info **drive_info)
   gchar drive_addr[BURN_DRIVE_ADR_LEN];
   int i;
   const int max_checks = 4;
+#ifdef HAVE_HAL
+  XfburnHalManager *halman = xfburn_hal_manager_get_global ();
+#endif
 
   ret = burn_drive_convert_fs_adr (priv-addr, drive_addr);
   if (ret = 0) {
@@ -453,8 +447,14 @@ xfburn_device_grab (XfburnDevice * device, struct 
burn_drive_info **drive_info)
 //DBG (grab (%s)- %d, drive_addr, ret);
 if (ret  0)
   break;
-else if  (i  max_checks)
+else if  (i  max_checks) {
+#ifdef HAVE_HAL 
+  if (!xfburn_hal_manager_check_ask_umount (halman, device))
+usleep(i*11);
+#else
   usleep(i*11);
+#endif
+}
   }
 
   if (ret = 0) {
@@ -472,9 +472,6 @@ xfburn_device_refresh_info (XfburnDevice * device, gboolean 
get_speed_info)
 
   struct burn_drive_info *drive_info = NULL;
   gboolean ret;
-#ifdef HAVE_HAL
-  XfburnHalManager *halman = xfburn_hal_manager_get_global ();
-#endif
 
   if (G_UNLIKELY (device == NULL)) {
 g_warning (Hmm, why can we refresh when there is no drive?);
@@ -490,22 +487,14 @@ xfburn_device_refresh_info (XfburnDevice * device, 
gboolean get_speed_info)
   g_slist_free (priv-supported_speeds);
   priv-supported_speeds = NULL;
 
-  if (!priv-accessible) {
-#ifdef HAVE_HAL 
-if (!xfburn_hal_manager_check_ask_umount (halman, device))
-  return FALSE;
-#else
-return FALSE;
-#endif
-  }
-
   if (!xfburn_device_grab (device, drive_info)) {
 ret = FALSE;
 g_warning (Couldn't grab drive in order to update speed list.);
 priv-disc_status = BURN_DISC_UNGRABBED;
   } else {
-if (!priv-accessible)
+if (!priv-details_known)
   xfburn_device_fillin_libburn_info (device, drive_info);
+
 ret = TRUE;
 refresh_disc (device, drive_info);
 if (get_speed_info)
diff --git a/xfburn/xfburn-hal-manager.c b/xfburn/xfburn-hal-manager.c
index 803ce11..3d64cad 100644
--- a/xfburn/xfburn-hal-manager.c
+++ b/xfburn/xfburn-hal-manager.c
@@ -483,6 +483,8 

[Xfce4-commits] xfce4-session:build-system-rework Creating branch build-system-rework

[Brian J . Tarricone]

Updating branch refs/heads/build-system-rework
 as new branch
 to cfaeaeeb62f354e0060c1c036d8a04b41f4349bb (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/build-system-rework

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:dbus-api-additions WIP

[Brian J . Tarricone]

Updating branch refs/heads/dbus-api-additions
 to c5315ad04d59b70fb7c39727514691444cf356a9 (commit)
   from cfaeaeeb62f354e0060c1c036d8a04b41f4349bb (commit)

commit c5315ad04d59b70fb7c39727514691444cf356a9
Author: Brian J. Tarricone br...@tarricone.org
Date:   Mon Jul 27 04:50:45 2009 -0700

WIP

 xfce4-session/xfsm-manager-dbus.xml |   62 ++
 xfce4-session/xfsm-manager.c|  122 +--
 2 files changed, 163 insertions(+), 21 deletions(-)

diff --git a/xfce4-session/xfsm-manager-dbus.xml 
b/xfce4-session/xfsm-manager-dbus.xml
index 69c652c..8682d53 100644
--- a/xfce4-session/xfsm-manager-dbus.xml
+++ b/xfce4-session/xfsm-manager-dbus.xml
@@ -35,6 +35,20 @@
 /method
 
 !--
+String[] org.xfce.Session.Manager.GetCapabilities()
+
+Retrieves a list of stuff the session manager is
+capable of doing.  Current possibilities:
+suspend
+hibernate
+reboot
+shutdown
+--
+method name=GetCapabilities
+arg direction=out type=as/
+/method
+
+!--
  ObjectPath[] org.xfce.Session.Manager.ListClients()
 
  Retrieves a list of session clients from the session
@@ -81,6 +95,36 @@
 /method
 
 !--
+void org.xfce.Session.Manager.SessionControl(String action,
+ Dict[] options)
+
+@action: Action to request.  Currently-recognized
+ values are:
+ show-logout-dialog
+ logout
+ suspend
+ hibernate
+ reboot
+ shutdown
+@options: An array of (String, Variant) pairs.  Currently-
+  recognized options are:
+  fast (bool): Whether or not to allow
+   applications connected to the
+   SM a chance to close cleanly.
+  allow-interact (bool): Whether or not to allow
+ applications connected
+ to the SM to interact
+ with the user during
+ shutdown.
+  These two options are ignored for all @action values
+  except 'reboot' and 'shutdown'.
+--
+method name=SessionControl
+arg direction=in name=action type=s/
+arg direction=in name=options type=a{sv}/
+/method
+
+!--
  void org.xfce.Session.Manager.Shutdown(Unsigned Int type,
 Boolean save)
 
@@ -96,6 +140,10 @@
   immediately.  Note that this parameter is
   ignored for type==0.
 
+ NOTE: This method is deprecated and should not be used in
+ newly-written code.  See the SessionControl() method for
+ a replacement.
+
  Instructs the session manager to shut down.  Type 0 will
  prompt the user for a shutdown type.  All other types will
  take immediate action without user input.
@@ -143,5 +191,19 @@
  cancelled.
 --
 signal name=ShutdownCancelled/
+
+!--
+void org.xfce.Session.Manager.CapabilitiesChanged(String[] 
caps_added,
+  String[] 
caps_removed)
+
+@caps_added: A list of new capabilities available.
+@caps_removed: A list of capabilities lost.
+
+Emitted when the list of capabilities is changed.
+--
+signal name=CapabilitiesChanged
+arg name=caps_added type=as/
+arg name=caps_removed type=as/
+/signal
 /interface
 /node
diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index 49f6cd2..f674f22 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /*-
  * Copyright (c) 2003-2006 Benedikt Meurer be...@xfce.org
- * Copyright (c) 2008 Brian Tarricone bj...@cornell.edu
+ * Copyright (c) 2008-2009 Brian Tarricone bj...@cornell.edu
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -146,8 +146,9 @@ typedef struct
 {
   XfsmManager *manager;
   XfsmShutdownType type;
-  gboolean allow_save;
-} ShutdownIdleData;
+  gboolean fast;
+  gboolean allow_interact;
+} XfsmSessionControlIdleData;
 
 enum
 {
@@ -1776,6 +1777,10 @@ static gboolean xfsm_manager_dbus_get_state (XfsmManager 
*manager,
 static gboolean xfsm_manager_dbus_checkpoint 

[Xfce4-commits] xfce4-session:dbus-add-client Creating branch dbus-add-client

[Brian J . Tarricone]

Updating branch refs/heads/dbus-add-client
 as new branch
 to aaa53bbbc0ddf236a1977b1fbd4bdb5270275a4b (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/dbus-add-client

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfdesktop:new-icon-view Creating branch new-icon-view

[Brian J . Tarricone]

Updating branch refs/heads/new-icon-view
 as new branch
 to 0b5552ed866bf7f68f97e85bc3cbe1d98de8b33f (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/new-icon-view

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfdesktop:new-icon-view WIP: cell layout support

[Brian J . Tarricone]

Updating branch refs/heads/new-icon-view
 to 0b5552ed866bf7f68f97e85bc3cbe1d98de8b33f (commit)
   from eebe64cc5ea7f56c18007ace69c71cbeecb1b079 (commit)

commit 0b5552ed866bf7f68f97e85bc3cbe1d98de8b33f
Author: Brian J. Tarricone bj...@cornell.edu
Date:   Sat Dec 13 14:59:15 2008 -0800

WIP: cell layout support

 src/xfdesktop-icon-view.c |   52 -
 1 files changed, 51 insertions(+), 1 deletions(-)

diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index a94c700..1ccc2fe 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -167,8 +167,43 @@ struct _XfdesktopIconViewPrivate
 gdouble cell_text_width_proportion;
 
 gboolean ellipsize_icon_labels;
+
+GSList *cells;
 };
 
+typedef struct
+{
+GtkCellRenderer *render;
+gboolean expand;
+GtkPackType pack;
+} CellInfo;
+
+static void xfdesktop_icon_view_cell_layout_init(GtkCellLayoutIface *iface);
+
+static void xfdesktop_icon_view_cell_pack_start(GtkCellLayout *cell_layout,
+GtkCellRenderer *cell,
+gboolean expand);
+static void xfdesktop_icon_view_cell_pack_end(GtkCellLayout *cell_layout,
+  GtkCellRenderer *cell,
+  gboolean expand);
+static void xfdesktop_icon_view_cell_clear(GtkCellLayout *cell_layout);
+static void xfdesktop_icon_view_cell_add_attribute(GtkCellLayout *cell_layout,
+   GtkCellRenderer *cell,
+   const gchar *attribute,
+   gint column);
+static void xfdesktop_icon_view_cell_set_cell_data_func(GtkCellLayout 
*cell_layout,
+GtkCellRenderer *cell,
+GtkCellLayoutDataFunc 
func,
+gpointer func_data,
+GDestroyNotify 
destroy);
+static void xfdesktop_icon_view_cell_clear_attributes(GtkCellLayout 
*cell_layout,
+  GtkCellRenderer *cell);
+static void xfdesktop_icon_view_cell_reorder(GtkCellLayout *cell_layout,
+ GtkCellRenderer *cell,
+ gint position);
+static GList *xfdesktop_icon_view_cell_get_cells(GtkCellLayout *cell_layout);
+
+
 static gboolean xfdesktop_icon_view_button_press(GtkWidget *widget,
  GdkEventButton *evt,
  gpointer user_data);
@@ -332,7 +367,9 @@ static guint __signals[SIG_N_SIGNALS] = { 0, };
 static GQuark xfdesktop_cell_highlight_quark = 0;
 
 
-G_DEFINE_TYPE(XfdesktopIconView, xfdesktop_icon_view, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE_WITH_CODE(XfdesktopIconView, xfdesktop_icon_view, 
GTK_TYPE_WIDGET,
+G_IMPLEMENT_INTERFACE(GTK_TYPE_CELL_LAYOUT,
+  
xfdesktop_icon_view_cell_layout_init))
 
 
 static void
@@ -586,6 +623,19 @@ xfdesktop_icon_view_class_init(XfdesktopIconViewClass 
*klass)
 }
 
 static void
+xfdesktop_icon_view_cell_layout_init(GtkCellLayoutIface *iface)
+{
+iface-pack_start = xfdesktop_icon_view_cell_pack_start;
+iface-pack_end = xfdesktop_icon_view_cell_pack_end;
+iface-clear = xfdesktop_icon_view_cell_clear;
+iface-add_attribute = xfdesktop_icon_biew_cell_add_attribute;
+iface-set_cell_data_func = xfdesktop_icon_view_cell_set_cell_data_func;
+iface-clear_attributes = xfdesktop_icon_view_cell_clear_attributes;
+iface-reorder = xfdesktop_icon_view_cell_reorder;
+iface-get_cells = xfdesktop_icon_view_cell_get_cells;
+}
+
+static void
 xfdesktop_icon_view_init(XfdesktopIconView *icon_view)
 {
 icon_view-priv = G_TYPE_INSTANCE_GET_PRIVATE(icon_view,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:session-desktop-files WIP

[Brian J . Tarricone]

Updating branch refs/heads/session-desktop-files
 to acad4963f56ca608e130e4c5461491dfc5b38185 (commit)
   from f1b1f61c9929594652a3cbd48afda9312d5fb5a3 (commit)

commit acad4963f56ca608e130e4c5461491dfc5b38185
Author: Brian J. Tarricone br...@tarricone.org
Date:   Mon Jul 20 18:36:40 2009 -0700

WIP

 xfce4-session/xfsm-client.c |  135 +++
 xfce4-session/xfsm-client.h |6 ++
 xfce4-session/xfsm-manager.c|   73 +++--
 xfce4-session/xfsm-properties.c |   41 +++-
 xfce4-session/xfsm-properties.h |3 +-
 5 files changed, 202 insertions(+), 56 deletions(-)

diff --git a/xfce4-session/xfsm-client.c b/xfce4-session/xfsm-client.c
index 491d013..eb8d141 100644
--- a/xfce4-session/xfsm-client.c
+++ b/xfce4-session/xfsm-client.c
@@ -24,10 +24,18 @@
 #include config.h
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include unistd.h
+#endif
+
 #ifdef HAVE_STRING_H
 #include string.h
 #endif
 
+#ifdef HAVE_ERRNO_H
+#include errno.h
+#endif
+
 #include dbus/dbus-glib.h
 
 #include libxfsm/xfsm-util.h
@@ -48,6 +56,7 @@ struct _XfsmClient
 
   gchar   *id;
   gchar   *object_path;
+  gchar   *desktop_id;
 
   XfsmClientState  state;
   XfsmProperties  *properties;
@@ -162,6 +171,7 @@ xfsm_client_finalize (GObject *obj)
 
   g_free (client-id);
   g_free (client-object_path);
+  g_free (client-desktop_id);
 
   G_OBJECT_CLASS (xfsm_client_parent_class)-finalize (obj);
 }
@@ -387,7 +397,132 @@ xfsm_client_get_object_path (XfsmClient *client)
   return client-object_path;
 }
 
+G_CONST_RETURN gchar *
+xfsm_client_get_desktop_id (XfsmClient *client)
+{
+  g_return_val_if_fail (XFSM_IS_CLIENT (client), NULL);
+
+  if (!client-desktop_id)
+{
+  client-desktop_id = g_strdup_printf(%s_%s,
+   xfsm_properties_get_string 
(client-properties,
+   
SmProgram),
+   client-id);
+}
+
+  return client-desktop_id;
+}
+
+static gboolean
+xfsm_client_quick_copy (const gchar *src_path,
+const gchar *dst_path)
+{
+  gboolean ret = FALSE;
+  gchar *file_contents = NULL;
+  gsize  len;
+
+  if (g_file_get_contents (src_path, file_contents, len, NULL))
+if (g_file_set_contents (dst_path, file_contents, len, NULL))
+  ret = TRUE;
+
+  g_free (file_contents);
+
+  return ret;
+}
+
+gboolean
+xfsm_client_save (XfsmClient  *client,
+  const gchar *session_name,
+  GError **error)
+{
+  gboolean ret = FALSE;
+  gchar *session_resource;
+  XfceRc *rcfile = NULL;
+  gchar session_group[1024];
+  const gchar *desktop_file;
+
+  g_return_val_if_fail (XFSM_IS_CLIENT (client)  (!error || !*error), FALSE);
 
+  session_resource = g_strdup_printf (autostart/%s.desktop,
+  xfsm_client_get_desktop_id (client));
+  rcfile = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, session_resource, FALSE);
+
+  if (G_UNLIKELY (!rcfile))
+{
+  if (error)
+g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ _(Couldn't write to session data file for client 
\%s\),
+ xfsm_client_get_desktop_id ());
+  goto out;
+}
+
+  xfce_rc_set_group (rcfile, Desktop Entry);
+
+  xfce_rc_write_entry (rcfile, Version, 1.0);
+  xfce_rc_write_entry (rcfile, Type, Application);
+  xfce_rc_write_entry (rcfile, OnlyShowIn, XFCE;);
+  xfce_rc_write_bool_entry (rcfile, NoDisplay, TRUE);
+  xfce_rc_write_bool_entry (rcfile, Hidden, TRUE);
+
+  desktop_file = xfsm_properties_get_string (client-properties, 
GsmDesktopFile);
+  if (desktop_file)
+{
+  XfceRc *rcfile_desktop = xfce_rc_simple_open (desktop_file, TRUE);
+  if (rcfile_desktop)
+{
+  const gchar *val_str;
+
+  if ((val_str = xfce_rc_read_entry (rcfile_desktop, Name, NULL)))
+xfce_rc_write_entry (rcfile, Name, val_str);
+  if ((val_str = xfce_rc_read_entry (rcfile_desktop, Comment, NULL)))
+xfce_rc_write_entry (rcfile, Comment, val_str);
+  if ((val_str = xfce_rc_read_entry (rcfile_desktop, Icon, NULL)))
+xfce_rc_write_entry (rcfile, Icon, val_str);
+  if ((val_str = xfce_rc_read_entry (rcfile_desktop, Exec, NULL)))
+xfce_rc_write_entry (rcfile, Exec, val_str);
+  if (xfce_rc_has_entry (rcfile_desktop, StartupNotify))
+{
+  xfce_rc_write_bool_entry (rcfile, StartupNotify,
+xfce_rc_read_bool_entry 
(rcfile_desktop,
+ 
StartupNotify,
+ FALSE));
+}
+
+  xfce_rc_close (rcfile_desktop);
+}
+}
+
+  xfce_rc_set_group (rcfile, X-XfceSession);
+  xfce_rc_write_bool_entry (rcfile, 

[Xfce4-commits] xfdesktop:menu-diff-button Creating branch menu-diff-button

[Brian J . Tarricone]

Updating branch refs/heads/menu-diff-button
 as new branch
 to 4c8f55b63a6c50f7dca88754ce7507f569186b8a (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/menu-diff-button

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfconf:fuse-module Creating branch fuse-module

[Brian J . Tarricone]

Updating branch refs/heads/fuse-module
 as new branch
 to a9eafef43216cd31d26c0116f1af806ecc076acc (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/fuse-module

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfconf:docs-consolidation Creating branch docs-consolidation

[Brian J . Tarricone]

Updating branch refs/heads/docs-consolidation
 as new branch
 to 7d3781bb1a674583515d4cc08e76175972e1f56c (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/docs-consolidation

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfconf:backend-refactor WIP: separate out proptree stuff

[Brian J . Tarricone]

Updating branch refs/heads/backend-refactor
 to b1b2a1eeb11dd064730611b25657b626bc400403 (commit)
   from f7effe6907669d8ed9d1ee4fa2c09bc451df66cd (commit)

commit b1b2a1eeb11dd064730611b25657b626bc400403
Author: Brian J. Tarricone bj...@cornell.edu
Date:   Sat Sep 20 20:06:12 2008 -0700

WIP: separate out proptree stuff

 xfconfd/Makefile.am |2 +
 xfconfd/xfconf-backend-perchannel-xml.c |  237 +--
 xfconfd/xfconf-proptree.c   |  188 
 xfconfd/xfconf-proptree.h   |   53 +++
 4 files changed, 244 insertions(+), 236 deletions(-)

diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 611f401..fcfb820 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -20,6 +20,8 @@ xfconfd_SOURCES = \
xfconf-dbus-server.h \
xfconf-locking-utils.c \
xfconf-locking-utils.h \
+   xfconf-proptree.c \
+   xfconf-proptree.h \
$(xfconf_backend_sources) \
$(top_srcdir)/common/xfconf-types.c
 
diff --git a/xfconfd/xfconf-backend-perchannel-xml.c 
b/xfconfd/xfconf-backend-perchannel-xml.c
index d764e58..a2b635a 100644
--- a/xfconfd/xfconf-backend-perchannel-xml.c
+++ b/xfconfd/xfconf-backend-perchannel-xml.c
@@ -60,17 +60,15 @@
 #include xfconf-gvaluefuncs.h
 #include xfconf/xfconf-types.h
 #include xfconf-common-private.h
+#include xfconf-proptree.h
 
 #define FILE_VERSION_MAJOR  1
 #define FILE_VERSION_MINOR  0
 
-#define PROP_NAME_IS_VALID(name) ( (name)  (name)[0] == '/'  (name)[1] != 
0  !strstr((name), //) )
-
 #define CONFIG_DIR_STEM  xfce4/xfconf/ XFCONF_BACKEND_PERCHANNEL_XML_TYPE_ID 
/
 #define CONFIG_FILE_FMT  CONFIG_DIR_STEM %s.xml
 #define CACHE_TIMEOUT(20*60*1000)  /* 20 minutes */
 #define WRITE_TIMEOUT(5*1000)  /* 5 seconds */
-#define MAX_PROP_PATH(4096)
 
 struct _XfconfBackendPerchannelXml
 {
@@ -92,20 +90,6 @@ typedef struct _XfconfBackendPerchannelXmlClass
 GObjectClass parent;
 } XfconfBackendPerchannelXmlClass;
 
-typedef struct
-{
-GNode *properties;
-gboolean locked;
-} XfconfChannel;
-
-typedef struct
-{
-gchar *name;
-GValue value;
-GValue system_value;
-gboolean locked;
-} XfconfProperty;
-
 typedef enum
 {
 ELEM_NONE = 0,
@@ -187,25 +171,6 @@ static gboolean 
xfconf_backend_perchannel_xml_flush_channel(XfconfBackendPerchan
 const gchar 
*channel_name,
 GError **error);
 
-static GNode *xfconf_proptree_add_property(GNode *proptree,
-   const gchar *name,
-   const GValue *value,
-   const GValue *system_value,
-   gboolean locked);
-static XfconfProperty *xfconf_proptree_lookup(GNode *proptree,
-  const gchar *name);
-static GNode *xfconf_proptree_lookup_node(GNode *proptree,
-  const gchar *name);
-static gboolean xfconf_proptree_reset(GNode *proptree,
-  const gchar *name);
-static void xfconf_proptree_destroy(GNode *proptree);
-static gchar *xfconf_proptree_build_propname(GNode *prop_node,
- gchar *buf,
- gsize buflen);
-
-static void xfconf_channel_destroy(XfconfChannel *channel);
-static void xfconf_property_free(XfconfProperty *property);
-
 
 G_DEFINE_TYPE_WITH_CODE(XfconfBackendPerchannelXml, 
xfconf_backend_perchannel_xml, G_TYPE_OBJECT,
 G_IMPLEMENT_INTERFACE(XFCONF_TYPE_BACKEND,
@@ -765,206 +730,6 @@ 
xfconf_backend_perchannel_xml_register_property_changed_func(XfconfBackend *back
 
 
 
-static GNode *
-xfconf_proptree_lookup_node(GNode *proptree,
-const gchar *name)
-{
-GNode *found_node = NULL;
-gchar **parts;
-GNode *parent, *node;
-gint i;
-
-g_return_val_if_fail(PROP_NAME_IS_VALID(name), NULL);
-
-parts = g_strsplit_set(name+1, /, -1);
-parent = proptree;
-
-for(i = 0; parts[i]; ++i) {
-for(node = g_node_first_child(parent);
-node;
-node = g_node_next_sibling(node))
-{
-if(!strcmp(((XfconfProperty *)node-data)-name, parts[i])) {
-if(!parts[i+1])
-found_node = node;
-else
-parent = node;
-break;
-}
-}
-
-if(found_node || !node)
-break;
-}
-
-g_strfreev(parts);
-
-return found_node;
-}
-
-static XfconfProperty *
-xfconf_proptree_lookup(GNode *proptree,
-   const gchar *name)
-{
-GNode *node;
-XfconfProperty *prop = NULL;
-
-node = xfconf_proptree_lookup_node(proptree, name);
-

[Xfce4-commits] xfconf:metadata-dbus-api Creating branch metadata-dbus-api

[Brian J . Tarricone]

Updating branch refs/heads/metadata-dbus-api
 as new branch
 to a58c5aec4f3d694d13f1cfd51478508c952fd76a (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/metadata-dbus-api

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfconf:gvalue-array-conv Creating branch gvalue-array-conv

[Brian J . Tarricone]

Updating branch refs/heads/gvalue-array-conv
 as new branch
 to dc429d734fb39bb73791b16220edc0f33eb94d46 (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/gvalue-array-conv

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] ristretto:master l10n: Updated Russian (ru) translation to 99%

[Transifex]

Updating branch refs/heads/master
 to 2e96f0e16cd4b5cfabe016575b5abe147dcace69 (commit)
   from e6d9ce42edad388c85e472fb6472a0e7895b6db4 (commit)

commit 2e96f0e16cd4b5cfabe016575b5abe147dcace69
Author: Dmitrij Smirnov a...@cnc-parts.info
Date:   Fri Jan 29 08:21:42 2010 +0100

l10n: Updated Russian (ru) translation to 99%

New status: 123 messages complete with 1 fuzzy and 0 untranslated.

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

 po/ru.po |   30 --
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index d96735f..e10c90c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # Russian translations for ristretto package.
 # This file is distributed under the same license as the ristretto package.
 # Stefan Zerkalica zerkal...@gmail.com, 2008.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: ristretto\n
@@ -261,13 +261,11 @@ msgstr Вверх
 msgid Bottom
 msgstr Вниз
 
-#: ../src/main_window.c:512
-#: ../src/main_window.c:778
+#: ../src/main_window.c:512 ../src/main_window.c:778
 msgid Press open to select an image
 msgstr Нажмите открыть для выбора изображения
 
-#: ../src/main_window.c:765
-#: ../src/main_window.c:770
+#: ../src/main_window.c:765 ../src/main_window.c:770
 msgid Empty
 msgstr Пусто
 
@@ -295,10 +293,8 @@ msgstr Изображения
 msgid .jp(e)g
 msgstr .jp(e)g
 
-#: ../src/main_window.c:1917
-#: ../src/main_window.c:1940
-#: ../src/main_window.c:2099
-#: ../src/main_window.c:2114
+#: ../src/main_window.c:1917 ../src/main_window.c:1940
+#: ../src/main_window.c:2099 ../src/main_window.c:2114
 msgid Could not open file
 msgstr Невозможно открыть файл
 
@@ -432,16 +428,14 @@ msgid Open entire folder on startup
 msgstr Показать папку при загрузке
 
 #: ../src/preferences_dialog.c:437
-#, fuzzy
 msgid Wrap around images
-msgstr Открыть картинку
+msgstr Обернуть вокруг изображения
 
 #: ../src/preferences_dialog.c:453
 msgid Memory
 msgstr Память
 
 #: ../src/preferences_dialog.c:459
-#, fuzzy
 msgid Image cache
 msgstr Кэш изображений
 
@@ -546,31 +540,39 @@ msgstr Просмотр фотографий - это просто
 msgid Ristretto Photo Viewer
 msgstr Ristretto - Просмотр изображений
 
-#, fuzzy
 #~ msgid _Thumbnail Bar
 #~ msgstr Просмотр _эскизов
+
 #~ msgid Opening file(s)...
 #~ msgstr Открывается файл(ы)...
+
 #~ msgid _Recently used
 #~ msgstr _Недавно просмотренные
+
 #~ msgid No applications available
 #~ msgstr Нет доступных приложений
+
 #~ msgid Thumbnail _Viewer
 #~ msgstr Просмотр _эскизов
+
 #~ msgid Show _Horizontally
 #~ msgstr Показать _горизонтально
+
 #~ msgid Show _Vertically
 #~ msgstr Показать _вертикально
+
 #~ msgid H_ide
 #~ msgstr _Скрыть
+
 #~ msgid Xfce Image viewer
 #~ msgstr Xfce Просмотр изображений
+
 #~ msgid Preload
 #~ msgstr Предзагрузка
+
 #~ msgid 
 #~ Preload images during slideshow\n
 #~ (uses more memory)
 #~ msgstr 
 #~ Предзагружать изображения во время слайдшоу\n
 #~ (требует больше памяти)
-
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] ristretto:master l10n: Updated Russian (ru) translation to 99%

[Transifex]

Updating branch refs/heads/master
 to 4a9819bea49ca0be4507437ec125d66b50e0dd37 (commit)
   from 2e96f0e16cd4b5cfabe016575b5abe147dcace69 (commit)

commit 4a9819bea49ca0be4507437ec125d66b50e0dd37
Author: Dmitrij Smirnov a...@cnc-parts.info
Date:   Fri Jan 29 08:23:52 2010 +0100

l10n: Updated Russian (ru) translation to 99%

New status: 123 messages complete with 1 fuzzy and 0 untranslated.

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

 po/ru.po |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index e10c90c..fd23161 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -428,6 +428,7 @@ msgid Open entire folder on startup
 msgstr Показать папку при загрузке
 
 #: ../src/preferences_dialog.c:437
+#, fuzzy
 msgid Wrap around images
 msgstr Обернуть вокруг изображения
 
@@ -477,7 +478,7 @@ msgstr Яркость:
 
 #: ../src/xfce_wallpaper_manager.c:91
 msgid Saturation:
-msgstr Яркость
+msgstr Контраст:
 
 #: ../src/xfce_wallpaper_manager.c:123
 msgid Auto
@@ -489,20 +490,19 @@ msgstr Центровать
 
 #: ../src/xfce_wallpaper_manager.c:125
 msgid Tiled
-msgstr Сжато
+msgstr Сжать
 
 #: ../src/xfce_wallpaper_manager.c:126
 msgid Stretched
 msgstr Замостить
 
 #: ../src/xfce_wallpaper_manager.c:127
-#, fuzzy
 msgid Scaled
-msgstr Масштаб
+msgstr Расятнуть
 
 #: ../src/xfce_wallpaper_manager.c:128
 msgid Zoomed
-msgstr Растянуть
+msgstr Приближенно
 
 #: ../src/thumbnail_bar.c:187
 msgid Spacing
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master l10n: Updated Basque (eu) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to c0056c59cfe1ec1a58e37a26546774032a09d6c8 (commit)
   from c70f431334ab8256087f43813240ce01cd028f34 (commit)

commit c0056c59cfe1ec1a58e37a26546774032a09d6c8
Author: Piarres Beobide p...@beobide.net
Date:   Fri Jan 29 08:51:51 2010 +0100

l10n: Updated Basque (eu) translation to 100%

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

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

 po/eu.po |  208 +++--
 1 files changed, 106 insertions(+), 102 deletions(-)

diff --git a/po/eu.po b/po/eu.po
index 5e214b2..43debb4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,14 +3,15 @@
 # Copyright (C) 2004-2007 Benedikt Meurer.
 # This file is distributed under the same license as the thunar package.
 # Piarres Beobide p...@beobide.net, 2006, 2007, 2008, 2009.
+# Piarres Beobide pi+deb...@beobide.net, 2010.
 msgid 
 msgstr 
 Project-Id-Version: eu\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2010-01-09 00:50+0100\n
-PO-Revision-Date: 2009-09-26 23:30+0200\n
-Last-Translator: Piarres Beobide p...@beobide.net\n
-Language-Team: Basque debian-l10n...@debian.lists.org\n
+POT-Creation-Date: 2010-01-29 06:03+0100\n
+PO-Revision-Date: 2010-01-29 08:50+0100\n
+Last-Translator: Piarres Beobide pi+deb...@beobide.net\n
+Language-Team: Basque debian-l10n-bas...@lists.debian.org\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
@@ -141,7 +142,7 @@ msgstr Huts \%s\ abiarazterakoan
 
 #. tell the user that we were unable to launch the file specified
 #: ../thunar/thunar-application.c:1081 ../thunar/thunar-application.c:1207
-#: ../thunar/thunar-launcher.c:1055 ../thunar/thunar-location-entry.c:389
+#: ../thunar/thunar-launcher.c:1062 ../thunar/thunar-location-entry.c:389
 #: ../thunar/thunar-location-entry.c:417
 #: ../thunar/thunar-shortcuts-view.c:1236 ../thunar/thunar-window.c:1506
 #, c-format
@@ -223,7 +224,7 @@ msgstr Zakarrontziko fitxategi eta direktorio guztiak 
ezabatu?
 #. append the Empty Trash menu action
 #. add the Empty Trash menu item
 #: ../thunar/thunar-application.c:1697 ../thunar/thunar-location-buttons.c:171
-#: ../thunar/thunar-shortcuts-view.c:834 ../thunar/thunar-tree-view.c:1104
+#: ../thunar/thunar-shortcuts-view.c:834 ../thunar/thunar-tree-view.c:1141
 #: ../thunar/thunar-window.c:295 ../plugins/thunar-tpa/main.c:49
 msgid _Empty Trash
 msgstr Zakarrontzia _hustu
@@ -492,7 +493,7 @@ msgstr Automatikoki _zabaldu zutabeak behar denean
 #. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:682
 #: ../thunar/thunar-list-model.c:710
-#: ../thunar/thunar-permissions-chooser.c:240 ../thunar/thunar-util.c:225
+#: ../thunar/thunar-permissions-chooser.c:240 ../thunar/thunar-util.c:236
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:458
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:285
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:286
@@ -565,106 +566,106 @@ msgstr \%s\ berrizendatu
 msgid _Rename
 msgstr Be_rrizendatu
 
-#: ../thunar/thunar-dialogs.c:232
+#: ../thunar/thunar-dialogs.c:238
 msgid translator-credits
 msgstr itzulpen kredituak
 
 #. display an error message to the user
 #. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:359 ../thunar/thunar-renamer-dialog.c:942
+#: ../thunar/thunar-dialogs.c:365 ../thunar/thunar-renamer-dialog.c:942
 msgid Failed to open the documentation browser
 msgstr Huts dokumentazio nabigatzailea irekitzerakoan
 
-#: ../thunar/thunar-dialogs.c:456
+#: ../thunar/thunar-dialogs.c:462
 msgid _Yes
 msgstr _Bai
 
-#: ../thunar/thunar-dialogs.c:460
+#: ../thunar/thunar-dialogs.c:466
 msgid Yes to _all
 msgstr Bai dan_ari
 
-#: ../thunar/thunar-dialogs.c:464
+#: ../thunar/thunar-dialogs.c:470
 msgid _No
 msgstr _Ez
 
-#: ../thunar/thunar-dialogs.c:468
+#: ../thunar/thunar-dialogs.c:474
 msgid N_o to all
 msgstr E_z danari
 
-#: ../thunar/thunar-dialogs.c:472
+#: ../thunar/thunar-dialogs.c:478
 msgid _Retry
 msgstr Be_rriz
 
-#: ../thunar/thunar-dialogs.c:477
+#: ../thunar/thunar-dialogs.c:483
 msgid _Cancel
 msgstr _Utzi
 
 #. setup the confirmation dialog
-#: ../thunar/thunar-dialogs.c:551
+#: ../thunar/thunar-dialogs.c:557
 msgid Confirm to replace files
 msgstr Berretsi fitxategiak ordezteko
 
-#: ../thunar/thunar-dialogs.c:557
+#: ../thunar/thunar-dialogs.c:563
 msgid _Skip
 msgstr _Salto
 
-#: ../thunar/thunar-dialogs.c:558
+#: ../thunar/thunar-dialogs.c:564
 msgid Replace _All
 msgstr Denak _adatu
 
-#: ../thunar/thunar-dialogs.c:559
+#: ../thunar/thunar-dialogs.c:565
 msgid _Replace
 msgstr O_rdeztu
 
-#: ../thunar/thunar-dialogs.c:591
+#: ../thunar/thunar-dialogs.c:597
 #, c-format
 msgid This folder already contains a symbolic link \%s\.
 msgstr Karpeta honek badu dagoeneko \%s\ izeneko lotura sinboliko bat.
 
-#: ../thunar/thunar-dialogs.c:596
+#: ../thunar/thunar-dialogs.c:602
 #, 

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Basque (eu) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to bb70cbf94b138c8a07b5ee2877274323fc109555 (commit)
   from af5e7c31e54ce426e09558b5e479490b57808a5b (commit)

commit bb70cbf94b138c8a07b5ee2877274323fc109555
Author: Piarres Beobide p...@beobide.net
Date:   Fri Jan 29 08:57:00 2010 +0100

l10n: Updated Basque (eu) translation to 100%

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

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

 po/eu.po |  263 +++--
 1 files changed, 116 insertions(+), 147 deletions(-)

diff --git a/po/eu.po b/po/eu.po
index e05f799..93c52fb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,13 +1,13 @@
 # translation of xfce4-power-manager.master.po to Euskara
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Piarres Beobide p...@beobide.net, 2008, 2009.
 msgid 
 msgstr 
 Project-Id-Version: xfce4-power-manager.master\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2009-08-26 14:47+\n
+POT-Creation-Date: 2010-01-29 06:01+0100\n
 PO-Revision-Date: 2009-08-27 10:23+0200\n
 Last-Translator: Piarres Beobide p...@beobide.net\n
 Language-Team: Euskara debian-l10n...@lists.debian.org\n
@@ -51,11 +51,11 @@ msgid Consider the computer on low power at:
 msgstr Ordenagailua energia baxuaz karga-maila honetan:
 
 #. Hibernate menu option
-#: ../data/interfaces/xfpm-settings.ui.h:9 ../settings/xfpm-settings.c:775
-#: ../settings/xfpm-settings.c:846 ../settings/xfpm-settings.c:970
-#: ../settings/xfpm-settings.c:1125 ../settings/xfpm-settings.c:1183
-#: ../settings/xfpm-settings.c:1238 ../src/xfpm-tray-icon.c:174
-#: ../src/xfpm-tray-icon.c:266
+#: ../data/interfaces/xfpm-settings.ui.h:9 ../settings/xfpm-settings.c:776
+#: ../settings/xfpm-settings.c:847 ../settings/xfpm-settings.c:971
+#: ../settings/xfpm-settings.c:1128 ../settings/xfpm-settings.c:1186
+#: ../settings/xfpm-settings.c:1241 ../src/xfpm-tray-icon.c:180
+#: ../src/xfpm-tray-icon.c:272
 msgid Hibernate
 msgstr Hibernatu
 
@@ -71,10 +71,10 @@ msgstr Monitoreak
 msgid Monitor power management control
 msgstr Ikusi energia kudeaketa kontrola
 
-#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:764
-#: ../settings/xfpm-settings.c:835 ../settings/xfpm-settings.c:959
-#: ../settings/xfpm-settings.c:1114 ../settings/xfpm-settings.c:1172
-#: ../settings/xfpm-settings.c:1227
+#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:765
+#: ../settings/xfpm-settings.c:836 ../settings/xfpm-settings.c:960
+#: ../settings/xfpm-settings.c:1117 ../settings/xfpm-settings.c:1175
+#: ../settings/xfpm-settings.c:1230
 msgid Nothing
 msgstr Ezer ez
 
@@ -115,11 +115,11 @@ msgid Standby
 msgstr Egonean
 
 #. Suspend menu option
-#: ../data/interfaces/xfpm-settings.ui.h:23 ../settings/xfpm-settings.c:769
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:964
-#: ../settings/xfpm-settings.c:1119 ../settings/xfpm-settings.c:1177
-#: ../settings/xfpm-settings.c:1232 ../src/xfpm-tray-icon.c:205
-#: ../src/xfpm-tray-icon.c:281
+#: ../data/interfaces/xfpm-settings.ui.h:23 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:841 ../settings/xfpm-settings.c:965
+#: ../settings/xfpm-settings.c:1122 ../settings/xfpm-settings.c:1180
+#: ../settings/xfpm-settings.c:1235 ../src/xfpm-tray-icon.c:211
+#: ../src/xfpm-tray-icon.c:287
 msgid Suspend
 msgstr Eseki
 
@@ -153,124 +153,120 @@ msgstr Sleep botoia sakatzean:
 
 #: ../data/interfaces/xfpm-settings.ui.h:31
 #: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:192
-#: ../src/xfpm-main.c:276 ../src/xfpm-tray-icon.c:343
+#: ../src/xfpm-main.c:276 ../src/xfpm-tray-icon.c:351
 #: ../src/xfce4-power-manager.desktop.in.h:2
 msgid Xfce Power Manager
 msgstr Xfce energia kudeatzailea
 
-#: ../settings/xfpm-settings.c:535 ../settings/xfpm-settings.c:550
-#: ../settings/xfpm-settings.c:577
+#: ../settings/xfpm-settings.c:536 ../settings/xfpm-settings.c:551
+#: ../settings/xfpm-settings.c:578
 msgid Never
 msgstr Inoiz
 
-#: ../settings/xfpm-settings.c:538
+#: ../settings/xfpm-settings.c:539
 msgid One minute
 msgstr Minutu bat
 
-#: ../settings/xfpm-settings.c:540 ../settings/xfpm-settings.c:552
+#: ../settings/xfpm-settings.c:541 ../settings/xfpm-settings.c:553
 msgid Minutes
 msgstr Minutu
 
-#: ../settings/xfpm-settings.c:554 ../settings/xfpm-settings.c:561
-#: ../settings/xfpm-settings.c:562 ../settings/xfpm-settings.c:563
+#: ../settings/xfpm-settings.c:555 ../settings/xfpm-settings.c:562
+#: ../settings/xfpm-settings.c:563 ../settings/xfpm-settings.c:564
 msgid One hour
 msgstr Ordu bat
 
-#: ../settings/xfpm-settings.c:562 ../settings/xfpm-settings.c:566
+#: ../settings/xfpm-settings.c:563 ../settings/xfpm-settings.c:567
 msgid one minute
 msgstr minutu bat
 
-#: ../settings/xfpm-settings.c:563 ../settings/xfpm-settings.c:567
-#: ../src/xfpm-battery.c:469
+#: