date:20091006

[Xfce4-commits] Use XSyncFreeSystemCounterList

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to 05da20fa24fd8e0872940b94ff7fe26db1429512 (commit)
   from 402a8ca6388b5ec24e434e0354942be5e37caf45 (commit)

commit 05da20fa24fd8e0872940b94ff7fe26db1429512
Author: Ali Abdallah 
Date:   Tue Oct 6 09:28:16 2009 +

Use XSyncFreeSystemCounterList

 src/xfpm-idle.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/xfpm-idle.c b/src/xfpm-idle.c
index be25657..5eeb917 100644
--- a/src/xfpm-idle.c
+++ b/src/xfpm-idle.c
@@ -271,6 +271,8 @@ xfpm_idle_init (XfpmIdle *idle)
idle->priv->idle_counter = counters[i].counter;
 }
 
+XSyncFreeSystemCounterList (counters);
+
 if ( !idle->priv->idle_counter )
 {
g_warning ("No idle counter.");
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Select first media in the added list of files once

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to fb4b167b8eb03571eca1a1ee855a706e246b3746 (commit)
   from 8feea61d5346f2b476c5b8946a0995c8bf04e996 (commit)

commit fb4b167b8eb03571eca1a1ee855a706e246b3746
Author: Ali Abdallah 
Date:   Mon Oct 5 14:45:03 2009 +

Select first media in the added list of files once

 parole/parole-gst.c  |2 +-
 parole/parole-mediachooser.c |7 ---
 parole/parole-medialist.c|2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/parole/parole-gst.c b/parole/parole-gst.c
index 2c2913e..76324c3 100644
--- a/parole/parole-gst.c
+++ b/parole/parole-gst.c
@@ -1528,7 +1528,7 @@ parole_gst_terminate_internal (ParoleGst *gst, gboolean 
fade_sound)
  "has-video", &playing_video,
  NULL);
 
-if ( fade_sound && gst->priv->state == GST_STATE_PLAYING && playing_video )
+if ( fade_sound && gst->priv->state == GST_STATE_PLAYING && !playing_video 
)
 {
gdouble volume;
gdouble step;
diff --git a/parole/parole-mediachooser.c b/parole/parole-mediachooser.c
index fadbf29..7af1af3 100644
--- a/parole/parole-mediachooser.c
+++ b/parole/parole-mediachooser.c
@@ -87,6 +87,7 @@ media_chooser_folder_changed_cb (GtkWidget *widget, gpointer 
data)
 static void
 parole_media_chooser_add (ParoleMediaChooser *chooser, GtkWidget *file_chooser)
 {
+GSList *media_files = NULL;
 GSList *files;
 GtkFileFilter *filter;
 gchar *file;
@@ -103,13 +104,13 @@ parole_media_chooser_add (ParoleMediaChooser *chooser, 
GtkWidget *file_chooser)
 
 for ( i = 0; i < len; i++)
 {
-   GSList *media_files = NULL;
file = g_slist_nth_data (files, i);
parole_get_media_files (filter, file, &media_files);
-   g_signal_emit (G_OBJECT (chooser), signals [MEDIA_FILES_OPENED], 0, 
media_files);
-   g_slist_free (media_files);
 }
 
+g_signal_emit (G_OBJECT (chooser), signals [MEDIA_FILES_OPENED], 0, 
media_files);
+g_slist_free (media_files);
+
 g_slist_foreach (files, (GFunc) g_free, NULL);
 g_slist_free (files);
 }
diff --git a/parole/parole-medialist.c b/parole/parole-medialist.c
index d4a7ae5..ef0358a 100644
--- a/parole/parole-medialist.c
+++ b/parole/parole-medialist.c
@@ -241,7 +241,7 @@ parole_media_list_files_opened_cb (ParoleMediaChooser 
*chooser, GSList *files, P
 guint i;
 
 len = g_slist_length (files);
-
+TRACE ("Adding files");
 if ( len != 0 )
 {
file = g_slist_nth_data (files, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Always play the first added media file by default

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to 48cc60b1ac76a8689e6815a6cad53b465edf8222 (commit)
   from fb4b167b8eb03571eca1a1ee855a706e246b3746 (commit)

commit 48cc60b1ac76a8689e6815a6cad53b465edf8222
Author: Ali Abdallah 
Date:   Mon Oct 5 14:52:43 2009 +

Always play the first added media file by default

 parole/parole-medialist.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/parole/parole-medialist.c b/parole/parole-medialist.c
index ef0358a..b9326e6 100644
--- a/parole/parole-medialist.c
+++ b/parole/parole-medialist.c
@@ -245,7 +245,7 @@ parole_media_list_files_opened_cb (ParoleMediaChooser 
*chooser, GSList *files, P
 if ( len != 0 )
 {
file = g_slist_nth_data (files, 0);
-   parole_media_list_add (list, file, FALSE, TRUE);
+   parole_media_list_add (list, file, TRUE, TRUE);
 }
 
 for ( i = 1; i < len; i++)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Show confirmation dialog on delete event

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to 932afb714aa197bca2dac90574dea3f3e814c612 (commit)
   from 487edadc7ff4317b9cba25b65694ecd77bb34cf2 (commit)

commit 932afb714aa197bca2dac90574dea3f3e814c612
Author: Ali Abdallah 
Date:   Tue Oct 6 10:10:13 2009 +

Show confirmation dialog on delete event

 plugins/tray/tray-icon.c |  144 +-
 1 files changed, 130 insertions(+), 14 deletions(-)

diff --git a/plugins/tray/tray-icon.c b/plugins/tray/tray-icon.c
index fa635b5..b64c962 100644
--- a/plugins/tray/tray-icon.c
+++ b/plugins/tray/tray-icon.c
@@ -297,11 +297,10 @@ tag_message_cb (ParolePlugin *plugin, const ParoleStream 
*stream, PluginData *da
 #endif
 }
 
-#ifdef HAVE_LIBNOTIFY
 static gboolean
-notify_enabled (void)
+read_entry_bool (const gchar *entry, gboolean fallback)
 {
-gboolean ret_val = TRUE;
+gboolean ret_val = fallback;
 gchar *file;
 XfceRc *rc;
 
@@ -311,7 +310,7 @@ notify_enabled (void)
 
 if ( rc )
 {
-   ret_val = xfce_rc_read_bool_entry (rc, "NOTIFY", TRUE);
+   ret_val = xfce_rc_read_bool_entry (rc, entry, fallback);
xfce_rc_close (rc);
 }
 
@@ -319,9 +318,8 @@ notify_enabled (void)
 }
 
 static void
-notify_toggled_cb (GtkToggleButton *bt, PluginData *data)
+write_entry_bool (const gchar *entry, gboolean value)
 {
-gboolean active;
 gchar *file;
 XfceRc *rc;
 
@@ -329,12 +327,36 @@ notify_toggled_cb (GtkToggleButton *bt, PluginData *data)
 rc = xfce_rc_simple_open (file, FALSE);
 g_free (file);
 
-active = gtk_toggle_button_get_active (bt);
+xfce_rc_write_bool_entry (rc, entry, value);
+xfce_rc_close (rc);
+}
+
+#ifdef HAVE_LIBNOTIFY
+static gboolean
+notify_enabled (void)
+{
+gboolean ret_val = read_entry_bool ("NOTIFY", TRUE);
 
+return ret_val;
+}
+
+static void
+notify_toggled_cb (GtkToggleButton *bt, PluginData *data)
+{
+gboolean active;
+active = gtk_toggle_button_get_active (bt);
 data->enabled = active;
 
-xfce_rc_write_bool_entry (rc, "NOTIFY", active);
-xfce_rc_close (rc);
+write_entry_bool ("NOTIFY", active);
+}
+#endif /*HAVE_LIBNOTIFY*/
+
+static void
+hide_on_delete_toggled_cb (GtkWidget *widget, gpointer data)
+{
+gboolean toggled;
+toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+write_entry_bool ("MINIMIZE_TO_TRAY", toggled);
 }
 
 static void
@@ -342,7 +364,11 @@ configure_cb (ParolePlugin *plugin, GtkWidget *widget, 
PluginData *data)
 {
 GtkWidget *dialog;
 GtkWidget *content_area;
+#ifdef HAVE_LIBNOTIFY
 GtkWidget *check;
+#endif
+GtkWidget *hide_on_delete;
+gboolean hide_on_delete_b;
 
 dialog = gtk_dialog_new_with_buttons (_("Tray icon plugin"), 
  GTK_WINDOW (widget),
@@ -353,20 +379,110 @@ configure_cb (ParolePlugin *plugin, GtkWidget *widget, 
PluginData *data)
 
 content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
+#ifdef HAVE_LIBNOTIFY
 check = gtk_check_button_new_with_label (_("Enable notification"));
-
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), data->enabled);
-
 g_signal_connect (check, "toggled",
  G_CALLBACK (notify_toggled_cb), data);
+gtk_box_pack_start_defaults (GTK_BOX (content_area), check) ;
+
+#endif /*HAVE_LIBNOTIFY*/
+
+hide_on_delete_b = read_entry_bool ("MINIMIZE_TO_TRAY", TRUE);
+hide_on_delete = gtk_check_button_new_with_label (_("Always minimize to 
tray when window is closed"));
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (hide_on_delete), 
hide_on_delete_b);
 
-gtk_container_add (GTK_CONTAINER (content_area), check);
+g_signal_connect (hide_on_delete, "toggled",
+ G_CALLBACK (hide_on_delete_toggled_cb), NULL);
 
+gtk_box_pack_start_defaults (GTK_BOX (content_area), hide_on_delete);
+   
 g_signal_connect (dialog, "response",
  G_CALLBACK (gtk_widget_destroy), NULL);
+
 gtk_widget_show_all (dialog);
 }
-#endif /*HAVE_LIBNOTIFY*/
+
+static void
+action_on_hide_confirmed_cb (GtkWidget *widget, gpointer data)
+{
+gboolean toggled;
+
+toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
+write_entry_bool ("ACTION_CONFIRMED_ON_DELETE", toggled);
+}
+
+static gboolean
+delete_event_cb (GtkWidget *widget, GdkEvent *ev, PluginData *data)
+{
+GtkWidget *dialog, *check, *content_area, *label;
+GtkWidget *quit, *minimize, *cancel, *img;
+gboolean confirmed, ret_val = TRUE, minimize_to_tray;
+
+confirmed = read_entry_bool ("ACTION_CONFIRMED_ON_DELETE", FALSE);
+minimize_to_tray = read_entry_bool ("MINIMIZE_TO_TRAY", TRUE);
+
+if ( confirmed )
+{
+   return minimize_to_tray ? gtk_widget_hide_on_delete (widget) : FALSE;
+}
+
+dialog = gtk_dialog_new_with_buttons (_("Minimize to tray?"), NULL,

[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/apps/parole

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to f950db390d7119b88e22d82c0b44096339b09ae9 (commit)
   from 48cc60b1ac76a8689e6815a6cad53b465edf8222 (commit)

commit f950db390d7119b88e22d82c0b44096339b09ae9
Merge: 48cc60b1ac76a8689e6815a6cad53b465edf8222 
a884f2cfa13334a7ade6be2ea9982ed46612b184
Author: Ali Abdallah 
Date:   Tue Oct 6 08:59:42 2009 +

Merge branch 'master' of ssh://git.xfce.org/git/apps/parole

commit a884f2cfa13334a7ade6be2ea9982ed46612b184
Author: Masato Hashimoto 
Date:   Mon Oct 5 15:52:30 2009 +

l10n: Add Japanese translation

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

 po/{id.po => ja.po} |  347 --
 1 files changed, 167 insertions(+), 180 deletions(-)

diff --git a/po/id.po b/po/ja.po
similarity index 68%
copy from po/id.po
copy to po/ja.po
index ad51e70..dc14708 100644
--- a/po/id.po
+++ b/po/ja.po
@@ -1,23 +1,26 @@
-# Indonesian translations for parole package.
+# Japanese translations for parole package
+# parole ããã±ã¼ã¸ã«å¯¾ããè±è¨³.
 # Copyright (C) 2009 THE parole'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the parole package.
-# Andhika Padmawan , 2009.
+#  , 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: parole\n"
+"Project-Id-Version: parole 0.1.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-04 16:25+\n"
-"PO-Revision-Date: 2009-08-27 04:28+0700\n"
-"Last-Translator: Andhika Padmawan \n"
-"Language-Team: Indonesian \n"
+"POT-Creation-Date: 2009-10-06 00:43+0900\n"
+"PO-Revision-Date: 2009-10-06 00:40+0900\n"
+"Last-Translator: Masato Hashimoto \n"
+"Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Japanese\n"
 
 #: ../data/interfaces/parole.ui.h:1
 msgid "16:9 (Widescreen)"
-msgstr "16:9 (Layar Lebar)"
+msgstr "16:9 (ã¯ã¤ãã¹ã¯ãªã¼ã³)"
 
 #: ../data/interfaces/parole.ui.h:2
 msgid "20:9 (DVB)"
@@ -29,179 +32,179 @@ msgstr "4:3 (TV)"
 
 #: ../data/interfaces/parole.ui.h:4
 msgid "Aspect Ratio"
-msgstr "Rasio Aspek"
+msgstr "ã¢ã¹ãã¯ãæ¯"
 
 #: ../data/interfaces/parole.ui.h:5
 msgid "Auto"
-msgstr "Otomatis"
+msgstr "èªå"
 
 #: ../data/interfaces/parole.ui.h:6
 msgid "Chapter Menu"
-msgstr "Menu Bab"
+msgstr "ãã£ãã¿ã¼ã¡ãã¥ã¼"
 
 #: ../data/interfaces/parole.ui.h:7
 msgid "DVD Menu"
-msgstr "Menu DVD"
+msgstr "DVD ã¡ãã¥ã¼"
 
 #: ../data/interfaces/parole.ui.h:8
 msgid "Media player"
-msgstr "Pemutar media"
+msgstr "ã¡ãã£ã¢ãã¬ã¼ã¤ã¼"
 
 #: ../data/interfaces/parole.ui.h:9
 msgid "Mute"
-msgstr "Diam"
+msgstr "ãã¥ã¼ã"
 
 #: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
-msgstr "Bab Berikutnya"
+msgstr "æ¬¡ã®ãã£ãã¿ã¼"
 
 #: ../data/interfaces/parole.ui.h:11
 msgid "None"
-msgstr "Tak Ada"
+msgstr "ãªã"
 
 #: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
 #: ../parole/parole-player.c:234 ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
-msgstr "Pemutar Media Parole"
+msgstr "Parole Media Player"
 
 #: ../data/interfaces/parole.ui.h:13
 msgid "Plugins"
-msgstr "Plugin"
+msgstr "ãã©ã°ã¤ã³"
 
 #: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
-msgstr "Bab Sebelumnya"
+msgstr "åã®ãã£ãã¿ã¼"
 
 #: ../data/interfaces/parole.ui.h:15
 msgid "Repeat"
-msgstr "Ulangi"
+msgstr "ç¹°ãè¿ã"
 
 #: ../data/interfaces/parole.ui.h:16
 msgid "Select Track"
-msgstr "Pilih Jalur"
+msgstr "ãã©ãã¯ã®é¸æ"
 
 #: ../data/interfaces/parole.ui.h:17
 msgid "Shuffle"
-msgstr "Acak"
+msgstr "ã·ã£ããã«"
 
 #: ../data/interfaces/parole.ui.h:18
 msgid "Sound"
-msgstr "Suara"
+msgstr "ãµã¦ã³ã"
 
 #: ../data/interfaces/parole.ui.h:19
 msgid "Square"
-msgstr "Kotak"
+msgstr "ã¹ã¯ã¨ã¢"
 
 #: ../data/interfaces/parole.ui.h:20
 msgid "Volume Down"
-msgstr "Volume Turun"
+msgstr "ããªã¥ã¼ã ãä¸ãã"
 
 #: ../data/interfaces/parole.ui.h:21
 msgid "Volume Up"
-msgstr "Volume Naik"
+msgstr "ããªã¥ã¼ã ãä¸ãã"
 
 #: ../data/interfaces/parole.ui.h:22
 msgid "_Edit"
-msgstr "_Sunting"
+msgstr "ç·¨é(_E)"
 
 #: ../data/interfaces/parole.ui.h:23
 msgid "_Help"
-msgstr "Ba_ntuan"
+msgstr "ãã«ã(_H)"
 
 #: ../data/interfaces/parole.ui.h:24
 msgid "_Media"
-msgstr "_Media"
+msgstr "ã¡ãã£ã¢(_M)"
 
 #: ../data/interfaces/parole.ui.h:25
 msgid "_View"
-msgstr "_Tampilan"
+msgstr "è¡¨ç¤º(_V)"
 
 #: ../data/interfaces/plugins.ui.h:1
 msgid "Author:"
-msgstr "Penulis:"
+msgstr "ä½è:"
 
 #: ../data/interfaces/plugins.ui.h:2
 msgid "Description:"
-msgstr "Deskripsi:"
+msgstr "èª¬æ:"
 
 #: ../data/interfaces/plugins.ui.h:3
 msgid "Si

[Xfce4-commits] Some spacing changes

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to 487edadc7ff4317b9cba25b65694ecd77bb34cf2 (commit)
   from f950db390d7119b88e22d82c0b44096339b09ae9 (commit)

commit 487edadc7ff4317b9cba25b65694ecd77bb34cf2
Author: Ali Abdallah 
Date:   Tue Oct 6 10:09:50 2009 +

Some spacing changes

 data/interfaces/plugins.ui|   12 +++-
 parole/parole-open-location.c |2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index 6daa131..3253620 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -1,6 +1,7 @@
 
 
   
+  
   
   
 
@@ -12,20 +13,21 @@
   
 
   
-  
+  
 5
-Parole Plugins 
Preferences
-center-on-parent
+Parole Plugins
 300
 220
 True
+parole
 normal
 True
 True
 False
+Media Player 
plugins
 
 
-  
+  
 True
 vertical
 2
@@ -206,7 +208,7 @@
   
 
 
-  
+  
 True
 end
 
diff --git a/parole/parole-open-location.c b/parole/parole-open-location.c
index dfdc54f..4b0d955 100644
--- a/parole/parole-open-location.c
+++ b/parole/parole-open-location.c
@@ -223,7 +223,7 @@ GtkWidget *parole_open_location (GtkWidget *parent)
vbox,
TRUE,   
TRUE,
-   10);   
+   0);   
 
 gtk_dialog_add_buttons (GTK_DIALOG (self), 
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Update pot and po files for the strings additions

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to def89f3fca1c43f4860628fab2f37b504c212bfa (commit)
   from 932afb714aa197bca2dac90574dea3f3e814c612 (commit)

commit def89f3fca1c43f4860628fab2f37b504c212bfa
Author: Ali Abdallah 
Date:   Tue Oct 6 10:13:47 2009 +

Update pot and po files for the strings additions

 po/LINGUAS|2 +-
 po/Makefile.in.in |  218 +
 po/ast.po |   43 +--
 po/da.po  |   43 +--
 po/es.po  |   43 +--
 po/id.po  |   43 +--
 po/ja.po  |   43 +--
 po/parole.pot |   40 --
 po/ru.po  |   43 +--
 po/sk.po  |   43 +--
 po/tr.po  |   43 +--
 po/uk.po  |   43 +--
 12 files changed, 566 insertions(+), 81 deletions(-)

diff --git a/po/LINGUAS b/po/LINGUAS
index bd0d6c1..97fa9f4 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # set of available languages (in alphabetic order)
-ast da es id ru sk tr uk
+ast da es id ja ru sk tr uk
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 000..78ffdaa
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,218 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper 
+# Copyright (C) 2004-2008 Rodney Dawes 
+#
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
+# but which still want to provide support for the GNU gettext functionality.
+#
+# - Modified by Owen Taylor  to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman  to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes  for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdi...@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT_ARGS = @XGETTEXT_ARGS@
+XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS)
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" 
INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) 
--gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" 
INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) 
--gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" 
$(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; 
ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep 
\^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' 
'\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then 
LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then 
LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in 
$$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf 
"$$lang.po "; done)
+
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+
+POTFILES = \
+# This comment gets stripped out
+
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf 
"$$lang.gmo "; done)
+
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+.po.pox:
+   $(MAKE) $(GETTEXT_PACKAGE).pot
+   $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+
+.po.mo:
+   $(MSGFMT) -o $@ $<
+
+.po.gmo:
+   file=`echo $* | sed 's,.*/,,'`.gmo \
+ && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+   sed -f ../intl/po2msg.sed < $< > $*.msg \
+ && rm -f $@ && gencat $@ $*.msg
+
+
+all: a...@use_nls@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+   $(GENPOT)
+
+install: install-data
+install-data: install-da...@use_nls@
+install-data-no: all
+install-data-yes: all
+   linguas="$(USE_LINGUAS)"; \
+   for lang in $$linguas; do \
+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $$dir; \
+

[Xfce4-commits] Creating annotated tag 1.90

2009-10-06 Thread Ali Abdallah

Updating annotated tag refs/tags/1.90
 as new annotated tag
 to cdfffb2d225ec9a529c4bedac2649e1b5c789eeb (tag)
  tagged by Ali Abdallah 
 on 2009-10-06 10:29 +

Ali Abdallah (69):
  Initial import of parole, juste une parole
  the old name in exec name in the desktop file
  * Button to hide/show playlist.
  * Change playbin state to NULL on errors.
  * Reset screen saver counter if we are playing a movie
  * Split the GtkBuilder interface files into multiple files.
  * Fix a bug in processing state change in Gst.
  * Added code for configurations.
  * Clear the play pixbuf when finishing playing a list.
  * Add support for drag and drop in the media list view, it can now
  * Show busy cursor when dropping files in the media list view.
  * Fix uri command line handling.
  * Make sure to don't draw the logo on expose event
  * Fix stupid bug causing a crash
  * data/interfaces/playlist.ui disable media list horizontal scrolling.
  * plugins/properties: media properties plugin (Read only,
  * Parole now can play DVD/VCD.
  * Handled disc uri's like dvd:/ from the command line.
  * parole/parole-gst.c Only emit media progressed signal when the
  * Provides a dialog to load/unload plugins.
  * Added system tray icon plugin, with optional notification
  * Don't show notebook tabs if we have one page.
  * Fix a wrong pixbuf name introduced in the previous commit.
  * tray-icon plugin: Show the base filename if we don't have
  * Implement shuffle and repeat mode.
  * Added ParoleDiscMenu to show a DVD menu when playing DVD.
  * Better seeking capabilities with the slider and the buttons.
  * Added session code for session interaction.
  Add missing files in the previous commit
  * Supports for Aspect ratio views.
  * Support for Recent played media files.
  * Added option to remember the currently loaded media
  * parole-gst.c Implement a timeout handler to check state change
  * main.c show gtk and gst command line options.
  Added module description file
  Handle correctly source messages, for now only for removable media
  Optional support for media tags changed using taglib
  Properly shutdown gst backend on exit to avoid XSync error
  Use pixel aspect ratio hint when calculating the best video size
  Bring the main window to the current desktop when adding files from the 
command line+Update pot file
  Fix a crash at exit when we have cd label added to the menu
  Make sure wish widget is focused before processing key_press
  Added some keys accelators+fix F11 key event in the previous commit
  Check and enable support for XF86Keysym if available
  Change the binary name to parole instead of parole-media-player+update 
README
  Remove svn version tag+check for if media type is local before enabling 
tag changes
  Added sm-client-id option
  Make the interface files nicer
  Add DBus xml missing file in the previous commit
  Correct the Object prefix
  Fix the player DBus interface name, again
  Make it compiles without libnotify+added russian translation by Anatoly 
Chernov
  Add Ukranian translation, fatal: No existing author found with
  Portuguese translation added
  Fix playlist interface name to correctly add media file from the command 
line
  Set the play button sensitive when media list isn't empty
  Don't set the play button insensitive when stop is clicked and media list 
isn't empty
  Play the first row if no row selected
  Revert spacings in the interface file as it brakes full screen mode
  Don't fade sound on exit if playing video
  Support for silent build
  Fix some typos+update po files
  Select first media in the added list of files once
  Always play the first added media file by default
  Merge branch 'master' of ssh://git.xfce.org/git/apps/parole
  Some spacing changes
  Show confirmation dialog on delete event
  Update pot and po files for the strings additions
  Update NEWS and version tag

Andhika Padmawan (1):
  l10n: New Indonesian translation by Andhika Padmawan is added.

Denis Koryavov (2):
  l10n: Updates to Russian (ru) translation
  l10n: Updates to Russian (ru) translation

Ignacio Velasco (1):
  l10n: Spanish translation

IÃ±igo Varela (1):
  l10n: Upload Asturian translation for parole.po

Masato Hashimoto (1):
  l10n: Add Japanese translation

Per Kongstad (1):
  l10n: Added Danish translation

Robert Hartl (1):
  l10n: Slovak translation

Samed Beyribey (1):
  l10n: Initial Turkish translation of parole.

ali (2):
  Added command line options to ease defining multimedia key actions 'via 
xfce keyboard settings for example'
  Added command line options to ease defining multimedia key actions 'via 
xfce keyboard settings for example'

[Xfce4-commits] Update NEWS and version tag

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to e0c08e92552f4af1df7c7355d57d401426248626 (commit)
   from def89f3fca1c43f4860628fab2f37b504c212bfa (commit)

commit e0c08e92552f4af1df7c7355d57d401426248626
Author: Ali Abdallah 
Date:   Tue Oct 6 10:27:57 2009 +

Update NEWS and version tag

 NEWS  |4 +-
 configure.ac.in   |4 +-
 po/Makefile.in.in |  218 -
 3 files changed, 5 insertions(+), 221 deletions(-)

diff --git a/NEWS b/NEWS
index 8b13789..f8aff0b 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +1,3 @@
-
+1.90
+
+First release.
diff --git a/configure.ac.in b/configure.ac.in
index ce06e86..5c5f1ee 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -4,8 +4,8 @@ m4_define([parole_version_api],  [0])
 m4_define([parole_version_major],  [0])
 m4_define([parole_version_minor],  [1])
 m4_define([parole_version_micro],  [90])
-m4_define([parole_version_build],  [...@revision@])
-m4_define([parole_version_tag], [git])
+m4_define([parole_version_build],  [])
+m4_define([parole_version_tag], [])
 m4_define([parole_version], 
[parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(),
 [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])])
 
 AC_INIT([parole], [parole_version], [al...@xfce.org])
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index 78ffdaa..000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,218 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper 
-# Copyright (C) 2004-2008 Rodney Dawes 
-#
-# This file may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor  to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman  to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes  for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdi...@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT_ARGS = @XGETTEXT_ARGS@
-XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS)
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" 
INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) 
--gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" 
INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) 
--gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" 
$(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; 
ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep 
\^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' 
'\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then 
LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then 
LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in 
$$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf 
"$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf 
"$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-.po.pox:
-   $(MAKE) $(GETTEXT_PACKAGE).pot
-   $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-   $(MSGFMT) -o $@ $<
-
-.po.gmo:
-   file=`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-   sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && gencat $@ $*.msg
-
-
-all: a...@use_nls@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-   $(GENPOT)
-
-install: insta

[Xfce4-commits] Remove the hour interval from the clock, minutes are good enough.

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to 28b3d29138cf36b98b6467d55c79a993884ea5a8 (commit)
   from c04e48a473029b9b397926822cef066ebaccc5c2 (commit)

commit 28b3d29138cf36b98b6467d55c79a993884ea5a8
Author: Nick Schermer 
Date:   Tue Oct 6 10:24:04 2009 +0200

Remove the hour interval from the clock, minutes are good enough.

 plugins/clock/clock.c |   29 ++---
 plugins/clock/clock.h |1 -
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index e18304e..325fef1 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -121,10 +121,9 @@ static guint
 xfce_clock_util_interval_from_format (const gchar *format)
 {
 const gchar *p;
-guintinterval = CLOCK_INTERVAL_HOUR;
 
 if (G_UNLIKELY (format == NULL))
-return CLOCK_INTERVAL_HOUR;
+return CLOCK_INTERVAL_MINUTE;
 
 for (p = format; *p != '\0'; ++p)
 {
@@ -140,16 +139,11 @@ xfce_clock_util_interval_from_format (const gchar *format)
 case 'T':
 case 'X':
 return CLOCK_INTERVAL_SECOND;
-
-case 'M':
-case 'R':
-interval = CLOCK_INTERVAL_MINUTE;
-break;
 }
 }
 }
 
-return interval;
+return CLOCK_INTERVAL_MINUTE;
 }
 
 
@@ -171,22 +165,11 @@ xfce_clock_util_next_interval (guint timeout_interval)
 xfce_clock_util_get_localtime (&tm);
 
 /* add the interval time to the next update */
-switch (timeout_interval)
+if (timeout_interval == CLOCK_INTERVAL_MINUTE)
 {
-case CLOCK_INTERVAL_HOUR:
-/* ms to next hour */
-interval += (60 - tm.tm_min) * CLOCK_INTERVAL_MINUTE;
-
-/* fall-through to add the minutes */
-
-case CLOCK_INTERVAL_MINUTE:
-/* ms to next minute */
-interval += (60 - tm.tm_sec) * CLOCK_INTERVAL_SECOND;
-break;
-
-default:
-break;
-}
+/* ms to next minute */
+interval += (60 - tm.tm_sec) * CLOCK_INTERVAL_SECOND;
+   }
 
 return interval;
 }
diff --git a/plugins/clock/clock.h b/plugins/clock/clock.h
index 9f31ff3..f387bdd 100644
--- a/plugins/clock/clock.h
+++ b/plugins/clock/clock.h
@@ -28,7 +28,6 @@ G_BEGIN_DECLS
 
 #define CLOCK_INTERVAL_SECOND (1000)
 #define CLOCK_INTERVAL_MINUTE (60 * 1000)
-#define CLOCK_INTERVAL_HOUR   (3600 * 1000)
 
 #define BUFFER_SIZE256
 #define DEFAULT_TOOLTIP_FORMAT "%A %d %B %Y"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Use g_timeout_add_seconds when available for the clock timeout.

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to d475996395d66d138359dfb45a51126448244c34 (commit)
   from c00b5cc205352640eba0f7a39340cda3d9f7fdcb (commit)

commit d475996395d66d138359dfb45a51126448244c34
Author: Nick Schermer 
Date:   Tue Oct 6 11:12:52 2009 +0200

Use g_timeout_add_seconds when available for the clock timeout.

These functions tend to stay better in sync with the system clock
and thus resulting in less rescheduling.

 plugins/clock/clock.c |   46 ++
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index b2a1988..f62c57f 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -35,6 +35,18 @@
 
 #define USE_DEBUG_TIME (0)
 
+#if GLIB_CHECK_VERSION (2, 14, 0)
+#define clock_timeout_add_seconds(interval,function,data) \
+g_timeout_add_seconds (interval,function,data)
+#define clock_timeout_add_seconds_full(priority,interval,function,data,notify) 
\
+g_timeout_add_seconds_full (priority,interval,function,data,notify)
+#else
+#define clock_timeout_add_seconds(interval,function,data) \
+g_timeout_add ((interval) * 1000,function,data)
+#define clock_timeout_add_seconds_full(priority,interval,function,data,notify) 
\
+g_timeout_add_full (priority,(interval) * 1000,function,data,notify)
+#endif
+
 
 
 /** prototypes **/
@@ -273,9 +285,10 @@ xfce_clock_tooltip_sync_timeout (gpointer user_data)
 ClockPlugin *plugin = (ClockPlugin *) user_data;
 
 /* start the tooltip update interval */
-plugin->tooltip_timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, 
plugin->tooltip_interval * 1000,
-  
xfce_clock_tooltip_timeout, plugin,
-  
xfce_clock_tooltip_timeout_destroyed);
+plugin->tooltip_timeout_id = clock_timeout_add_seconds_full 
(G_PRIORITY_DEFAULT_IDLE,
+ 
plugin->tooltip_interval,
+ 
xfce_clock_tooltip_timeout, plugin,
+ 
xfce_clock_tooltip_timeout_destroyed);
 
 /* manual update for this timeout */
 xfce_clock_tooltip_update (plugin);
@@ -307,14 +320,15 @@ xfce_clock_tooltip_sync (ClockPlugin *plugin)
 if (interval > 0 && plugin->tooltip_interval != CLOCK_INTERVAL_SECOND)
 {
  /* start the sync timeout */
- plugin->tooltip_timeout_id = g_timeout_add (interval * 1000, 
xfce_clock_tooltip_sync_timeout, plugin);
+ plugin->tooltip_timeout_id = clock_timeout_add_seconds (interval, 
xfce_clock_tooltip_sync_timeout, plugin);
  }
  else
  {
  /* start the real timeout */
- plugin->tooltip_timeout_id = g_timeout_add_full 
(G_PRIORITY_DEFAULT_IDLE, plugin->tooltip_interval * 1000,
-  
xfce_clock_tooltip_timeout, plugin,
-  
xfce_clock_tooltip_timeout_destroyed);
+ plugin->tooltip_timeout_id = clock_timeout_add_seconds_full 
(G_PRIORITY_DEFAULT_IDLE,
+  
plugin->tooltip_interval,
+  
xfce_clock_tooltip_timeout, plugin,
+  
xfce_clock_tooltip_timeout_destroyed);
  }
 
 /* update the tooltip */
@@ -369,9 +383,10 @@ xfce_clock_widget_sync_timeout (gpointer user_data)
 if (G_LIKELY (plugin->widget))
 {
 /* start the clock update timeout */
-plugin->clock_timeout_id = g_timeout_add_full 
(G_PRIORITY_DEFAULT_IDLE, plugin->interval * 1000,
-   
xfce_clock_widget_timeout, plugin,
-   
xfce_clock_widget_timeout_destroyed);
+plugin->clock_timeout_id = clock_timeout_add_seconds_full 
(G_PRIORITY_DEFAULT_IDLE,
+   
plugin->interval,
+   
xfce_clock_widget_timeout, plugin,
+   
xfce_clock_widget_timeout_destroyed);
 
 /* manual update for this interval */
 (plugin->update) (plugin->widget);
@@ -408,17 +423,16 @@ xfce_clock_widget_sync (ClockPlugin *plugin)
 if (interval > 0 && plugin->interval != CLOCK_INTERVAL_SECOND)
 {
 /* start the sync timeout */
-plugin->clock_timeout_id = g_timeout_add (interval * 1000, 
xfce_clock_widget_sync_timeout, plugin);
+plugin->clock_timeout_id = clock_timeout_add_seconds (interval, 
xfce_clock_widget_sync_timeout, plugin);
 }
 els

[Xfce4-commits] Resync tooltip and clock timeout when they are out of sync (bug #2957).

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to c00b5cc205352640eba0f7a39340cda3d9f7fdcb (commit)
   from 28b3d29138cf36b98b6467d55c79a993884ea5a8 (commit)

commit c00b5cc205352640eba0f7a39340cda3d9f7fdcb
Author: Nick Schermer 
Date:   Tue Oct 6 11:01:55 2009 +0200

Resync tooltip and clock timeout when they are out of sync (bug #2957).

Also drop the nano second precision since it only result in a
sync that is one second too late.

 plugins/clock/clock.c |  137 +++-
 plugins/clock/clock.h |   12 ++--
 2 files changed, 117 insertions(+), 32 deletions(-)

diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 325fef1..b2a1988 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -43,7 +43,7 @@ static void xfce_clock_util_get_debug_localtime  
(struct tm   *tm);
 #endif
 static guintxfce_clock_util_interval_from_format (const gchar 
*format);
 static guintxfce_clock_util_next_interval(guint
timeout_interval);
-static gboolean xfce_clock_tooltip_update(gpointer 
user_data);
+static void xfce_clock_tooltip_update(ClockPlugin 
*plugin);
 static gboolean xfce_clock_tooltip_sync_timeout  (gpointer 
user_data);
 static gboolean xfce_clock_widget_sync_timeout   (gpointer 
user_data);
 static ClockPlugin *xfce_clock_plugin_init   (XfcePanelPlugin 
*panel_plugin);
@@ -152,26 +152,16 @@ static guint
 xfce_clock_util_next_interval (guint timeout_interval)
 {
 struct tm tm;
-GTimeVal  timeval;
-guint interval;
-
-/* get the precise time */
-g_get_current_time (&timeval);
-
-/* ms to next second */
-interval = 1000 - (timeval.tv_usec / 1000);
-
-/* get current time */
-xfce_clock_util_get_localtime (&tm);
 
 /* add the interval time to the next update */
 if (timeout_interval == CLOCK_INTERVAL_MINUTE)
 {
 /* ms to next minute */
-interval += (60 - tm.tm_sec) * CLOCK_INTERVAL_SECOND;
-   }
+xfce_clock_util_get_localtime (&tm);
+return 60 - tm.tm_sec;
+}
 
-return interval;
+return 0;
 }
 
 
@@ -206,10 +196,9 @@ xfce_clock_util_strdup_strftime (const gchar *format,
 
 
 /** tooltip functions **/
-static gboolean
-xfce_clock_tooltip_update (gpointer user_data)
+static void
+xfce_clock_tooltip_update (ClockPlugin *plugin)
 {
-ClockPlugin*plugin = (ClockPlugin *) user_data;
 gchar  *string;
 struct tm   tm;
 #if !GTK_CHECK_VERSION (2,12,0)
@@ -221,7 +210,7 @@ xfce_clock_tooltip_update (gpointer user_data)
 #endif
 
 if (G_UNLIKELY (plugin->tooltip_format == NULL))
-return TRUE;
+return;
 
 /* get the local time */
 xfce_clock_util_get_localtime (&tm);
@@ -239,8 +228,41 @@ xfce_clock_tooltip_update (gpointer user_data)
 
 /* cleanup */
 g_free (string);
+}
 
-return TRUE;
+
+
+static gboolean
+xfce_clock_tooltip_timeout (gpointer user_data)
+{
+ClockPlugin *plugin = (ClockPlugin *) user_data;
+struct tmtm;
+
+xfce_clock_tooltip_update (plugin);
+
+if (plugin->tooltip_interval == CLOCK_INTERVAL_MINUTE)
+{
+xfce_clock_util_get_localtime (&tm);
+plugin->tooltip_restart = tm.tm_sec != 0;
+}
+
+return !plugin->tooltip_restart;
+}
+
+
+
+static void
+xfce_clock_tooltip_timeout_destroyed (gpointer user_data)
+{
+ClockPlugin *plugin = (ClockPlugin *) user_data;
+
+plugin->tooltip_timeout_id = 0;
+
+if (plugin->tooltip_restart)
+{
+plugin->tooltip_restart = FALSE;
+xfce_clock_tooltip_sync (plugin);
+}
 }
 
 
@@ -251,7 +273,9 @@ xfce_clock_tooltip_sync_timeout (gpointer user_data)
 ClockPlugin *plugin = (ClockPlugin *) user_data;
 
 /* start the tooltip update interval */
-plugin->clock_timeout_id = g_timeout_add (plugin->tooltip_interval, 
xfce_clock_tooltip_update, plugin);
+plugin->tooltip_timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, 
plugin->tooltip_interval * 1000,
+  
xfce_clock_tooltip_timeout, plugin,
+  
xfce_clock_tooltip_timeout_destroyed);
 
 /* manual update for this timeout */
 xfce_clock_tooltip_update (plugin);
@@ -280,8 +304,18 @@ xfce_clock_tooltip_sync (ClockPlugin *plugin)
 /* get the interval to the next update */
 interval = xfce_clock_util_next_interval (plugin->tooltip_interval);
 
-/* start the sync timeout */
-plugin->tooltip_timeout_id = g_timeout_add (interval, 
xfce_clock_tooltip_sync_timeout, plugin);
+if (interval > 0 && plugin->tooltip_interval != CLOCK_INTERVAL_SECOND)
+{
+ /* start the sync timeout */
+ plugin->tooltip_timeout_id = g_timeout_add (interval * 1000, 
xfce_clock_tooltip_sync_timeout, plugin);
+ }
+ else
+ {
+ /

[Xfce4-commits] Better check for the lcd resize when the number of hour digits changes (bug #5218).

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to d19e600937b0704ca5ae927d24a0b4db93e5e371 (commit)
   from d475996395d66d138359dfb45a51126448244c34 (commit)

commit d19e600937b0704ca5ae927d24a0b4db93e5e371
Author: Nick Schermer 
Date:   Tue Oct 6 11:17:13 2009 +0200

Better check for the lcd resize  when the number of hour digits changes 
(bug #5218).

 plugins/clock/clock-lcd.c |   10 +++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/clock/clock-lcd.c b/plugins/clock/clock-lcd.c
index c576411..4746b89 100644
--- a/plugins/clock/clock-lcd.c
+++ b/plugins/clock/clock-lcd.c
@@ -327,8 +327,12 @@ xfce_clock_lcd_expose_event (GtkWidget  *widget,
 if (!lcd->show_military && ticks > 12)
 ticks -= 12;
 
-/* queue a resize when the number of hour digits changed */
-if (G_UNLIKELY ((ticks == 10 || ticks == 0) && tm.tm_min == 0 && 
tm.tm_sec == 0))
+/* queue a resize when the number of hour digits changed,
+ * because we might miss the exact second (due to slightly delayed
+ * timeout) we queue a resize the first 3 seconds or anything in
+ * the first minute when seconds are disabled */
+if ((ticks == 10 || ticks == 0) && tm.tm_min == 0
+&& (!lcd->show_seconds || tm.tm_sec < 3))
   gtk_widget_queue_resize (widget);
 
 if (ticks >= 10)
@@ -500,7 +504,7 @@ xfce_clock_lcd_draw_digit (cairo_t *cr,
  { 3, 2, 1, 0, 5, 6, -1 },
  { 4, 5, 0, 1, 2, 6, -1 },
  { 4, 5, 0, 1, 6, -1 } };
- 
+
 g_return_val_if_fail ((gint) number >= 0 || number <= 11, offset_x);
 
 for (i = 0; i < 9; i++)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Get the time the same as orange does, hopefully should fix bug #5352.

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to 35f316c17d7f29d49040ddb67829aee1ac272364 (commit)
   from d19e600937b0704ca5ae927d24a0b4db93e5e371 (commit)

commit 35f316c17d7f29d49040ddb67829aee1ac272364
Author: Nick Schermer 
Date:   Tue Oct 6 11:31:14 2009 +0200

Get the time the same as orange does, hopefully should fix bug #5352.

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

diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index f62c57f..7fb5372 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -75,7 +75,8 @@ XFCE_PANEL_PLUGIN_REGISTER_INTERNAL 
(xfce_clock_plugin_construct);
 void
 xfce_clock_util_get_localtime (struct tm *tm)
 {
-time_t now = time (0);
+time_t now;
+time (&now);
 
 #ifndef HAVE_LOCALTIME_R
 struct tm *tmbuf;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Japanese (ja) translation

2009-10-06 Thread Transifex

Updating branch refs/heads/master
 to 72afaf0774f8afcfbb15c8b4389282ba363bc621 (commit)
   from e0c08e92552f4af1df7c7355d57d401426248626 (commit)

commit 72afaf0774f8afcfbb15c8b4389282ba363bc621
Author: Masato Hashimoto 
Date:   Tue Oct 6 09:54:06 2009 +

l10n: Updates to Japanese (ja) translation

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

 po/ja.po |   33 +++--
 1 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index ec9472c..1da7f9c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: parole 0.1.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+\n"
-"PO-Revision-Date: 2009-10-06 00:40+0900\n"
+"POT-Creation-Date: 2009-10-06 18:17+0900\n"
+"PO-Revision-Date: 2009-10-06 18:17+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
@@ -100,11 +100,11 @@ msgstr "ã¹ã¯ã¨ã¢"
 
 #: ../data/interfaces/parole.ui.h:20
 msgid "Volume Down"
-msgstr "ããªã¥ã¼ã ãä¸ãã"
+msgstr "ããªã¥ã¼ã ãä¸ãã"
 
 #: ../data/interfaces/parole.ui.h:21
 msgid "Volume Up"
-msgstr "ããªã¥ã¼ã ãä¸ãã"
+msgstr "ããªã¥ã¼ã ãä¸ãã"
 
 #: ../data/interfaces/parole.ui.h:22
 msgid "_Edit"
@@ -135,14 +135,12 @@ msgid "Site:"
 msgstr "ãµã¤ã:"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
 msgid "Media Player plugins"
-msgstr "ã¡ãã£ã¢ãã¬ã¼ã¤ã¼è¨å®"
+msgstr "ã¡ãã£ã¢ãã¬ã¼ã¤ã¼ãã©ã°ã¤ã³"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
 msgid "Parole Plugins"
-msgstr "Parole ãã©ã°ã¤ã³è¨å®"
+msgstr "Parole ãã©ã°ã¤ã³"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "Audio"
@@ -174,7 +172,7 @@ msgstr "é³æ¥½åçæã«è¦è¦åãæå¹ã«ãã"
 
 #: ../data/interfaces/parole-settings.ui.h:8
 msgid "Encoding: "
-msgstr "ã¨ã³ã³ã¼ãã£ã³ã°:"
+msgstr "ã¨ã³ã³ã¼ãã£ã³ã°: "
 
 #: ../data/interfaces/parole-settings.ui.h:9
 msgid "Font:"
@@ -210,7 +208,7 @@ msgstr "æ¡å¼µå"
 
 #: ../data/interfaces/save-playlist.ui.h:2
 msgid "Select File Types (By Extension)"
-msgstr "ã¿ã¤ã«ã¿ã¤ãã®é¸æ (æ¡å¼µåã§)"
+msgstr "ãã¡ã¤ã«ã¿ã¤ãã®é¸æ (æ¡å¼µåã§)"
 
 #: ../parole/main.c:53
 #, c-format
@@ -239,7 +237,7 @@ msgstr "æ°ããã¤ã³ã¹ã¿ã³ã¹ãéã"
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr "åçä¸ã®ã³ã³ãã³ãã®ä¸æåæ¢/åç"
+msgstr "åçä¸ã®ã³ã³ãã³ãã®åç/ä¸æåæ¢"
 
 #: ../parole/main.c:186
 msgid "Stop playing"
@@ -299,7 +297,7 @@ msgstr ""
 msgid ""
 "Unable to load video GStreamer plugin, check your GStreamer installation"
 msgstr ""
-"video GStreamer ãã©ã°ã¤ã³ãèªã¿è¾¼ãã¾ãããGStreamer 
ããã ãããããã¨ã¼ã"
+"video GStreamer ãã©ã°ã¤ã³ãèªã¿è¾¼ãã¾ãããGStreamer 
ããã ããã¤ã³ã¹ãã¼ã«"
 "ããã¦ãããã¨ãç¢ºèªãã¦ãã ããã"
 
 #: ../parole/parole-gst.c:1501
@@ -693,24 +691,23 @@ msgstr "éç¥ãæå¹ã«ãã"
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "ã¦ã£ã³ãã¦ãéããããæå¸¸ã«ãã¬ã¤ã«æå°åãã"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "ãã¬ã¤ã«æå°åãã¾ãã?"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "ãã¬ã¤ã«æå°å"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Parole ãçµäºãã¦ãããããã§ãã?"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "ãã¬ã¤ãªã¹ããè¨æ¶"
+msgstr "é¸æãè¨æ¶ãã"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix some compiler warnings I get when compiling with full debug.

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to c5551a9e47656998e27d365daf1c612cbdb14874 (commit)
   from 05a34e8ec2ff6b7d04f2fcef73e4f0c116f0d7d5 (commit)

commit c5551a9e47656998e27d365daf1c612cbdb14874
Author: Nick Schermer 
Date:   Tue Oct 6 12:55:58 2009 +0200

Fix some compiler warnings I get when compiling with full debug.

 common/desktop-menu-utils.h |2 +-
 panel-plugin/desktop-menu-plugin.c  |3 +++
 src/menu.h  |4 ++--
 src/windowlist.h|2 +-
 src/xfce-backdrop.h |2 +-
 src/xfce-desktop.h  |2 +-
 src/xfdesktop-file-icon-manager.h   |2 +-
 src/xfdesktop-file-icon.h   |2 +-
 src/xfdesktop-icon-view-manager.h   |2 +-
 src/xfdesktop-icon-view.h   |2 +-
 src/xfdesktop-icon.h|2 +-
 src/xfdesktop-regular-file-icon.h   |2 +-
 src/xfdesktop-special-file-icon.h   |2 +-
 src/xfdesktop-volume-icon.h |2 +-
 src/xfdesktop-window-icon-manager.h |2 +-
 src/xfdesktop-window-icon.h |2 +-
 16 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/common/desktop-menu-utils.h b/common/desktop-menu-utils.h
index 9a12848..b6da4b6 100644
--- a/common/desktop-menu-utils.h
+++ b/common/desktop-menu-utils.h
@@ -23,7 +23,7 @@
 
 G_BEGIN_DECLS
 
-gchar *xfce_desktop_get_menufile();
+gchar *xfce_desktop_get_menufile(void);
 
 G_END_DECLS
 
diff --git a/panel-plugin/desktop-menu-plugin.c 
b/panel-plugin/desktop-menu-plugin.c
index 6f3c365..503cd12 100644
--- a/panel-plugin/desktop-menu-plugin.c
+++ b/panel-plugin/desktop-menu-plugin.c
@@ -53,6 +53,9 @@
 #include 
 #include 
 
+#ifdef HAVE_LIBEXO
+#include 
+#endif
 #ifdef HAVE_THUNAR_VFS
 #include 
 #endif
diff --git a/src/menu.h b/src/menu.h
index db514ed..1abd799 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -33,8 +33,8 @@ G_BEGIN_DECLS
 
 void menu_init(XfconfChannel *channel);
 void menu_attach(XfceDesktop *desktop);
-void menu_reload();
-void menu_cleanup();
+void menu_reload(void);
+void menu_cleanup(void);
 
 G_END_DECLS
 
diff --git a/src/windowlist.h b/src/windowlist.h
index f48ca05..d8cf793 100644
--- a/src/windowlist.h
+++ b/src/windowlist.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 void windowlist_init(XfconfChannel *channel);
 void windowlist_attach(XfceDesktop *desktop);
-void windowlist_cleanup();
+void windowlist_cleanup(void);
 
 G_END_DECLS
 
diff --git a/src/xfce-backdrop.h b/src/xfce-backdrop.h
index 5997d2a..d193644 100644
--- a/src/xfce-backdrop.h
+++ b/src/xfce-backdrop.h
@@ -72,7 +72,7 @@ struct _XfceBackdropClass
 void (*changed)(XfceBackdrop *backdrop);
 };
 
-GType xfce_backdrop_get_type () G_GNUC_CONST;
+GType xfce_backdrop_get_type (void) G_GNUC_CONST;
 
 XfceBackdrop *xfce_backdrop_new  (GdkVisual *visual);
 
diff --git a/src/xfce-desktop.h b/src/xfce-desktop.h
index 8fa80a6..d3173ed 100644
--- a/src/xfce-desktop.h
+++ b/src/xfce-desktop.h
@@ -71,7 +71,7 @@ struct _XfceDesktopClass
  GtkMenuShell *menu);
 };
 
-GType xfce_desktop_get_type () G_GNUC_CONST;
+GType xfce_desktop_get_type (void) G_GNUC_CONST;
 
 GtkWidget *xfce_desktop_new(GdkScreen *gscreen,
 XfconfChannel *channel,
diff --git a/src/xfdesktop-file-icon-manager.h 
b/src/xfdesktop-file-icon-manager.h
index 62ab221..626bb55 100644
--- a/src/xfdesktop-file-icon-manager.h
+++ b/src/xfdesktop-file-icon-manager.h
@@ -51,7 +51,7 @@ struct _XfdesktopFileIconManagerClass
 GObjectClass parent;
 };
 
-GType xfdesktop_file_icon_manager_get_type() G_GNUC_CONST;
+GType xfdesktop_file_icon_manager_get_type(void) G_GNUC_CONST;
 
 XfdesktopIconViewManager *xfdesktop_file_icon_manager_new(ThunarVfsPath 
*folder,
   XfconfChannel 
*channel);
diff --git a/src/xfdesktop-file-icon.h b/src/xfdesktop-file-icon.h
index 1e2bf92..050a160 100644
--- a/src/xfdesktop-file-icon.h
+++ b/src/xfdesktop-file-icon.h
@@ -61,7 +61,7 @@ struct _XfdesktopFileIconClass
 gboolean (*delete_file)(XfdesktopFileIcon *icon);
 };
 
-GType xfdesktop_file_icon_get_type() G_GNUC_CONST;
+GType xfdesktop_file_icon_get_type(void) G_GNUC_CONST;
 
 G_CONST_RETURN ThunarVfsInfo *xfdesktop_file_icon_peek_info(XfdesktopFileIcon 
*icon);
 void xfdesktop_file_icon_update_info(XfdesktopFileIcon *icon,
diff --git a/src/xfdesktop-icon-view-manager.h 
b/src/xfdesktop-icon-view-manager.h
index 6778cbb..3170cd2 100644
--- a/src/xfdesktop-icon-view-manager.h
+++ b/src/xfdesktop-icon-view-manager.h
@@ -70,7 +70,7 @@ struct _XfdesktopIconViewManagerIface
   guint time_);
 };
 
-GType xfdesktop_icon_view_manager_get_type() G_GNUC_CONST;
+GType xfdesktop_icon_view_manager_get_type(void) G_GNUC_CONST;
 
 /* virtual function accessors */
 
diff --git a/src/xfdesktop-icon-view.h b/src/xfdesktop-icon-view.h
index 42ddd6f..4961044 100644

[Xfce4-commits] l10n: created galician translation

2009-10-06 Thread Transifex

Updating branch refs/heads/master
 to df8ad0098db0d1bc1a2f08b89554607e8ec85b19 (commit)
   from 72afaf0774f8afcfbb15c8b4389282ba363bc621 (commit)

commit df8ad0098db0d1bc1a2f08b89554607e8ec85b19
Author: Leandro Regueiro 
Date:   Tue Oct 6 11:32:08 2009 +

l10n: created galician translation

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

 po/{pt.po => gl.po} |  303 ---
 1 files changed, 167 insertions(+), 136 deletions(-)

diff --git a/po/pt.po b/po/gl.po
similarity index 75%
copy from po/pt.po
copy to po/gl.po
index 93a8692..59ed33a 100644
--- a/po/pt.po
+++ b/po/gl.po
@@ -1,24 +1,28 @@
-# Portuguese translation for parole package.
-# Copyright (C) 2009 THE parole COPYRIGHT HOLDER
-# This file is distributed under the same license as the parole package.
-# SÃ©rgio Marques ,2009.
+# Galician translation of notification-daemon-xfce
+# Copyright (C) 2009 Leandro Regueiro.
+# This file is distributed under the same license as the Xfce package.
+#
+# Leandro Regueiro , 2009.
+#
+# Proxecto Trasno - AdaptaciÃ³n do software libre Ã¡ lingua galega:  Se desexas
+# colaborar connosco, podes atopar mÃ¡is informaciÃ³n en 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: parole 0.2\n"
+"Project-Id-Version: Parole 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-16 16:02+0200\n"
-"PO-Revision-Date: \n"
-"Last-Translator: SÃ©rgio Marques \n"
-"Language-Team: Portuguese\n"
+"PO-Revision-Date: 2009-10-04 14:50+0100\n"
+"Last-Translator: Leandro Regueiro \n"
+"Language-Team: Galician \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-Country: Portugal\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/interfaces/parole.ui.h:1
 msgid "16:9 (Widescreen)"
-msgstr "16:9 (EcrÃ¢ PanorÃ¢mico)"
+msgstr "16:9 (PanorÃ¡mico)"
 
 #: ../data/interfaces/parole.ui.h:2
 msgid "20:9 (DVB)"
@@ -29,43 +33,46 @@ msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
 #: ../data/interfaces/parole.ui.h:4
+#, fuzzy
 msgid "Aspect Ratio"
-msgstr "RÃ¡cio de Aspecto"
+msgstr "ProporciÃ³n de aspecto:"
 
 #: ../data/interfaces/parole.ui.h:5
+#, fuzzy
 msgid "Auto"
-msgstr "Auto"
+msgstr "AutomÃ¡tico"
 
 #: ../data/interfaces/parole.ui.h:6
 msgid "Chapter Menu"
-msgstr "Menu de CapÃtulos"
+msgstr "MenÃº de capÃtulos"
 
 #: ../data/interfaces/parole.ui.h:7
 msgid "DVD Menu"
-msgstr "Menu de DVD"
+msgstr "MenÃº do DVD"
 
 #: ../data/interfaces/parole.ui.h:8
 #: ../parole/parole-player.c:288
 msgid "Hide playlist"
-msgstr "Ocultar lista de reproduÃ§Ã£o"
+msgstr "Ocultar a lista de reproduciÃ³n"
 
 #: ../data/interfaces/parole.ui.h:9
 msgid "Media player"
-msgstr "Reprodutor MultimÃ©dia"
+msgstr "Reprodutor multimedia"
 
 #: ../data/interfaces/parole.ui.h:10
 msgid "Mute"
-msgstr "Silenciar"
+msgstr "Silencio"
 
 #: ../data/interfaces/parole.ui.h:11
 #: ../parole/parole-player.c:1002
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
-msgstr "PrÃ³ximo CapÃtulo"
+msgstr "CapÃtulo seguinte"
 
 #: ../data/interfaces/parole.ui.h:12
+#, fuzzy
 msgid "None"
-msgstr "Nenhum"
+msgstr "Ningunha"
 
 #: ../data/interfaces/parole.ui.h:13
 #: ../data/desktop/parole.desktop.in.in.h:1
@@ -73,17 +80,17 @@ msgstr "Nenhum"
 #: ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
-msgstr "Reprodutor MultimÃ©dia Parole"
+msgstr "Reprodutor multimedia Parole"
 
 #: ../data/interfaces/parole.ui.h:14
 msgid "Plugins"
-msgstr "Plugins"
+msgstr "Engadidos"
 
 #: ../data/interfaces/parole.ui.h:15
 #: ../parole/parole-player.c:1014
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
-msgstr "ApÃtulo Anterior"
+msgstr "CapÃtulo anterior"
 
 #: ../data/interfaces/parole.ui.h:16
 msgid "Repeat"
@@ -91,27 +98,27 @@ msgstr "Repetir"
 
 #: ../data/interfaces/parole.ui.h:17
 msgid "Select Track"
-msgstr "Seleccione a Faixa"
+msgstr "Escoller pista"
 
 #: ../data/interfaces/parole.ui.h:18
 msgid "Shuffle"
-msgstr "Alternar"
+msgstr "Aleatorio"
 
 #: ../data/interfaces/parole.ui.h:19
 msgid "Sound"
-msgstr "Som"
+msgstr "Son"
 
 #: ../data/interfaces/parole.ui.h:20
 msgid "Square"
-msgstr "Quadrado"
+msgstr "Cadrado"
 
 #: ../data/interfaces/parole.ui.h:21
 msgid "Volume Down"
-msgstr "Diminuir Volume"
+msgstr "Baixar o volume"
 
 #: ../data/interfaces/parole.ui.h:22
 msgid "Volume Up"
-msgstr "Aumentar Volume"
+msgstr "Subir o volume"
 
 #: ../data/interfaces/parole.ui.h:23
 msgid "_Edit"
@@ -119,111 +126,119 @@ msgstr "_Editar"
 
 #: ../data/interfaces/parole.ui.h:24
 msgid "_Help"
-msgstr "_Ajuda"
+msgstr "A_xuda"
 
 #: ../data/interfaces/parole.ui.h:25
 msgid "_Media"
-msgstr "_MultimÃ©dia"
+msgstr "_Soportes"
 
 #: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_Ver"
 
 #: ../data/interfaces/parole.ui.h:27
+#, fuzzy
 msgid "gtk-leave-fullscreen"
-msgstr "gtk-deixar-ecrÃ£ completo"
+msgstr "SaÃ

[Xfce4-commits] l10n: Updates to Asturian (ast) translation

2009-10-06 Thread Transifex

Updating branch refs/heads/master
 to b9fa73571f68b49b0836404aac4fe2a8419efba8 (commit)
   from df8ad0098db0d1bc1a2f08b89554607e8ec85b19 (commit)

commit b9fa73571f68b49b0836404aac4fe2a8419efba8
Author: IÃ±igo Varela 
Date:   Tue Oct 6 11:58:54 2009 +

l10n: Updates to Asturian (ast) translation

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

 po/ast.po |   85 +++-
 1 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/po/ast.po b/po/ast.po
index 09351ad..ae28204 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+\n"
-"PO-Revision-Date: 2009-09-03 13:51+0100\n"
+"POT-Creation-Date: 2009-10-06 10:12+\n"
+"PO-Revision-Date: 2009-10-06 13:58+0100\n"
 "Last-Translator: astur \n"
 "Language-Team: Asturian \n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@ msgstr "Media player"
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../data/interfaces/parole.ui.h:10
+#: ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Siguiente CapÃtulu Chapter"
@@ -63,8 +64,10 @@ msgstr "Siguiente CapÃtulu Chapter"
 msgid "None"
 msgstr "DengÃºn"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:234
+#: ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
 msgstr "Parole Media Player"
@@ -73,7 +76,8 @@ msgstr "Parole Media Player"
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../data/interfaces/parole.ui.h:14
+#: ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "CapÃtulu Previu"
@@ -135,14 +139,12 @@ msgid "Site:"
 msgstr "Sitiu:"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
 msgid "Media Player plugins"
-msgstr "Axustes del Reproductor de Medios"
+msgstr "Plugins del Reproductor de Medios"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
 msgid "Parole Plugins"
-msgstr "Preferencies de Complementos de Parole"
+msgstr "Plugins de Parole"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "Audio"
@@ -239,42 +241,39 @@ msgstr "Abrir nueva instancia"
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr ""
+msgstr "Reproducir o posar"
 
 #: ../parole/main.c:186
-#, fuzzy
 msgid "Stop playing"
-msgstr "Amosar llista de reproducciÃ³n"
+msgstr "Detener reproducciÃ³n"
 
 #: ../parole/main.c:187
-#, fuzzy
 msgid "Next track"
 msgstr "Siguiente pista"
 
 #: ../parole/main.c:188
-#, fuzzy
 msgid "Previous track"
 msgstr "Pista previa"
 
 #: ../parole/main.c:189
 msgid "Seek forward"
-msgstr ""
+msgstr "Guetar haza alantre"
 
 #: ../parole/main.c:190
 msgid "Seek Backward"
-msgstr ""
+msgstr "Guetar haza atrÃ¡s"
 
 #: ../parole/main.c:191
 msgid "Raise volume"
-msgstr ""
+msgstr "Xubir el volume"
 
 #: ../parole/main.c:192
 msgid "Lower volume"
-msgstr ""
+msgstr "Menor volume"
 
 #: ../parole/main.c:193
 msgid "Mute volume"
-msgstr ""
+msgstr "Silenciar"
 
 #: ../parole/main.c:194
 msgid "Version information"
@@ -290,21 +289,14 @@ msgid "Parole is already running, use -i to open a new 
instance\n"
 msgstr "Parole yÃ¡ ta executÃ¡ndose, use -i p'abrir una nueva instancia\n"
 
 #: ../parole/parole-gst.c:1289
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaciÃ³n 
"
-"de GStreamer"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer 
installation"
+msgstr "Nun pudo cargase'l complementu playbin GStreamer, comprebe la so 
instalaciÃ³n de GStreamer"
 
 #: ../parole/parole-gst.c:1305
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaciÃ³n "
-"de GStreamer"
+msgid "Unable to load video GStreamer plugin, check your GStreamer 
installation"
+msgstr "Nun pudo cargase'l complementu video GStreamer, comprebe la so 
instalaciÃ³n de GStreamer"
 
 #: ../parole/parole-gst.c:1501
-#, fuzzy
 msgid "The stream is taking too much time to load"
 msgstr "El fluxu ta llevando enforma tiempu pa cargar"
 
@@ -330,11 +322,10 @@ msgstr "Permisu torgÃ¡u"
 
 #: ../parole/parole-medialist.c:454
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Formatu de llista desconocÃu, por favor esbille una llista con formatu "
-"sofitÃ¡u tÃ©unicamente"
+msgstr "Formatu de llista desconocÃu, por favor esbille una llista con 
formatu sofitÃ¡u tÃ©unicamente"
 
-#: ../pa

[Xfce4-commits] Minor changes in the configure script.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 004458939fb81a92f2d307a4a4c1a18a66e1e1c5 (commit)
   from d1b62a10f3d8447639430f276e04667494b35c3b (commit)

commit 004458939fb81a92f2d307a4a4c1a18a66e1e1c5
Author: Jannis Pohlmann 
Date:   Tue Oct 6 14:43:18 2009 +0200

Minor changes in the configure script.

 configure.ac |   18 +-
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6279720..c8b4da9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ dnl ***
 AC_COPYRIGHT([Copyright (c) 2009 Jannis Pohlmann ])
 AC_INIT([tumbler], [tumbler_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
-AC_REVISION([...@revision@])
+ AC_REVISION([...@revision@])
 AC_CANONICAL_TARGET()
 
 dnl ***
@@ -130,15 +130,15 @@ GTK_DOC_CHECK(1.9)
 dnl ***
 dnl *** Check for required packages ***
 dnl ***
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0)
-PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16.0)
-PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16.0)
-PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0.0)
-PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.72)
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.0])
+PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.16.0])
+PKG_CHECK_MODULES([GTHREAD], [gthread-2.0 >= 2.16.0])
+PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.0.0])
+PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1 >= 0.72])
 
-dnl ***
-dnl *** Check PNG libraries ***
-dnl ***
+dnl ***
+dnl *** Check for PNG libraries ***
+dnl ***
 PKG_CHECK_MODULES(PNG, libpng >= 1.2.0, [have_libpng=yes], [
   dnl libpng.pc not found, try with libpng12.pc
   PKG_CHECK_MODULES(PNG, libpng12 >= 1.2.0, 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Put in place dev-tools neutral build environment

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 292fd407ae55590a1d4ec46b0b936c80c5a03384 (commit)
   from f13b573199bf3af409d1836e1e2078f97c45cc98 (commit)

commit 292fd407ae55590a1d4ec46b0b936c80c5a03384
Author: Philip Van Hoof 
Date:   Tue Oct 6 11:46:28 2009 +0200

Put in place dev-tools neutral build environment

Signed-off-by: Jannis Pohlmann 

 autogen.sh => autogen-gnome.sh  |2 +
 docs/Makefile.am => autogen-xfce.sh |   20 ++-
 autogen.sh  |   33 ++---
 configure.ac|9 +-
 m4/xdt-features.m4  |  285 +++
 m4/xdt-i18n.m4  |   90 +++
 6 files changed, 415 insertions(+), 24 deletions(-)

diff --git a/autogen.sh b/autogen-gnome.sh
similarity index 91%
copy from autogen.sh
copy to autogen-gnome.sh
index 27dd499..604002b 100755
--- a/autogen.sh
+++ b/autogen-gnome.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+export ACLOCAL_FLAGS="-I `pwd`/m4 $ACLOCAL_FLAGS"
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
diff --git a/docs/Makefile.am b/autogen-xfce.sh
old mode 100644
new mode 100755
similarity index 61%
copy from docs/Makefile.am
copy to autogen-xfce.sh
index de40f05..21f1742
--- a/docs/Makefile.am
+++ b/autogen-xfce.sh
@@ -1,4 +1,6 @@
-# vi:set ts=8 sw=8 noet ai nocindent:
+#!/bin/sh
+#
+# vi:set et ai sw=2 sts=2 ts=2: */
 # -
 # Copyright (c) 2009 Jannis Pohlmann 
 # 
@@ -17,5 +19,17 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-SUBDIRS =  \
-   reference
+(type xdt-autogen) >/dev/null 2>&1 || {
+  cat >&2

[Xfce4-commits] Rework build files. Fix bugs introduced in previous commits.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to d1b62a10f3d8447639430f276e04667494b35c3b (commit)
   from 292fd407ae55590a1d4ec46b0b936c80c5a03384 (commit)

commit d1b62a10f3d8447639430f276e04667494b35c3b
Author: Jannis Pohlmann 
Date:   Tue Oct 6 14:39:02 2009 +0200

Rework build files. Fix bugs introduced in previous commits.

The build checks for plugins were moved into acinclude.m4. autogen.sh
now passes command line parameters to its delegates autogen-xfce.sh and
autogen-gnome.sh. Removed the ELF visibility stuff from configure.ac and
so on.

 acinclude.m4|   73 ++
 autogen-xfce.sh |3 -
 autogen.sh  |   56 ---
 configure.ac|  144 +--
 docs/reference/tumbler/tumbler-sections.txt |5 +
 plugins/font-thumbnailer/Makefile.am|2 +-
 plugins/pixbuf-thumbnailer/Makefile.am  |2 +-
 7 files changed, 147 insertions(+), 138 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 000..927cfd2
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,73 @@
+dnl vi:set et ai sw=2 sts=2 ts=2: */
+dnl -
+dnl Copyright (c) 2009 Jannis Pohlmann 
+dnl
+dnl This program is free software; you can redistribute it and/or 
+dnl modify it under the terms of the GNU General Public License as
+dnl published by the Free Software Foundation; either version 2 of 
+dnl the License, or (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public 
+dnl License along with this program; if not, write to the Free 
+dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+dnl Boston, MA 02110-1301, USA.
+
+
+
+dnl TUMBLER_PIXBUF_THUMBNAILER()
+dnl
+dnl Check whether to build and install the GdkPibuxf thumbnailer
+dnl
+AC_DEFUN([TUMBLER_PIXBUF_THUMBNAILER],
+[
+AC_ARG_ENABLE([pixbuf-thumbnailer], 
[AC_HELP_STRING([--disable-pixbuf-thumbnailer], [Don't build the GdkPixbuf 
thumbnailer plugin])],
+  [ac_tumbler_pixbuf_thumbnailer=$enableval], 
[ac_tumbler_pixbuf_thumbnailer=yes])
+if test x"$ac_tumbler_pixbuf_thumbnailer" = x"yes"; then
+  PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14], [], 
[ac_tumbler_pixbuf_thumbnailer=no])
+fi
+
+AC_MSG_CHECKING([whether to build the GdkPixbuf thumbnailer plugin])
+AM_CONDITIONAL([TUMBLER_PIXBUF_THUMBNAILER], [test 
x"$ac_tumbler_pixbuf_thumbnailer" = x"yes"])
+AC_MSG_RESULT([$ac_tumbler_pixbuf_thumbnailer])
+])
+
+
+
+dnl TUMBLER_FONT_THUMBNAILER()
+dnl
+dnl Check whether to build and install the GdkPibuxf thumbnailer
+dnl
+AC_DEFUN([TUMBLER_FONT_THUMBNAILER],
+[
+AC_ARG_ENABLE([font-thumbnailer], 
[AC_HELP_STRING([--disable-font-thumbnailer], [Don't build the FreeType font 
thumbnailer plugin])],
+  [ac_tumbler_font_thumbnailer=$enableval], [ac_tumbler_font_thumbnailer=yes])
+if test x"$ac_tumbler_font_thumbnailer" = x"yes"; then
+  dnl Check for FreeType 2.x
+  FREETYPE_LIBS=""
+  FREETYPE_CFLAGS=""
+  AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no])
+  if test x"$FREETYPE_CONFIG" != x"no"; then
+AC_MSG_CHECKING([FREETYPE_CFLAGS])
+FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
+AC_MSG_RESULT([$FREETYPE_CFLAGS])
+  
+AC_MSG_CHECKING([FREETYPE_LIBS])
+FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
+AC_MSG_RESULT([$FREETYPE_LIBS])
+  else
+dnl We can only build the font thumbnailer if FreeType 2.x is available
+ac_tumbler_font_thumbnailer=no
+  fi
+  AC_SUBST([FREETYPE_CFLAGS])
+  AC_SUBST([FREETYPE_LIBS])
+fi
+
+AC_MSG_CHECKING([whether to build the FreeType thumbnailer plugin])
+AM_CONDITIONAL([TUMBLER_FONT_THUMBNAILER], [test 
x"$ac_tumbler_font_thumbnailer" = x"yes"])
+AC_MSG_RESULT([$ac_tumbler_font_thumbnailer])
+])
diff --git a/autogen-xfce.sh b/autogen-xfce.sh
index 21f1742..9b2486b 100755
--- a/autogen-xfce.sh
+++ b/autogen-xfce.sh
@@ -29,7 +29,4 @@ EOF
   exit 1
 }
 
-# # initialize GTK-Doc
-# gtkdocize || exit 1
-
 XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec xdt-autogen $@
diff --git a/autogen.sh b/autogen.sh
index 51551ce..3e3c4c3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,51 @@
-which xdt-autogen
+#!/bin/sh
+#
+# vi:set et ai sw=2 sts=2 ts=2: */
+# -
+# Copyright (c) 2009 Jannis Pohlmann 
+# 
+# This program is free software; you can redistribute it and/or 
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of 
+# the License, 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 FITN

[Xfce4-commits] Prepare build environment for Maemo compatibility

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to f13b573199bf3af409d1836e1e2078f97c45cc98 (commit)
   from f9053a4334e1a8642ae31284c734052d0e206347 (commit)

commit f13b573199bf3af409d1836e1e2078f97c45cc98
Author: Philip Van Hoof 
Date:   Wed Sep 30 15:44:38 2009 +0200

Prepare build environment for Maemo compatibility

Signed-off-by: Jannis Pohlmann 

 autogen.sh  |   49 +++---
 configure.in.in => configure.ac |   40 +--
 plugins/xdg-cache/Makefile.am   |4 +++
 3 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 21f1742..27dd499 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,35 +1,24 @@
 #!/bin/sh
-#
-# vi:set et ai sw=2 sts=2 ts=2: */
-# -
-# Copyright (c) 2009 Jannis Pohlmann 
-# 
-# This program is free software; you can redistribute it and/or 
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of 
-# the License, 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., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# Run this to generate all the initial makefiles, etc.
 
-(type xdt-autogen) >/dev/null 2>&1 || {
-  cat >&2 = 2.16.0)
+PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16.0)
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16.0)
+PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0.0)
+PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.72)
+
+PKG_CHECK_MODULES(PNG, libpng >= 1.2.0, [have_libpng=yes], [
   dnl libpng.pc not found, try with libpng12.pc
-  XDT_CHECK_PACKAGE([PNG], [libpng12], [1.2.0])
+  PKG_CHECK_MODULES(PNG, libpng12 >= 1.2.0, 
+[have_libpng=yes],
+[jhave_libpng=no])
 ])
+AM_CONDITIONAL([HAVE_LIBPNG], test x"$have_libpng" = x"yes")
 
 dnl ***
 dnl *** Check for the pixbuf thumbnailer plugin ***
@@ -146,10 +149,21 @@ AC_ARG_ENABLE([pixbuf-thumbnailer],
   [AC_HELP_STRING([--enable-pixbuf-thumbnailer],
   [Enable the pixbuf thumbnailer plugin 
@<:@default=yes@:>@])],,
   [enable_pixbuf_thumbnailer=yes])
+
 if test x"$enable_pixbuf_thumbnailer" = x"yes"; then
-  AC_DEFINE([ENABLE_PIXBUF_THUMBNAILER], [1], [Define if the pixbuf 
thumbnailer plugin is enabled])
+  PKG_CHECK_MODULES(GDK_PIXBUF, 
+gdk-pixbuf-2.0 >= 2.14,
+[have_gdkpixbuf=yes], 
+[have_gdkpixbuf=no])
+
+  if test "x$have_gdkpixbuf" = "xyes"; then
+AC_DEFINE([HAVE_PIXBUF], [1], [Define if the pixbuf thumbnailer plugin is 
enabled])
+  fi
+else
+  have_gdkpixbuf="no  (disabled)"
 fi
-AM_CONDITIONAL([ENABLE_PIXBUF_THUMBNAILER], test x"$enable_pixbuf_thumbnailer" 
= x"yes")
+
+AM_CONDITIONAL([ENABLE_PIXBUF_THUMBNAILER], test x"$have_gdkpixbuf" = x"yes")
 
 dnl *
 dnl *** Check

[Xfce4-commits] l10n: Updates to Ukrainian (uk) translation

2009-10-06 Thread Transifex

Updating branch refs/heads/master
 to d4b354cd8420c6b68309ffdd146df5f32e61177d (commit)
   from 2dc2f01162cc1c7c1b50ecea844508c3961beb1a (commit)

commit d4b354cd8420c6b68309ffdd146df5f32e61177d
Author: Andriy Matkovsky 
Date:   Tue Oct 6 12:50:04 2009 +

l10n: Updates to Ukrainian (uk) translation

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

 po/uk.po |  215 +
 1 files changed, 88 insertions(+), 127 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index b6f2945..8d1b085 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-31 14:02+0200\n"
-"PO-Revision-Date: 2009-02-24 19:58+0200\n"
-"Last-Translator: Dmitry Nikitin \n"
+"PO-Revision-Date: 2009-10-03 18:41+0300\n"
+"Last-Translator: Andriy Matkovsky \n"
 "Language-Team: Ukrainian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +16,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
 msgid "Screenshot.png"
 msgstr "ÐÐ½ÑÐ¼Ð¾Ðº_ÐµÐºÑÐ°Ð½Ñ.png"
 
@@ -28,20 +27,19 @@ msgstr "ÐÐ½ÑÐ¼Ð¾Ðº_ÐµÐºÑÐ°Ð½Ñ-%d.png"
 #: ../lib/screenshooter-dialogs.c:493
 #, c-format
 msgid "%.2fKb of %.2fKb"
-msgstr ""
+msgstr "%.2fÐÐ± Ð· %.2fÐÐ±"
 
 #: ../lib/screenshooter-dialogs.c:577
+#, fuzzy
 msgid "Transfer"
-msgstr ""
+msgstr "ÐÐµÑÐµÐ´Ð°ÑÐ°"
 
 #: ../lib/screenshooter-dialogs.c:600
-#, fuzzy
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr "ÐÑÑ   "
+msgid "The screenshot is being 
transferred to:"
+msgstr "ÐÐ½ÑÐ¼Ð¾Ðº 
Ð¿ÐµÑÐµÑÐ¸Ð»Ð°ÑÑÑÑÑ Ð½Ð°  "
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:724
+#: ../lib/screenshooter-dialogs.c:741
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
@@ -57,14 +55,14 @@ msgstr "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸"
 
 #: ../lib/screenshooter-dialogs.c:793
 msgid "Region to capture"
-msgstr ""
-"ÐÐ±Ð»Ð°ÑÑÑ 
Ð·Ð°ÑÐ¾Ð¿Ð»ÐµÐ½Ð½Ñ"
+msgstr "ÐÐ±Ð»Ð°ÑÑÑ 
Ð·Ð°ÑÐ¾Ð¿Ð»ÐµÐ½Ð½Ñ"
 
 #: ../lib/screenshooter-dialogs.c:820
 msgid "Entire screen"
 msgstr "ÐÐµÑÑ ÐµÐºÑÐ°Ð½"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
+#: ../lib/screenshooter-dialogs.c:830
+#: ../src/main.c:58
 #: ../panel-plugin/screenshooter-plugin.c:292
 msgid "Take a screenshot of the entire screen"
 msgstr "ÐÑÐ¾Ð±Ð¸ÑÐ¸ Ð·Ð½ÑÐ¼Ð¾Ðº Ð²ÑÑÐ¾Ð³Ð¾ ÐµÐºÑÐ°Ð½Ñ"
@@ -73,7 +71,8 @@ msgstr "ÐÑÐ¾Ð±Ð¸ÑÐ¸ Ð·Ð½ÑÐ¼Ð¾Ðº Ð²ÑÑÐ¾Ð³Ð¾ ÐµÐºÑÐ°Ð½Ñ"
 msgid "Active window"
 msgstr "ÐÐºÑÐ¸Ð²Ð½Ð¾Ð³Ð¾ Ð²ÑÐºÐ½Ð°"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
+#: ../lib/screenshooter-dialogs.c:851
+#: ../src/main.c:104
 #: ../panel-plugin/screenshooter-plugin.c:297
 msgid "Take a screenshot of the active window"
 msgstr "ÐÑÐ¾Ð±Ð¸ÑÐ¸ Ð·Ð½ÑÐ¼Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½Ð¾Ð³Ð¾ Ð²ÑÐºÐ½Ð°"
@@ -82,32 +81,23 @@ msgstr "ÐÑÐ¾Ð±Ð¸ÑÐ¸ Ð·Ð½ÑÐ¼Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½Ð¾Ð³Ð¾ 
Ð²ÑÐºÐ½Ð°"
 msgid "Select a region"
 msgstr "ÐÐ¸Ð´ÑÐ»ÐµÐ½Ð¾Ñ Ð¾Ð±Ð»Ð°ÑÑÑ"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
+#: ../lib/screenshooter-dialogs.c:872
+#: ../src/main.c:78
 #: ../panel-plugin/screenshooter-plugin.c:302
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"ÐÐ¸Ð±ÐµÑÑÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ Ð´Ð»Ñ Ð·Ð°ÑÐ¾Ð¿Ð»ÐµÐ½Ð½Ñ ÑÐ»ÑÑÐ¾Ð¼ 
ÐºÐ»Ð°ÑÐ°Ð½Ð½Ñ Ð¼Ð¸ÑÐºÐ¾Ñ Ð½Ð° ÐµÐºÑÐ°Ð½Ñ Ñ Ð±ÐµÐ· "
-"Ð²ÑÐ´Ð¿ÑÑÐºÐ°Ð½Ð½Ñ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¼Ð¸ÑÑ Ð¿ÐµÑÐµÑÑÐ½ÑÑÐµ 
Ð²ÐºÐ°Ð·ÑÐ²Ð½Ð¸Ðº Ð² ÑÐ½ÑÐ¸Ð¹ ÐºÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ Ñ ÑÐ¾Ð´Ñ "
-"Ð²ÑÐ´Ð¿ÑÑÑÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ Ð¼Ð¸ÑÑ."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "ÐÐ¸Ð±ÐµÑÑÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ Ð´Ð»Ñ Ð·Ð°ÑÐ¾Ð¿Ð»ÐµÐ½Ð½Ñ 
ÑÐ»ÑÑÐ¾Ð¼ ÐºÐ»Ð°ÑÐ°Ð½Ð½Ñ Ð¼Ð¸ÑÐºÐ¾Ñ Ð½Ð° ÐµÐºÑÐ°Ð½Ñ Ñ Ð±ÐµÐ· 
Ð²ÑÐ´Ð¿ÑÑÐºÐ°Ð½Ð½Ñ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¼Ð¸ÑÑ Ð¿ÐµÑÐµÑÑÐ½ÑÑÐµ 
Ð²ÐºÐ°Ð·ÑÐ²Ð½Ð¸Ðº Ð² ÑÐ½ÑÐ¸Ð¹ ÐºÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ Ñ ÑÐ¾Ð´Ñ 
Ð²ÑÐ´Ð¿ÑÑÑÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ Ð¼Ð¸ÑÑ."
 
 #: ../lib/screenshooter-dialogs.c:884
 msgid "Capture the mouse pointer"
-msgstr ""
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÐ¸ ÐºÑÑÑÐ¾Ñ Ð¼Ð¸ÑÑ"
 
 #: ../lib/screenshooter-dialogs.c:892
-#, fuzzy
 msgid "Display the mouse pointer on the screenshot"
-msgstr "ÐÐµ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶Ð°ÑÐ¸ Ð´ÑÐ°Ð»Ð¾Ð³ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ"
+msgstr "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÐ¸ ÐºÑÑÑÐ¾Ñ Ð¼Ð¸ÑÑ Ð½Ð° Ð·Ð½ÑÐ¼ÐºÑ"
 
 #: ../lib/screenshooter-dialogs.c:917
-#, fuzzy
-msgid ""
-"Delay before capturing"
-msgstr ""
-"ÐÐ±Ð»Ð°ÑÑÑ 
Ð·Ð°ÑÐ¾Ð¿Ð»ÐµÐ½Ð½Ñ"
+msgid "Delay before 
capturing"
+msgstr "ÐÐ°ÑÑÐ¸Ð¼ÐºÐ° 
Ð¿ÐµÑÐµÐ´ Ð·Ð½ÑÐ¼ÐºÐ

[Xfce4-commits] Use MAINTAINERCLEANFILES for the interface file

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to e277cb14c45c8743c011bf37dfc86d8237826350 (commit)
   from 05da20fa24fd8e0872940b94ff7fe26db1429512 (commit)

commit e277cb14c45c8743c011bf37dfc86d8237826350
Author: Ali Abdallah 
Date:   Tue Oct 6 15:28:01 2009 +

Use MAINTAINERCLEANFILES for the interface file

 configure.ac.in |6 +++---
 data/interfaces/Makefile.am |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 0e581bc..6a0fc0c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,9 +1,9 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major],  [0])
 m4_define([xfpm_version_minor],  [8])
-m4_define([xfpm_version_micro],  [4])
-m4_define([xfpm_version_build],  [])
-m4_define([xfpm_version_tag],[])
+m4_define([xfpm_version_micro],  [4.1])
+m4_define([xfpm_version_build],  [...@revision@])
+m4_define([xfpm_version_tag],[git])
 m4_define([xfpm_version], 
[xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(),
 [git], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
 
 AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 97c67c9..f7e309f 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -10,7 +10,7 @@ xfpm-settings_ui.h: xfpm-settings.ui
exo-csource --static --strip-comments --strip-content 
--name=xfpm_settings_ui $< > $@
 endif
 
-DISTCLEANFILES =   \
+MAINTAINERCLEANFILES = \
$(interfaces_h)
 
 EXTRA_DIST =   \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Remove xfce4-dev-tools specific code from the neutral autogen.sh.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to d45f5f4513054181673326d8be2b2223bc5e70c3 (commit)
   from 004458939fb81a92f2d307a4a4c1a18a66e1e1c5 (commit)

commit d45f5f4513054181673326d8be2b2223bc5e70c3
Author: Jannis Pohlmann 
Date:   Tue Oct 6 15:20:15 2009 +0200

Remove xfce4-dev-tools specific code from the neutral autogen.sh.

 autogen.sh |   10 --
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 3e3c4c3..f8695f4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,16 +19,6 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-(type xdt-autogen) >/dev/null 2>&1 || {
-  cat >&2

[Xfce4-commits] Add GdkPixbuf check to the font thumbnailer, add xdg cache macro.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 8daf819c6671a1d261731b169d228cecbb568644 (commit)
   from d45f5f4513054181673326d8be2b2223bc5e70c3 (commit)

commit 8daf819c6671a1d261731b169d228cecbb568644
Author: Jannis Pohlmann 
Date:   Tue Oct 6 15:33:52 2009 +0200

Add GdkPixbuf check to the font thumbnailer, add xdg cache macro.

 acinclude.m4 |   77 +++---
 1 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 927cfd2..ecb740a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -21,13 +21,14 @@ dnl Boston, MA 02110-1301, USA.
 
 dnl TUMBLER_PIXBUF_THUMBNAILER()
 dnl
-dnl Check whether to build and install the GdkPibuxf thumbnailer
+dnl Check whether to build and install the GdkPibuxf thumbnailer plugin.
 dnl
 AC_DEFUN([TUMBLER_PIXBUF_THUMBNAILER],
 [
 AC_ARG_ENABLE([pixbuf-thumbnailer], 
[AC_HELP_STRING([--disable-pixbuf-thumbnailer], [Don't build the GdkPixbuf 
thumbnailer plugin])],
   [ac_tumbler_pixbuf_thumbnailer=$enableval], 
[ac_tumbler_pixbuf_thumbnailer=yes])
 if test x"$ac_tumbler_pixbuf_thumbnailer" = x"yes"; then
+  dnl Check for gdk-pixbuf
   PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14], [], 
[ac_tumbler_pixbuf_thumbnailer=no])
 fi
 
@@ -40,34 +41,70 @@ AC_MSG_RESULT([$ac_tumbler_pixbuf_thumbnailer])
 
 dnl TUMBLER_FONT_THUMBNAILER()
 dnl
-dnl Check whether to build and install the GdkPibuxf thumbnailer
+dnl Check whether to build and install the FreeType2 font thumbnailer plugin.
 dnl
 AC_DEFUN([TUMBLER_FONT_THUMBNAILER],
 [
 AC_ARG_ENABLE([font-thumbnailer], 
[AC_HELP_STRING([--disable-font-thumbnailer], [Don't build the FreeType font 
thumbnailer plugin])],
   [ac_tumbler_font_thumbnailer=$enableval], [ac_tumbler_font_thumbnailer=yes])
 if test x"$ac_tumbler_font_thumbnailer" = x"yes"; then
-  dnl Check for FreeType 2.x
-  FREETYPE_LIBS=""
-  FREETYPE_CFLAGS=""
-  AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no])
-  if test x"$FREETYPE_CONFIG" != x"no"; then
-AC_MSG_CHECKING([FREETYPE_CFLAGS])
-FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
-AC_MSG_RESULT([$FREETYPE_CFLAGS])
-  
-AC_MSG_CHECKING([FREETYPE_LIBS])
-FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
-AC_MSG_RESULT([$FREETYPE_LIBS])
-  else
-dnl We can only build the font thumbnailer if FreeType 2.x is available
-ac_tumbler_font_thumbnailer=no
-  fi
-  AC_SUBST([FREETYPE_CFLAGS])
-  AC_SUBST([FREETYPE_LIBS])
+  dnl Check for gdk-pixbuf 
+  PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14], 
+  [
+dnl Check for FreeType 2.x
+FREETYPE_LIBS=""
+FREETYPE_CFLAGS=""
+AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no])
+if test x"$FREETYPE_CONFIG" != x"no"; then
+  AC_MSG_CHECKING([FREETYPE_CFLAGS])
+  FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
+  AC_MSG_RESULT([$FREETYPE_CFLAGS])
+
+  AC_MSG_CHECKING([FREETYPE_LIBS])
+  FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
+  AC_MSG_RESULT([$FREETYPE_LIBS])
+else
+  dnl We can only build the font thumbnailer if FreeType 2.x is available
+  ac_tumbler_font_thumbnailer=no
+fi
+AC_SUBST([FREETYPE_CFLAGS])
+AC_SUBST([FREETYPE_LIBS])
+  ], [ac_tumbler_font_thumbnailer=no])
 fi
 
 AC_MSG_CHECKING([whether to build the FreeType thumbnailer plugin])
 AM_CONDITIONAL([TUMBLER_FONT_THUMBNAILER], [test 
x"$ac_tumbler_font_thumbnailer" = x"yes"])
 AC_MSG_RESULT([$ac_tumbler_font_thumbnailer])
 ])
+
+
+
+dnl TUMBLER_XDG_CACHE()
+dnl
+dnl Check whether to build and install the freedesktop.org cache plugin.
+dnl
+AC_DEFUN([TUMBLER_XDG_CACHE],
+[
+AC_ARG_ENABLE([xdg-cache], [AC_HELP_STRING([--disable-xdg-cache], [Don't build 
the freedesktop.org cache plugin])],
+  [ac_tumbler_xdg_cache=$enableval], [ac_tumbler_xdg_cache=yes])
+if test x"$ac_tumbler_xdg_cache" = x"yes"; then
+  dnl Check for gdk-pixbuf 
+  PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14], 
+  [
+dnl Check for PNG libraries
+PKG_CHECK_MODULES(PNG, libpng >= 1.2.0, [have_libpng=yes], 
+[
+  dnl libpng.pc not found, try with libpng12.pc
+  PKG_CHECK_MODULES(PNG, libpng12 >= 1.2.0, [have_libpng=yes], 
+  [
+have_libpng=no
+ac_tumbler_xdg_cache=no
+  ])
+])
+  ], [ac_tumbler_xdg_cache=no])
+fi
+
+AC_MSG_CHECKING([whether to build the freedesktop.org cache plugin])
+AM_CONDITIONAL([TUMBLER_XDG_CACHE], [test x"$ac_tumbler_xdg_cache" = x"yes"])
+AC_MSG_RESULT([$ac_tumbler_xdg_cache])
+])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Use xdg cache macro. Drop revision versioning. Drop MAINTAINER_MODE.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 107f638da92c8da10b3b34c8fb5ad81e1690c9cd (commit)
   from 8daf819c6671a1d261731b169d228cecbb568644 (commit)

commit 107f638da92c8da10b3b34c8fb5ad81e1690c9cd
Author: Jannis Pohlmann 
Date:   Tue Oct 6 15:35:10 2009 +0200

Use xdg cache macro. Drop revision versioning. Drop MAINTAINER_MODE.

Don't generate the D-Bus C bindings before creating the dist tarball.
Instead, ship the XML infos and generate the bindings at build time.
This requires a separate check for dbus-binding-tool.

 configure.ac  |   40 +++-
 plugins/xdg-cache/Makefile.am |2 +-
 tumbler/Makefile.am   |   21 -
 tumblerd/Makefile.am  |   10 +++---
 4 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/configure.ac b/configure.ac
index c8b4da9..813954a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,14 +25,12 @@ m4_define([tumbler_version_api_major], [1])
 m4_define([tumbler_version_major], [0])
 m4_define([tumbler_version_minor], [0])
 m4_define([tumbler_version_micro], [0])
-m4_define([tumbler_version_build], [...@revision@])
-m4_define([tumbler_version_tag], [svn])
-m4_define([tumbler_version], 
[tumbler_version_major().tumbler_version_minor().tumbler_version_micro()ifelse(tumbler_version_tag(),
 [svn], [tumbler_version_tag()-tumbler_version_build()], 
[tumbler_version_tag()])])
+m4_define([tumbler_version], 
[tumbler_version_major().tumbler_version_minor().tumbler_version_micro()])
 
 dnl 
 dnl *** Full debug support for SVN snapshots ***
 dnl 
-m4_define([tumbler_debug_default], [ifelse(tumbler_version_tag(), [svn], 
[full], [minimum])])
+m4_define([tumbler_debug_default], [minimum])
 
 dnl ***
 dnl *** Initialize autoconf ***
@@ -40,7 +38,6 @@ dnl ***
 AC_COPYRIGHT([Copyright (c) 2009 Jannis Pohlmann ])
 AC_INIT([tumbler], [tumbler_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
- AC_REVISION([...@revision@])
 AC_CANONICAL_TARGET()
 
 dnl ***
@@ -48,7 +45,7 @@ dnl *** Initialize automake ***
 dnl ***
 AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
 AC_CONFIG_MACRO_DIR([m4])
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_AMFLAGS -I m4")
+AC_SUBST([ACLOCAL_AMFLAGS], ["$ACLOCAL_FLAGS -I m4"])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
 
@@ -128,6 +125,17 @@ dnl *
 GTK_DOC_CHECK(1.9)
 
 dnl ***
+dnl *** Check for dbus-binding-tool ***
+dnl ***
+AC_ARG_VAR([DBUS_BINDING_TOOL], [Tool to generate C bindings from XML D-Bus 
interface definitions])
+AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+if test x"$DBUS_BINDING_TOOL" = x"no"; then
+  AC_MSG_ERROR([could not find dbus-binding-tool in \$PATH. You can run
+  ./configure DBUS_BINDING_TOOL=/path/to/dbus-binding-tool to define 
+  a custom location for it.])
+fi
+
+dnl ***
 dnl *** Check for required packages ***
 dnl ***
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.0])
@@ -136,22 +144,12 @@ PKG_CHECK_MODULES([GTHREAD], [gthread-2.0 >= 2.16.0])
 PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.0.0])
 PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1 >= 0.72])
 
-dnl ***
-dnl *** Check for PNG libraries ***
-dnl ***
-PKG_CHECK_MODULES(PNG, libpng >= 1.2.0, [have_libpng=yes], [
-  dnl libpng.pc not found, try with libpng12.pc
-  PKG_CHECK_MODULES(PNG, libpng12 >= 1.2.0, 
-[have_libpng=yes],
-[jhave_libpng=no])
-])
-AM_CONDITIONAL([HAVE_LIBPNG], test x"$have_libpng" = x"yes")
-
 dnl *
 dnl *** Check for plugins ***
 dnl *
 TUMBLER_PIXBUF_THUMBNAILER()
 TUMBLER_FONT_THUMBNAILER()
+TUMBLER_XDG_CACHE()
 
 dnl 
 dnl *** Check for thumbnail flavors (normal, large, cropped) ***
@@ -214,6 +212,9 @@ echo
 echo "Build Configuration:"
 echo
 echo "  * Debug:$enable_debug"
+echo
+echo "Plugins:"
+echo
 if test x"$ac_tumbler_pixbuf_thumbnailer" = x"yes"; then
 echo "  * GdkPixbuf thumbnailer plugin: yes"
 else
@@ -224,6 +225,11 @@ echo "  * FreeType font thumbnailer plugin: yes"
 else
 echo "  * FreeType font thumbnailer plugin: no"
 fi
+if test x"$ac_tumbler_xdg_cache" = x"yes"; then
+echo "  * Freedesktop.org cache plugin: yes"
+else
+echo "  * Freedesktop.org cache plugin: no"
+fi
 echo
 echo "Supported Thumbnail Flavors:"
 echo
diff --git a/plugins/xdg-cache/Makefile.am b/plugins/xdg-cache/Makefile.am
index b03ef21..14cb770 100644
--- a/plugins/xdg-cache/Makefile.am
+++ b/plugins/xdg-cache/Makefile.am
@@ -17,7 +17,7 @@
 # Software Fou

[Xfce4-commits] Fix broken background image when compositing is disabled (bug #5645).

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to e8244292fa3d24314f54883fa1b97c3e2e85cd43 (commit)
   from 13986de3ae7033affaf977ec3c1ae55c467606e5 (commit)

commit e8244292fa3d24314f54883fa1b97c3e2e85cd43
Author: Nick Schermer 
Date:   Tue Oct 6 15:48:41 2009 +0200

Fix broken background image when compositing is disabled (bug #5645).

 Terminal.glade |4 ++--
 terminal/terminal-screen.c |   28 +---
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/Terminal.glade b/Terminal.glade
index 8704b8a..0091a0c 100644
--- a/Terminal.glade
+++ b/Terminal.glade
@@ -1978,10 +1978,10 @@ when double clicking:
 
   
   
-0.050003
+0
 1
 0.01
-0.10001
+0.1
   
   
 
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 1a07c0e..446b44f 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -994,7 +994,8 @@ terminal_screen_timer_background (gpointer user_data)
   TerminalBackground   background_mode;
   GdkPixbuf   *image;
   gdouble  background_darkness;
-  gboolean transparent = FALSE;
+  gdouble  saturation = 1.0;
+  guint16  opacity = 0x;
 
   terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
   terminal_return_val_if_fail (VTE_IS_TERMINAL (screen->terminal), FALSE);
@@ -1003,7 +1004,6 @@ terminal_screen_timer_background (gpointer user_data)
 
   g_object_get (G_OBJECT (screen->preferences), "background-mode", 
&background_mode, NULL);
 
-
   if (G_UNLIKELY (background_mode == TERMINAL_BACKGROUND_IMAGE))
 {
   loader = terminal_image_loader_get ();
@@ -1026,25 +1026,15 @@ terminal_screen_timer_background (gpointer user_data)
 {
   g_object_get (G_OBJECT (screen->preferences), "background-darkness", 
&background_darkness, NULL);
 
-  if (gtk_widget_is_composited (GTK_WIDGET (screen)))
-{
-  vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0x * 
background_darkness);
-  vte_terminal_set_background_saturation (VTE_TERMINAL 
(screen->terminal), 1.0);
-}
-  else
-{
-  vte_terminal_set_background_saturation (VTE_TERMINAL 
(screen->terminal), 1.0 - background_darkness);
-  vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0x);
-  transparent = TRUE;
-}
-}
-  else
-{
-  vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), 
1.0);
-  vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0x);
+  saturation = 1.0 - background_darkness;
+  opacity = 0x * background_darkness;
 }
 
-  vte_terminal_set_background_transparent (VTE_TERMINAL (screen->terminal), 
transparent);
+  vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), 
saturation);
+  vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), opacity);
+  vte_terminal_set_background_transparent (VTE_TERMINAL (screen->terminal),
+   background_mode == 
TERMINAL_BACKGROUND_TRANSPARENT
+   && !gtk_widget_is_composited 
(GTK_WIDGET (screen)));
 
   screen->last_size_change = time (NULL);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix some untranslatable strings

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to 795a28c9be6e6c3556a10f0064c75de639fedf7f (commit)
   from b9fa73571f68b49b0836404aac4fe2a8419efba8 (commit)

commit 795a28c9be6e6c3556a10f0064c75de639fedf7f
Author: Ali Abdallah 
Date:   Tue Oct 6 15:54:56 2009 +

Fix some untranslatable strings

 data/interfaces/parole.ui  |2 +-
 data/interfaces/plugins.ui |4 +-
 parole/parole-statusbar.c  |2 +-
 po/ast.po  |   69 ---
 po/da.po   |   23 +-
 po/es.po   |   23 +-
 po/id.po   |   23 +-
 po/ja.po   |   23 +-
 po/parole.pot  |   20 +++-
 po/ru.po   |   23 +-
 po/sk.po   |   23 +-
 po/tr.po   |   23 +-
 po/uk.po   |   23 +-
 13 files changed, 235 insertions(+), 46 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 6fe1f24..6137bbf 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -38,7 +38,7 @@
 
 
   
-_Open location
+_Open 
location
 True
 True
 image5
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index 3253620..70df469 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -50,7 +50,7 @@
 
   
 True
-Enabled
+Enabled
 True
 
   
@@ -64,7 +64,7 @@
 
 
   
-Plugin
+Plugin
 
   
   
diff --git a/parole/parole-statusbar.c b/parole/parole-statusbar.c
index b75cda5..9563b09 100644
--- a/parole/parole-statusbar.c
+++ b/parole/parole-statusbar.c
@@ -85,7 +85,7 @@ parole_statusbar_set_duration (ParoleStatusbar *bar, 
ParoleState state, gdouble
if ( bar->priv->duration != 0)
{
text = g_strdup_printf ("%s %4.2f/%4.2f", 
-   state == PAROLE_STATE_PAUSED ? _("Paused") 
: ("Playing"), position, bar->priv->duration);
+   state == PAROLE_STATE_PAUSED ? _("Paused") 
: _("Playing"), position, bar->priv->duration);
}
if ( text )
{
diff --git a/po/ast.po b/po/ast.po
index ae28204..bd5633e 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:12+\n"
+"POT-Creation-Date: 2009-10-06 15:54+\n"
 "PO-Revision-Date: 2009-10-06 13:58+0100\n"
 "Last-Translator: astur \n"
 "Language-Team: Asturian \n"
@@ -54,8 +54,7 @@ msgstr "Media player"
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../data/interfaces/parole.ui.h:10
-#: ../parole/parole-player.c:1047
+#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Siguiente CapÃtulu Chapter"
@@ -64,10 +63,8 @@ msgstr "Siguiente CapÃtulu Chapter"
 msgid "None"
 msgstr "DengÃºn"
 
-#: ../data/interfaces/parole.ui.h:12
-#: ../data/desktop/parole.desktop.in.in.h:1
-#: ../parole/parole-player.c:234
-#: ../parole/parole-about.c:51
+#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
 msgstr "Parole Media Player"
@@ -76,8 +73,7 @@ msgstr "Parole Media Player"
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../data/interfaces/parole.ui.h:14
-#: ../parole/parole-player.c:1059
+#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "CapÃtulu Previu"
@@ -123,6 +119,11 @@ msgid "_Media"
 msgstr "_Media"
 
 #: ../data/interfaces/parole.ui.h:25
+#, fuzzy
+msgid "_Open location"
+msgstr "Abrir llugar..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_Ver"
 
@@ -139,13 +140,22 @@ msgid "Site:"
 msgstr "Sitiu:"
 
 #: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr ""
+
+#: ../data/interfaces/plugins.ui.h:5
 msgid "Media Player plugins"
 msgstr "Plugins del Reproductor de Medios"
 
-#: ../data/interfaces/plugins.ui.h:5
+#: ../data/interfaces/plugins.ui.h:6
 msgid "Parole Plugins"
 msgstr "Plugins de Parole"
 
+#: ../data/interfaces/plugins.ui.h:7
+#, fuzzy
+msgid "Plugin"
+msgstr "Plugins"
+
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "Audio"
 msgstr "Audio"
@@ -289,12 +299,18 @@ m

[Xfce4-commits] Post-release version bump.

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to da9126d9d1c2b6331f8ddd0071d27703aaa421b2 (commit)
   from c457efda2aba522fe1fd00d855ba2e257589c8f1 (commit)

commit da9126d9d1c2b6331f8ddd0071d27703aaa421b2
Author: Nick Schermer 
Date:   Tue Oct 6 17:08:50 2009 +0200

Post-release version bump.

 configure.in.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index b83a7c7..c639cad 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -14,7 +14,7 @@ m4_define([terminal_version_minor], [4])
 m4_define([terminal_version_micro], [2])
 m4_define([terminal_version_nano], [])
 m4_define([terminal_version_build], [...@revision@])
-m4_define([terminal_version_tag], [])
+m4_define([terminal_version_tag], [git])
 m4_define([terminal_version_dbus], [3])
 m4_define([terminal_version], 
[terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(),
 [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], 
[terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])])
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Updates for 0.4.2 release.

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to c457efda2aba522fe1fd00d855ba2e257589c8f1 (commit)
   from 3a54b0dd14a2fa1cda1ce81135bb79493d4241bf (commit)

commit c457efda2aba522fe1fd00d855ba2e257589c8f1
Author: Nick Schermer 
Date:   Tue Oct 6 17:06:21 2009 +0200

Updates for 0.4.2 release.

 NEWS|7 +++
 configure.in.in |4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 49ed642..af96cd0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+0.4.2
+=
+- Fix broken background image when compositing is disabled (bug #5645).
+- Use new xdt-autogen macros.
+- Translation updates (ast, gl, cs, ja, da).
+
+
 0.4.1
 =
 - Install documentation in @docdir@ (bug #5593).
diff --git a/configure.in.in b/configure.in.in
index f31b9f7..b83a7c7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -11,10 +11,10 @@ dnl *** Version information ***
 dnl ***
 m4_define([terminal_version_major], [0])
 m4_define([terminal_version_minor], [4])
-m4_define([terminal_version_micro], [1])
+m4_define([terminal_version_micro], [2])
 m4_define([terminal_version_nano], [])
 m4_define([terminal_version_build], [...@revision@])
-m4_define([terminal_version_tag], [git])
+m4_define([terminal_version_tag], [])
 m4_define([terminal_version_dbus], [3])
 m4_define([terminal_version], 
[terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(),
 [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], 
[terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])])
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Use new xdt-autogen macros.

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/master
 to 3a54b0dd14a2fa1cda1ce81135bb79493d4241bf (commit)
   from e8244292fa3d24314f54883fa1b97c3e2e85cd43 (commit)

commit 3a54b0dd14a2fa1cda1ce81135bb79493d4241bf
Author: Nick Schermer 
Date:   Tue Oct 6 17:05:33 2009 +0200

Use new xdt-autogen macros.

 autogen.sh  |2 +-
 configure.in.in |   98 +-
 2 files changed, 3 insertions(+), 97 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index bbe8b47..5aef7d9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@
 # and Brian Tarricone .
 #
 
-export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.2"
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <@], [Turn on 
debugging @<:@default=terminal_debug_default@:>@]),
-  [], [enable_debug=terminal_debug_default])
-AC_MSG_CHECKING([whether to enable debugging support])
-if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
-  dnl Print the result
-  AC_MSG_RESULT([$enable_debug])
-
-  dnl Check whether the compiler accepts the -Werror
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -Werror"
-  AC_MSG_CHECKING([whether $CC accepts -Werror])
-  AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
-AC_MSG_RESULT([yes])
-PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Werror"
-  ], [
-AC_MSG_RESULT([no])
-
-   dnl Check whether the compiler accepts the -errwarn=%all
-   CFLAGS="$save_CFLAGS -errwarn=%all"
-   AC_MSG_CHECKING([whether $CC accepts -errwarn=%all])
-   AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
-   AC_MSG_RESULT([yes])
-   PLATFORM_CFLAGS="$PLATFORM_CFLAGS -errwarn=%all"
-   ], [
-   AC_MSG_RESULT([no])
-   ])
-  ])
-  CFLAGS="$save_CFLAGS"
-
-  dnl Check whether the compiler accepts the -Wall
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -Wall"
-  AC_MSG_CHECKING([whether $CC accepts -Wall])
-  AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
-AC_MSG_RESULT([yes])
-PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall"
-  ], [
-AC_MSG_RESULT([no])
-  ])
-  CFLAGS="$save_CFLAGS"
-
-  dnl Check whether the compiler accepts the -fno-strict-aliasing
-  dnl switch, as certain packages - like Glib - still do not work
-  dnl properly with newer compilers.
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-strict-aliasing"
-  AC_MSG_CHECKING([whether $CC accepts -fno-strict-aliasing])
-  AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
-AC_MSG_RESULT([yes])
-PLATFORM_CFLAGS="$PLATFORM_CFLAGS -fno-strict-aliasing"
-  ], [
-AC_MSG_RESULT([no])
-  ])
-  CFLAGS="$save_CFLAGS"
-
-  dnl Paranoia for --enable-debug=full
-  if test x"$enable_debug" = x"full"; then
-PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
-PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
-  fi
-else
-  dnl Print the result
-  AC_MSG_RESULT([$enable_debug])
-
-  dnl Disable debugging (release build)
-  PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG"
-
-  dnl Disable object cast checks
-  PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
-
-  dnl Disable all checks for --enable-debug=no
-  if test x"$enable_debug" = x"no"; then
-PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT 
-DG_DISABLE_CHECKS"
-  fi
-fi
+XDT_FEATURE_DEBUG([terminal_debug_default])
 
 dnl **
 dnl *** Check for linker optimizations ***
 dnl **
-AC_MSG_CHECKING([whether $LD accepts --as-needed])
-case `$LD --as-needed -v 2>&1 &1 http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Creating annotated tag terminal-0.4.2

2009-10-06 Thread Nick Schermer

Updating annotated tag refs/tags/terminal-0.4.2
 as new annotated tag
 to d58a75fedcf6ea12ccc54e1892fa1d526563bd98 (tag)
   succeeds terminal-0.4.1
  tagged by Nick Schermer 
 on 2009-10-06 15:06 +

IÃ±igo Varela (1):
  l10n: Updates to Asturian (ast) translation

Leandro Regueiro (2):
  l10n: Updates to Galician (gl) translation
  l10n: Updates to Galician (gl) translation

Masato Hashimoto (2):
  l10n: Updates to Japanese (ja) translation
  l10n: Updates to Japanese (ja) translation

Michal VÃ¡rady (1):
  l10n: Updates to Czech (cs) translation

Nick Schermer (4):
  Port-release version bump.
  Fix broken background image when compositing is disabled (bug #5645).
  Use new xdt-autogen macros.
  Updates for 0.4.2 release.

Per Kongstad (1):
  l10n: Updates to Danish (da) translation

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

[Xfce4-commits] Fix broken POTFILES.in.

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/devel
 to e2122cb4142a44a2680938994bfa486c3a843f84 (commit)
   from 187d36a086f5b34b3ad5229af8b99965f5bbff66 (commit)

commit e2122cb4142a44a2680938994bfa486c3a843f84
Author: Nick Schermer 
Date:   Tue Oct 6 17:52:22 2009 +0200

Fix broken POTFILES.in.

 po/POTFILES.in |2 +-
 po/xfce4-panel.pot |  656 ++--
 2 files changed, 123 insertions(+), 535 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f69ef59..6cc2a97 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,7 +39,7 @@ panel/panel-preferences-dialog.ui
 plugins/actions/actions-dialog.ui
 plugins/launcher/launcher-dialog.ui
 plugins/separator/separator-dialog.ui
-plugins/windowmenu/windowmenu-dialog.uilade
+plugins/windowmenu/windowmenu-dialog.ui
 plugins/tasklist/tasklist-dialog.ui
 plugins/pager/pager-dialog.ui
 plugins/clock/clock-dialog.ui
diff --git a/po/xfce4-panel.pot b/po/xfce4-panel.pot
index 18502a1..23a7075 100644
--- a/po/xfce4-panel.pot
+++ b/po/xfce4-panel.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-09 23:32+0200\n"
+"POT-Creation-Date: 2009-10-06 17:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -16,139 +16,139 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../libxfce4panel/xfce-panel-plugin.c:707
-#: ../panel/panel-preferences-dialog.c:661
+#: ../libxfce4panel/xfce-panel-plugin.c:746
+#: ../panel/panel-preferences-dialog.c:664
 #, c-format
 msgid "Are you sure that you want to remove \"%s\"?"
 msgstr ""
 
-#: ../libxfce4panel/xfce-panel-plugin.c:709
-#: ../panel/panel-preferences-dialog.c:662
+#: ../libxfce4panel/xfce-panel-plugin.c:751
+#: ../panel/panel-preferences-dialog.c:665
 msgid "If you remove the item from the panel, it is permanently lost."
 msgstr ""
 
 #. move item
-#: ../libxfce4panel/xfce-panel-plugin.c:840
+#: ../libxfce4panel/xfce-panel-plugin.c:890
 msgid "_Move"
 msgstr ""
 
 #. add new items
-#: ../libxfce4panel/xfce-panel-plugin.c:873 ../panel/panel-window.c:1876
+#: ../libxfce4panel/xfce-panel-plugin.c:925 ../panel/panel-window.c:1960
 msgid "Add _New Items..."
 msgstr ""
 
 #. customize panel
-#: ../libxfce4panel/xfce-panel-plugin.c:883 ../panel/panel-window.c:1887
+#: ../libxfce4panel/xfce-panel-plugin.c:936 ../panel/panel-window.c:1971
 msgid "Panel Pr_eferences..."
 msgstr ""
 
 #. restart item
-#: ../libxfce4panel/xfce-panel-plugin.c:904 ../panel/panel-window.c:1910
+#: ../libxfce4panel/xfce-panel-plugin.c:959 ../panel/panel-window.c:1994
 msgid "_Restart"
 msgstr ""
 
-#: ../panel/main.c:73
+#: ../panel/main.c:72
 msgid "Show the 'Panel Preferences' dialog"
 msgstr ""
 
-#: ../panel/main.c:73 ../panel/main.c:74
+#: ../panel/main.c:72 ../panel/main.c:73
 msgid "Panel Number"
 msgstr ""
 
-#: ../panel/main.c:74
+#: ../panel/main.c:73
 msgid "Show the 'Add New Items' dialog"
 msgstr ""
 
-#: ../panel/main.c:75
+#: ../panel/main.c:74
 msgid "Save the panel configuration"
 msgstr ""
 
-#: ../panel/main.c:76
+#: ../panel/main.c:75
 msgid "Add a new plugin to the panel"
 msgstr ""
 
-#: ../panel/main.c:76
+#: ../panel/main.c:75
 msgid "PLUGIN NAME"
 msgstr ""
 
-#: ../panel/main.c:77
+#: ../panel/main.c:76
 msgid "Restart the running panel instance"
 msgstr ""
 
-#: ../panel/main.c:78
+#: ../panel/main.c:77
 msgid "Quit the running panel instance"
 msgstr ""
 
-#: ../panel/main.c:79
+#: ../panel/main.c:78
 msgid "Print version information and exit"
 msgstr ""
 
 #. initialize gtk+
-#: ../panel/main.c:144
+#: ../panel/main.c:149
 msgid "[ARGUMENTS...]"
 msgstr ""
 
-#: ../panel/main.c:150
+#: ../panel/main.c:155
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr ""
 
-#: ../panel/main.c:171
+#: ../panel/main.c:176
 msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
-#: ../panel/main.c:172
+#: ../panel/main.c:177
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr ""
 
 #. print message
-#: ../panel/main.c:221
+#: ../panel/main.c:226
 msgid "There is already a running instance..."
 msgstr ""
 
 #. message
-#: ../panel/main.c:268
+#: ../panel/main.c:260
 msgid "Restarting the Xfce Panel..."
 msgstr ""
 
 #. show error dialog
-#: ../panel/main.c:284
+#: ../panel/main.c:276
 msgid "Failed to send D-Bus message"
 msgstr ""
 
 #. show warnings
-#: ../panel/panel-application.c:361
+#: ../panel/panel-application.c:330
 #, c-format
 msgid ""
 "Plugin \"%s-%d\" was not found and has been removed from the configuration"
 msgstr ""
 
 #. print warning
-#: ../panel/panel-application.c:1175
+#: ../panel/panel-application.c:1164
 #, c-format
 msgid "The plugin (%s) you want to add is not recognized by the panel."
 msgstr ""
 
-#: ../panel/panel-dialogs.c:53
+#: ../panel/panel-dialogs.c:57
 msgid "The panel of the Xfce Desktop Environment"
 msgstr ""
 
-#: ../panel/p

[Xfce4-commits] Use silent build rules.

2009-10-06 Thread Nick Schermer

Updating branch refs/heads/devel
 to 2d3d630915da36aed517e59d3d7134a9726defb0 (commit)
   from e2122cb4142a44a2680938994bfa486c3a843f84 (commit)

commit 2d3d630915da36aed517e59d3d7134a9726defb0
Author: Nick Schermer 
Date:   Tue Oct 6 17:52:41 2009 +0200

Use silent build rules.

 configure.in.in|8 +---
 panel/Makefile.am  |   10 +-
 plugins/actions/Makefile.am|2 +-
 plugins/clock/Makefile.am  |2 +-
 plugins/launcher/Makefile.am   |2 +-
 plugins/pager/Makefile.am  |2 +-
 plugins/separator/Makefile.am  |2 +-
 plugins/systray/Makefile.am|6 +++---
 plugins/tasklist/Makefile.am   |2 +-
 plugins/windowmenu/Makefile.am |2 +-
 wrapper/Makefile.am|6 +++---
 11 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index d80cfbf..1a4d7e0 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -41,6 +41,7 @@ dnl ***
 AM_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl ***
 dnl *** Check for UNIX variants ***
@@ -63,13 +64,6 @@ dnl **
 AC_DISABLE_STATIC()
 AC_PROG_LIBTOOL()
 
-dnl 
-dnl *** Intltool-update hack ***
-dnl 
-AC_CONFIG_COMMANDS([intltool-update],
-[(sed -e 's/^\("desktop.*".*\)/\1\n"rc(?:.in)+|"\./' intltool-update > 
intltool-update-tmp &&
-  mv intltool-update-tmp intltool-update && chmod 755 intltool-update)])
-
 dnl **
 dnl *** Substitute version information ***
 dnl **
diff --git a/panel/Makefile.am b/panel/Makefile.am
index c24cfac..65c5f08 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -84,19 +84,19 @@ xfce4_panel_DEPENDENCIES = \
 if MAINTAINER_MODE
 
 panel-dbus-service-infos.h: $(srcdir)/panel-dbus-service-infos.xml Makefile
-   dbus-binding-tool --prefix=panel_dbus_service --mode=glib-server $< > $@
+   $(AM_V_GEN) dbus-binding-tool --prefix=panel_dbus_service 
--mode=glib-server $< > $@
 
 panel-dbus-client-infos.h: $(srcdir)/panel-dbus-service-infos.xml Makefile
-   dbus-binding-tool --mode=glib-client $< > $@
+   $(AM_V_GEN) dbus-binding-tool --mode=glib-client $< > $@
 
 panel-preferences-dialog-ui.h: $(srcdir)/panel-preferences-dialog.ui Makefile
-   exo-csource --static --strip-comments --strip-content 
--name=panel_preferences_dialog_ui $< >$@
+   $(AM_V_GEN) exo-csource --static --strip-comments --strip-content 
--name=panel_preferences_dialog_ui $< >$@
 
 panel-marshal.h: $(srcdir)/panel-marshal.list Makefile
-   glib-genmarshal --header --prefix=panel_marshal $< > $@
+   $(AM_V_GEN) glib-genmarshal --header --prefix=panel_marshal $< > $@
 
 panel-marshal.c: $(srcdir)/panel-marshal.list Makefile
-   echo "#include " > $@ \
+   $(AM_V_GEN) echo "#include " > $@ \
&& glib-genmarshal --body --prefix=panel_marshal $< >> $@
 
 DISTCLEANFILES = \
diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index 32336b5..d4c4a97 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -70,7 +70,7 @@ DISTCLEANFILES += \
$(libactions_built_sources)
 
 actions-dialog_ui.h: actions-dialog.ui
-   exo-csource --static --strip-comments --strip-content 
--name=actions_dialog_ui $< >$@
+   $(AM_V_GEN) exo-csource --static --strip-comments --strip-content 
--name=actions_dialog_ui $< >$@
 endif
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index 9f3dcd3..e400562 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -82,7 +82,7 @@ DISTCLEANFILES += \
$(libclock_built_sources)
 
 clock-dialog_ui.h: clock-dialog.ui
-   exo-csource --static --strip-comments --strip-content 
--name=clock_dialog_ui $< >$@
+   $(AM_V_GEN) exo-csource --static --strip-comments --strip-content 
--name=clock_dialog_ui $< >$@
 endif
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index 6a1a81a..682de3a 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -80,7 +80,7 @@ DISTCLEANFILES += \
$(libclock_built_sources)
 
 launcher-dialog_ui.h: launcher-dialog.ui
-   exo-csource --static --strip-comments --strip-content 
--name=launcher_dialog_ui $< >$@
+   $(AM_V_GEN) exo-csource --static --strip-comments --strip-content 
--name=launcher_dialog_ui $< >$@
 endif
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index 0d53003..08cbaab 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -73,7 +73,7 @@ DISTCLEANFILES += \

[Xfce4-commits] l10n: Updates to Ukrainian (uk) translation

2009-10-06 Thread Transifex

Updating branch refs/heads/master
 to c1e43c1023c6f390160be1d6a265f6b59fc96faa (commit)
   from d4b354cd8420c6b68309ffdd146df5f32e61177d (commit)

commit c1e43c1023c6f390160be1d6a265f6b59fc96faa
Author: Andriy Matkovsky 
Date:   Tue Oct 6 16:44:38 2009 +

l10n: Updates to Ukrainian (uk) translation

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

 po/uk.po |7 +++
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 8d1b085..c113234 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-31 14:02+0200\n"
-"PO-Revision-Date: 2009-10-03 18:41+0300\n"
+"PO-Revision-Date: 2009-10-06 18:07+0300\n"
 "Last-Translator: Andriy Matkovsky \n"
 "Language-Team: Ukrainian \n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,6 @@ msgid "%.2fKb of %.2fKb"
 msgstr "%.2fÐÐ± Ð· %.2fÐÐ±"
 
 #: ../lib/screenshooter-dialogs.c:577
-#, fuzzy
 msgid "Transfer"
 msgstr "ÐÐµÑÐµÐ´Ð°ÑÐ°"
 
@@ -285,12 +284,12 @@ msgid "Full size image"
 msgstr "ÐÐ¾Ð²Ð½Ð¾ÑÐ¾Ð·Ð¼ÑÑÐ½Ðµ Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ"
 
 #: ../lib/screenshooter-zimagez.c:872
-#, fuzzy, c-format
+#, c-format
 msgid "Large thumbnail"
 msgstr "ÐÐµÐ»Ð¸ÐºÐµ Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ 
Ð¿Ð¾Ð¿ÐµÑÐµÐ´Ð½ÑÐ¾Ð³Ð¾ Ð¿ÐµÑÐµÐ³Ð»ÑÐ´Ñ"
 
 #: ../lib/screenshooter-zimagez.c:874
-#, fuzzy, c-format
+#, c-format
 msgid "Small thumbnail"
 msgstr "ÐÐ°Ð»ÐµÐ½ÑÐºÐµ Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ 
Ð¿Ð¾Ð¿ÐµÑÐµÐ´Ð½ÑÐ¾Ð³Ð¾ Ð¿ÐµÑÐµÐ³Ð»ÑÐ´Ñ"
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] actually assign sm_client_singleton to something

2009-10-06 Thread Brian J . Tarricone

Updating branch refs/heads/kelnos/new-sm-client
 to 38c353733f277c299c008224f136eb3128694df3 (commit)
   from 84cd0e06784a873e7bd3545e36658f11812bdd00 (commit)

commit 38c353733f277c299c008224f136eb3128694df3
Author: Brian J. Tarricone 
Date:   Tue Oct 6 10:43:38 2009 -0700

actually assign sm_client_singleton to something

 libxfce4ui/xfce-sm-client.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index ace857f..c12afd6 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -545,6 +545,8 @@ xfce_sm_client_constructor(GType type,

n_construct_params,

construct_params);
 
+sm_client_singleton = XFCE_SM_CLIENT(obj);
+
 desktop_autostart_id = g_getenv("DESKTOP_AUTOSTART_ID");
 if(desktop_autostart_id) {
 XfceSMClient *sm_client = XFCE_SM_CLIENT(obj);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Initial code for the form history extension

2009-10-06 Thread Christian Dywan

Updating branch refs/heads/master
 to 50c159e9bb88784ac3a4cc8d18f4fb8ab1a16c77 (commit)
   from c624048c218c2d3d73518de81f5138e41e1797b2 (commit)

commit 50c159e9bb88784ac3a4cc8d18f4fb8ab1a16c77
Author: Alexander Butenko 
Date:   Tue Oct 6 20:35:56 2009 +0200

Initial code for the form history extension

 data/autosuggestcontrol.css |   16 ++
 data/autosuggestcontrol.js  |  366 +++
 extensions/formhistory.c|  205 
 3 files changed, 587 insertions(+), 0 deletions(-)

diff --git a/data/autosuggestcontrol.css b/data/autosuggestcontrol.css
new file mode 100644
index 000..a7ca89d
--- /dev/null
+++ b/data/autosuggestcontrol.css
@@ -0,0 +1,16 @@
+div.suggestions {
+-moz-box-sizing: border-box;
+box-sizing: border-box;
+border: 1px solid #cc;
+text-align: left;
+background-color: #ff;
+position: absolute;
+}
+div.suggestions div {
+cursor: default;
+padding: 0px 3px;
+}
+div.suggestions div.current {
+background-color: #3366cc;
+color: white;
+}
diff --git a/data/autosuggestcontrol.js b/data/autosuggestcontrol.js
new file mode 100644
index 000..0b58336
--- /dev/null
+++ b/data/autosuggestcontrol.js
@@ -0,0 +1,366 @@
+/**
+ * An autosuggest textbox control.
+ * from Nicholas C. Zakas (Author) example: http://www.nczonline.net/
+ * @class
+ * @scope public
+ */
+function AutoSuggestControl(oTextbox /*:HTMLInputElement*/,
+oProvider /*:SuggestionProvider*/) {
+/**
+ * The currently selected suggestions.
+ * @scope private
+ */
+this.cur /*:int*/ = -1;
+/**
+ * The dropdown list layer.
+ * @scope private
+ */
+this.layer = null;
+/**
+ * Suggestion provider for the autosuggest feature.
+ * @scope private.
+ */
+this.provider /*:SuggestionProvider*/ = oProvider;
+/**
+ * The textbox to capture.
+ * @scope private
+ */
+this.textbox /*:HTMLInputElement*/ = oTextbox;
+//initialize the control
+this.init();
+
+}
+
+/**
+ * Autosuggests one or more suggestions for what the user has typed.
+ * If no suggestions are passed in, then no autosuggest occurs.
+ * @scope private
+ * @param aSuggestions An array of suggestion strings.
+ * @param bTypeAhead If the control should provide a type ahead suggestion.
+ */
+AutoSuggestControl.prototype.autosuggest = function (aSuggestions /*:Array*/,
+ bTypeAhead /*:boolean*/) {
+//make sure theres at least one suggestion
+if (aSuggestions.length > 0) {
+if (bTypeAhead) {
+   this.typeAhead(aSuggestions[0]);
+}
+this.showSuggestions(aSuggestions);
+} else {
+this.hideSuggestions();
+}
+};
+
+/**
+ * Creates the dropdown layer to display multiple suggestions.
+ * @scope private
+ */
+AutoSuggestControl.prototype.createDropDown = function () {
+
+var oThis = this;
+
+//create the layer and assign styles
+this.layer = document.createElement("div");
+this.layer.className = "suggestions";
+this.layer.style.visibility = "hidden";
+this.layer.style.width = this.textbox.offsetWidth + 10;
+
+//when the user clicks on the a suggestion, get the text (innerHTML)
+//and place it into a textbox
+this.layer.onmousedown =
+this.layer.onmouseup =
+this.layer.onmouseover = function (oEvent) {
+oEvent = oEvent || window.event;
+oTarget = oEvent.target || oEvent.srcElement;
+
+if (oEvent.type == "mousedown") {
+oThis.textbox.value = oTarget.firstChild.nodeValue;
+oThis.hideSuggestions();
+} else if (oEvent.type == "mouseover") {
+oThis.highlightSuggestion(oTarget);
+} else {
+oThis.textbox.focus();
+}
+};
+
+
+document.body.appendChild(this.layer);
+};
+
+/**
+ * Gets the left coordinate of the textbox.
+ * @scope private
+ * @return The left coordinate of the textbox in pixels.
+ */
+AutoSuggestControl.prototype.getLeft = function () /*:int*/ {
+
+var oNode = this.textbox;
+var iLeft = 0;
+
+while(oNode.tagName != "BODY") {
+iLeft += oNode.offsetLeft;
+oNode = oNode.offsetParent;
+}
+
+return iLeft;
+};
+
+/**
+ * Gets the top coordinate of the textbox.
+ * @scope private
+ * @return The top coordinate of the textbox in pixels.
+ */
+AutoSuggestControl.prototype.getTop = function () /*:int*/ {
+var oNode = this.textbox;
+var iTop = 0;
+while(oNode.tagName != "BODY") {
+iTop += oNode.offsetTop;
+oNode = oNode.offsetParent;
+}
+return iTop;
+};
+
+/**
+ * Handles three keydown events.
+ * @scope private
+ * @param oEvent The event object for the keydown event.
+ */
+AutoSuggestControl.prototype.handleKeyDown = function (oEvent /*:Event*/) {
+switch(oEvent.keyCode) {
+case 38: //up arrow
+this.previousSuggestion();

[Xfce4-commits] Regard file:// URIs as valid for bookmarks

2009-10-06 Thread Christian Dywan

Updating branch refs/heads/master
 to ca81aeb0343c067ab0064a6b973aa19158f27382 (commit)
   from 50c159e9bb88784ac3a4cc8d18f4fb8ab1a16c77 (commit)

commit ca81aeb0343c067ab0064a6b973aa19158f27382
Author: Christian Dywan 
Date:   Tue Oct 6 20:40:43 2009 +0200

Regard file:// URIs as valid for bookmarks

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index dc549a8..d334d0a 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -608,7 +608,8 @@ midori_browser_edit_bookmark_uri_changed_cb (GtkEntry*  
entry,
 const gchar* uri = gtk_entry_get_text (entry);
 gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT,
 uri && (g_str_has_prefix (uri, "http://";)
-|| g_str_has_prefix (uri, "https://";)));
+|| g_str_has_prefix (uri, "https://";)
+|| g_str_has_prefix (uri, "file://")));
 }
 
 /* Private function, used by MidoriBookmarks and MidoriHistory */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Added `scheduler` parameter to DBus method Queue

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to c8240e613fe2da8d7f4c3ee50b75e6fa1ab8ae67 (commit)
   from bbb9f66d47f0fbb2028439a8eba32ffd794a9dd4 (commit)

commit c8240e613fe2da8d7f4c3ee50b75e6fa1ab8ae67
Author: Philip Van Hoof 
Date:   Tue Oct 6 16:43:11 2009 +0200

Added `scheduler` parameter to DBus method Queue

Signed-off-by: Jannis Pohlmann 

 tumblerd/tumbler-service-dbus.xml |1 +
 tumblerd/tumbler-service.c|   84 +
 tumblerd/tumbler-service.h|1 +
 3 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/tumblerd/tumbler-service-dbus.xml 
b/tumblerd/tumbler-service-dbus.xml
index c040ceb..e898e19 100644
--- a/tumblerd/tumbler-service-dbus.xml
+++ b/tumblerd/tumbler-service-dbus.xml
@@ -5,6 +5,7 @@
   
   
   
+  
   
   
 
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 25ffc3c..eefd867 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 
@@ -100,7 +101,7 @@ struct _TumblerService
 
   DBusGConnection  *connection;
   TumblerRegistry  *registry;
-  TumblerScheduler *scheduler;
+  GPtrArray*schedulers;
   GMutex   *mutex;
 };
 
@@ -198,9 +199,23 @@ static void
 tumbler_service_init (TumblerService *service)
 {
   service->mutex = g_mutex_new ();
+  service->schedulers = g_ptr_array_sized_new (2);
 }
 
+static void
+tumbler_service_add_scheduler (TumblerService *service, TumblerScheduler 
*scheduler)
+{
+  g_ptr_array_add (service->schedulers, scheduler);
 
+  g_signal_connect (scheduler, "error",
+G_CALLBACK (tumbler_service_scheduler_error), service);
+  g_signal_connect (scheduler, "finished", 
+G_CALLBACK (tumbler_service_scheduler_finished), service);
+  g_signal_connect (scheduler, "ready", 
+G_CALLBACK (tumbler_service_scheduler_ready), service);
+  g_signal_connect (scheduler, "started", 
+G_CALLBACK (tumbler_service_scheduler_started), service);
+}
 
 static void
 tumbler_service_constructed (GObject *object)
@@ -211,20 +226,8 @@ tumbler_service_constructed (GObject *object)
   if (G_OBJECT_CLASS (tumbler_service_parent_class)->constructed != NULL)
 (G_OBJECT_CLASS (tumbler_service_parent_class)->constructed) (object);
 
-#if 0
-  service->scheduler = tumbler_naive_scheduler_new ();
-#else
-  service->scheduler = tumbler_lifo_scheduler_new ("foreground");
-#endif
-
-  g_signal_connect (service->scheduler, "error",
-G_CALLBACK (tumbler_service_scheduler_error), service);
-  g_signal_connect (service->scheduler, "finished", 
-G_CALLBACK (tumbler_service_scheduler_finished), service);
-  g_signal_connect (service->scheduler, "ready", 
-G_CALLBACK (tumbler_service_scheduler_ready), service);
-  g_signal_connect (service->scheduler, "started", 
-G_CALLBACK (tumbler_service_scheduler_started), service);
+  tumbler_service_add_scheduler (service, tumbler_lifo_scheduler_new 
("foreground"));
+  tumbler_service_add_scheduler (service, tumbler_group_scheduler_new 
("background"));
 }
 
 
@@ -234,7 +237,9 @@ tumbler_service_finalize (GObject *object)
 {
   TumblerService *service = TUMBLER_SERVICE (object);
 
-  g_object_unref (service->scheduler);
+  g_ptr_array_foreach (service->schedulers, (GFunc) g_object_unref, NULL);
+  g_ptr_array_free (service->schedulers, TRUE);
+
   g_object_unref (service->registry);
 
   dbus_g_connection_unref (service->connection);
@@ -367,7 +372,7 @@ tumbler_service_start (TumblerService *service,
   connection = dbus_g_connection_get_connection (service->connection);
 
   /* request ownership for the generic thumbnailer interface */
-  result = dbus_bus_request_name (connection, 
"org.xfce.thumbnails.Thumbnailer",
+  result = dbus_bus_request_name (connection, 
"org.freedesktop.thumbnails.Thumbnailer",
   DBUS_NAME_FLAG_DO_NOT_QUEUE, &dbus_error);
 
   /* check if that failed */
@@ -398,7 +403,7 @@ tumbler_service_start (TumblerService *service,
 
   /* register the service instance as a handler of this interface */
   dbus_g_connection_register_g_object (service->connection, 
-   "/org/xfce/thumbnails/Thumbnailer", 
+   
"/org/freedesktop/thumbnails/Thumbnailer", 
G_OBJECT (service));
 
   g_mutex_unlock (service->mutex);
@@ -412,23 +417,25 @@ void
 tumbler_service_queue (TumblerService*service,
const GStrvuris,
const GStrvmime_hints,
+   const gchar   *s_scheduler,
guint  handle_to_unqueue,
DBusGMethodInvocation *context)
 {
+  TumblerScheduler

[Xfce4-commits] LIFO scheduler for interactive thumbnailing

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to b2aa6175031905006c86e3ff749728ac811e1553 (commit)
   from 107f638da92c8da10b3b34c8fb5ad81e1690c9cd (commit)

commit b2aa6175031905006c86e3ff749728ac811e1553
Author: Philip Van Hoof 
Date:   Tue Oct 6 16:32:21 2009 +0200

LIFO scheduler for interactive thumbnailing

Signed-off-by: Jannis Pohlmann 

 tumblerd/Makefile.am   |4 +-
 ...eshold-scheduler.c => tumbler-lifo-scheduler.c} |  238 ++--
 tumblerd/tumbler-lifo-scheduler.h  |   44 
 tumblerd/tumbler-scheduler.c   |9 +
 tumblerd/tumbler-scheduler.h   |3 +
 tumblerd/tumbler-service.c |4 +-
 tumblerd/tumbler-threshold-scheduler.h |   44 
 7 files changed, 177 insertions(+), 169 deletions(-)

diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
index cb09b8d..1813994 100644
--- a/tumblerd/Makefile.am
+++ b/tumblerd/Makefile.am
@@ -41,8 +41,8 @@ tumblerd_SOURCES =
\
tumbler-service.h   \
tumbler-specialized-thumbnailer.c   \
tumbler-specialized-thumbnailer.h   \
-   tumbler-threshold-scheduler.c   \
-   tumbler-threshold-scheduler.h   \
+   tumbler-lifo-scheduler.c\
+   tumbler-lifo-scheduler.h\
tumbler-utils.h \
$(tumblerd_built_sources)
 
diff --git a/tumblerd/tumbler-threshold-scheduler.c 
b/tumblerd/tumbler-lifo-scheduler.c
similarity index 57%
rename from tumblerd/tumbler-threshold-scheduler.c
rename to tumblerd/tumbler-lifo-scheduler.c
index 3cda6cf..832daab 100644
--- a/tumblerd/tumbler-threshold-scheduler.c
+++ b/tumblerd/tumbler-lifo-scheduler.c
@@ -30,7 +30,7 @@
 
 #include 
 
-#include 
+#include 
 #include 
 
 
@@ -39,56 +39,54 @@
 enum
 {
   PROP_0,
-  PROP_THRESHOLD,
+  PROP_KIND,
 };
 
-
-
-static void tumbler_threshold_scheduler_iface_init
(TumblerSchedulerIface *iface);
-static void tumbler_threshold_scheduler_finalize  (GObject 
  *object);
-static void tumbler_threshold_scheduler_get_property  (GObject 
  *object,
+static void tumbler_lifo_scheduler_iface_init(TumblerSchedulerIface
 *iface);
+static void tumbler_lifo_scheduler_finalize  (GObject  
 *object);
+static void tumbler_lifo_scheduler_get_property  (GObject  
 *object,
guint   
   prop_id,
GValue  
  *value,
GParamSpec  
  *pspec);
-static void tumbler_threshold_scheduler_set_property  (GObject 
  *object,
+static void tumbler_lifo_scheduler_set_property  (GObject  
 *object,
guint   
   prop_id,
const GValue
  *value,
GParamSpec  
  *pspec);
-static void tumbler_threshold_scheduler_push  (TumblerScheduler
  *scheduler,
+static void tumbler_lifo_scheduler_push  (TumblerScheduler 
 *scheduler,

TumblerSchedulerRequest   *request);
-static void tumbler_threshold_scheduler_unqueue   (TumblerScheduler
  *scheduler,
+static void tumbler_lifo_scheduler_unqueue   (TumblerScheduler 
 *scheduler,
guint   
   handle);
-static void tumbler_threshold_scheduler_finish_request
(TumblerThresholdScheduler *scheduler,
+static void tumbler_lifo_scheduler_finish_request(TumblerLifoScheduler 
*scheduler,

TumblerSchedulerRequest   *request);
-static void tumbler_threshold_scheduler_unqueue_request   
(TumblerSchedulerRequest   *request,
+static void tumbler_lifo_scheduler_unqueue_request   (TumblerSchedulerRequest  
 *request,
gpointer
   user_data);
-static void tumbler_threshold_scheduler_thread(gpointer
   data,
+static void tumbler_lifo_scheduler_thread(gpointer 
  data,
gpointer
   user_data);
-static void tumbler_threshold_

[Xfce4-commits] Group scheduler for background thumbnailing

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to bbb9f66d47f0fbb2028439a8eba32ffd794a9dd4 (commit)
   from b2aa6175031905006c86e3ff749728ac811e1553 (commit)

commit bbb9f66d47f0fbb2028439a8eba32ffd794a9dd4
Author: Philip Van Hoof 
Date:   Tue Oct 6 16:34:14 2009 +0200

Group scheduler for background thumbnailing

Signed-off-by: Jannis Pohlmann 

 tumblerd/Makefile.am   |2 +
 tumblerd/tumbler-group-scheduler.c |  571 
 tumblerd/tumbler-group-scheduler.h |   46 +++
 3 files changed, 619 insertions(+), 0 deletions(-)

diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
index 1813994..2991e54 100644
--- a/tumblerd/Makefile.am
+++ b/tumblerd/Makefile.am
@@ -43,6 +43,8 @@ tumblerd_SOURCES =
\
tumbler-specialized-thumbnailer.h   \
tumbler-lifo-scheduler.c\
tumbler-lifo-scheduler.h\
+   tumbler-group-scheduler.c   \
+   tumbler-group-scheduler.h   \
tumbler-utils.h \
$(tumblerd_built_sources)
 
diff --git a/tumblerd/tumbler-group-scheduler.c 
b/tumblerd/tumbler-group-scheduler.c
new file mode 100644
index 000..4d0406e
--- /dev/null
+++ b/tumblerd/tumbler-group-scheduler.c
@@ -0,0 +1,571 @@
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/*-
+ * Copyright (C) 2009, Nokia
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of 
+ * the License, 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., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Philip Van Hoof 
+ */
+
+#ifdef HAVE_CONFIG_H
+#include 
+#endif
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+
+
+
+/* Property identifiers */
+enum
+{
+  PROP_0,
+  PROP_KIND,
+};
+
+static void tumbler_group_scheduler_iface_init(TumblerSchedulerIface   
  *iface);
+static void tumbler_group_scheduler_finalize  (GObject 
  *object);
+static void tumbler_group_scheduler_get_property  (GObject 
  *object,
+   guint   
   prop_id,
+   GValue  
  *value,
+   GParamSpec  
  *pspec);
+static void tumbler_group_scheduler_set_property  (GObject 
  *object,
+   guint   
   prop_id,
+   const GValue
  *value,
+   GParamSpec  
  *pspec);
+static void tumbler_group_scheduler_push  (TumblerScheduler
  *scheduler,
+   TumblerSchedulerRequest 
  *request);
+static void tumbler_group_scheduler_unqueue   (TumblerScheduler
  *scheduler,
+   guint   
   handle);
+static void tumbler_group_scheduler_finish_request(TumblerGroupScheduler 
*scheduler,
+   TumblerSchedulerRequest 
  *request);
+static void tumbler_group_scheduler_unqueue_request   (TumblerSchedulerRequest 
  *request,
+   gpointer
   user_data);
+static void tumbler_group_scheduler_thread(gpointer
   data,
+   gpointer
   user_data);
+static void tumbler_group_scheduler_thumbnailer_error (TumblerThumbnailer  
  *thumbnailer,
+   const gchar 
  *failed_uri,
+   gint
   error_code,
+   const gchar 
  *message,
+   GPtrArray   *errors);
+static void tumbler_group_scheduler_thumbnailer_ready (TumblerThumbnailer  
  *thumbnailer,
+

[Xfce4-commits] Update the comments for the LIFO scheduler. Minor coding style changes.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 437b6b40d0fce61358e1a0ed6ae83b1929a550fe (commit)
   from 779937857784d4043a6a3023280303efc723c4bf (commit)

commit 437b6b40d0fce61358e1a0ed6ae83b1929a550fe
Author: Jannis Pohlmann 
Date:   Tue Oct 6 20:50:38 2009 +0200

Update the comments for the LIFO scheduler. Minor coding style changes.

 tumblerd/tumbler-lifo-scheduler.c |  109 +
 tumblerd/tumbler-lifo-scheduler.h |2 +
 2 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/tumblerd/tumbler-lifo-scheduler.c 
b/tumblerd/tumbler-lifo-scheduler.c
index 31b9276..3335eb5 100644
--- a/tumblerd/tumbler-lifo-scheduler.c
+++ b/tumblerd/tumbler-lifo-scheduler.c
@@ -1,6 +1,8 @@
 /* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2009 Jannis Pohlmann 
+ * Copyright (c) 2009 Nokia, 
+ *   written by Philip Van Hoof 
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as
@@ -44,31 +46,31 @@ enum
 static void tumbler_lifo_scheduler_iface_init(TumblerSchedulerIface
 *iface);
 static void tumbler_lifo_scheduler_finalize  (GObject  
 *object);
 static void tumbler_lifo_scheduler_get_property  (GObject  
 *object,
-   guint   
   prop_id,
-   GValue  
  *value,
-   GParamSpec  
  *pspec);
+  guint
  prop_id,
+  GValue   
 *value,
+  GParamSpec   
 *pspec);
 static void tumbler_lifo_scheduler_set_property  (GObject  
 *object,
-   guint   
   prop_id,
-   const GValue
  *value,
-   GParamSpec  
  *pspec);
+  guint
  prop_id,
+  const GValue 
 *value,
+  GParamSpec   
 *pspec);
 static void tumbler_lifo_scheduler_push  (TumblerScheduler 
 *scheduler,
-   
TumblerSchedulerRequest   *request);
+  TumblerSchedulerRequest  
 *request);
 static void tumbler_lifo_scheduler_unqueue   (TumblerScheduler 
 *scheduler,
-   guint   
   handle);
+  guint
  handle);
 static void tumbler_lifo_scheduler_finish_request(TumblerLifoScheduler 
*scheduler,
-   
TumblerSchedulerRequest   *request);
+  TumblerSchedulerRequest  
 *request);
 static void tumbler_lifo_scheduler_unqueue_request   (TumblerSchedulerRequest  
 *request,
-   gpointer
   user_data);
+  gpointer 
  user_data);
 static void tumbler_lifo_scheduler_thread(gpointer 
  data,
-   gpointer
   user_data);
+  gpointer 
  user_data);
 static void tumbler_lifo_scheduler_thumbnailer_error (TumblerThumbnailer   
 *thumbnailer,
-   const gchar 
  *failed_uri,
-   gint
   error_code,
-   const gchar 
  *message,
-   
TumblerSchedulerRequest   *request);
+  const gchar  
 *failed_uri,
+  gint 
  error_code,
+  const gchar  
 *message,
+  TumblerSchedulerRequest  
 *request);
 static void tumbler_lifo_scheduler_thumbnailer_ready (TumblerThumbnailer   
 *thumbnailer,
-   const gchar

[Xfce4-commits] Fix typo in the cache service file.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 1bd2cc0812be32cbeb0c7adf3a2cdcfa8a5c7a85 (commit)
   from 5cbf191735dcdd2fd248327471d895fa3532add9 (commit)

commit 1bd2cc0812be32cbeb0c7adf3a2cdcfa8a5c7a85
Author: Jannis Pohlmann 
Date:   Tue Oct 6 20:47:23 2009 +0200

Fix typo in the cache service file.

 tumblerd/org.xfce.TumblerCache.service.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tumblerd/org.xfce.TumblerCache.service.in 
b/tumblerd/org.xfce.TumblerCache.service.in
index cdf8b8e..ce287c1 100644
--- a/tumblerd/org.xfce.TumblerCache.service.in
+++ b/tumblerd/org.xfce.TumblerCache.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.xfce.thumbnails.Thumbnailer
+Name=org.xfce.thumbnails.Cache
 ex...@libexecdir@/tumblerd
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Rework the TumblerGroupScheduler code. Use a GList for error/ready URIs.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to bb8928cb7423a1634f11d7dbc6e4ea0601ef (commit)
   from 437b6b40d0fce61358e1a0ed6ae83b1929a550fe (commit)

commit bb8928cb7423a1634f11d7dbc6e4ea0601ef
Author: Jannis Pohlmann 
Date:   Tue Oct 6 20:51:29 2009 +0200

Rework the TumblerGroupScheduler code. Use a GList for error/ready URIs.

 tumblerd/tumbler-group-scheduler.c |  274 +++-
 tumblerd/tumbler-group-scheduler.h |5 +-
 2 files changed, 180 insertions(+), 99 deletions(-)

diff --git a/tumblerd/tumbler-group-scheduler.c 
b/tumblerd/tumbler-group-scheduler.c
index bbe4654..c128a11 100644
--- a/tumblerd/tumbler-group-scheduler.c
+++ b/tumblerd/tumbler-group-scheduler.c
@@ -1,6 +1,8 @@
 /* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
- * Copyright (C) 2009, Nokia
+ * Copyright (c) 2009 Jannis Pohlmann 
+ * Copyright (c) 2009 Nokia,
+ *   written by Philip Van Hoof 
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as
@@ -16,8 +18,6 @@
  * License along with this program; if not, write to the Free 
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
- *
- * Author: Philip Van Hoof 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -35,6 +35,8 @@
 #include 
 #include 
 
+
+
 /* Property identifiers */
 enum
 {
@@ -42,6 +44,12 @@ enum
   PROP_NAME,
 };
 
+
+
+typedef struct _UriError UriError;
+
+
+
 static void tumbler_group_scheduler_iface_init(TumblerSchedulerIface   
  *iface);
 static void tumbler_group_scheduler_finalize  (GObject 
  *object);
 static void tumbler_group_scheduler_get_property  (GObject 
  *object,
@@ -56,7 +64,7 @@ static void tumbler_group_scheduler_push  
(TumblerScheduler
TumblerSchedulerRequest 
  *request);
 static void tumbler_group_scheduler_unqueue   (TumblerScheduler
  *scheduler,
guint   
   handle);
-static void tumbler_group_scheduler_finish_request(TumblerGroupScheduler 
*scheduler,
+static void tumbler_group_scheduler_finish_request(TumblerGroupScheduler   
  *scheduler,
TumblerSchedulerRequest 
  *request);
 static void tumbler_group_scheduler_unqueue_request   (TumblerSchedulerRequest 
  *request,
gpointer
   user_data);
@@ -66,10 +74,10 @@ static void tumbler_group_scheduler_thumbnailer_error 
(TumblerThumbnailer
const gchar 
  *failed_uri,
gint
   error_code,
const gchar 
  *message,
-   GPtrArray   *errors);
+   GList   
 **uri_errors);
 static void tumbler_group_scheduler_thumbnailer_ready (TumblerThumbnailer  
  *thumbnailer,
const gchar 
  *uri,
-   GPtrArray   *readies);
+   GList   
 **ready_uris);
 
 
 
@@ -86,9 +94,18 @@ struct _TumblerGroupScheduler
   GMutex  *mutex;
   GList   *requests;
   guintgroup;
+
   gchar   *name;
 };
 
+struct _UriError
+{
+  guint  error_code;
+  gchar *message;
+  gchar *failed_uri;
+};
+
+
 
 
 G_LOCK_DEFINE (group_access_lock);
@@ -133,8 +150,8 @@ tumbler_group_scheduler_init (TumblerGroupScheduler 
*scheduler)
   scheduler->mutex = g_mutex_new ();
   scheduler->requests = NULL;
 
-  /* allocate a pool with max. 1 threads for requests */
-  scheduler->pool = g_thread_pool_new (tumbler_group_scheduler_thread,
+  /* allocate a pool with one thread for all requests */
+  scheduler->pool = g_thread_pool_new (tumbler_group_scheduler_thread, 
scheduler, 1, TRUE, NULL);
 
 }
@@ -155,6 +172,7 @@ tumbler_group_scheduler_finalize (GObject *object)
   /* destroy the request list */
   g_list_free (scheduler->requests);
 
+  /* free the scheduler name */
   g_free (scheduler->name);
 
   /* destroy the mutex */
@@ -223,8 +241,7 @@ tumbler_group_scheduler_push (TumblerScheduler
*scheduler,
   tumbler_scheduler_take_request (scheduler, request);
 
   /* prepend the request to the request list */
-  group_scheduler->requests = 
-g_list_prepend (group_scheduler->requests, request);
+  group_scheduler->requests = g_list_prepend (group_scheduler->requests, 
request);
 
   /* enqueue the request in the pool */
   g_thread_pool_push (group_scheduler->pool, request, NULL);
@@ -2

[Xfce4-commits] tumbler_scheduler_get_name() returns a gchar , not a const gchar .

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to aec1c8ac7b4c5089210ff648fd53dba23b172c01 (commit)
   from ade4d2ca8aee0d882366c44f9c9190673391872e (commit)

commit aec1c8ac7b4c5089210ff648fd53dba23b172c01
Author: Jannis Pohlmann 
Date:   Tue Oct 6 20:48:15 2009 +0200

tumbler_scheduler_get_name() returns a gchar *, not a const gchar *.

 tumblerd/tumbler-scheduler.c |2 +-
 tumblerd/tumbler-scheduler.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tumblerd/tumbler-scheduler.c b/tumblerd/tumbler-scheduler.c
index 817270f..933e801 100644
--- a/tumblerd/tumbler-scheduler.c
+++ b/tumblerd/tumbler-scheduler.c
@@ -167,7 +167,7 @@ tumbler_scheduler_take_request (TumblerScheduler
*scheduler,
 }
 
 
-const gchar*
+gchar*
 tumbler_scheduler_get_name (TumblerScheduler *scheduler)
 {
   const gchar *name;
diff --git a/tumblerd/tumbler-scheduler.h b/tumblerd/tumbler-scheduler.h
index 9305075..733e5aa 100644
--- a/tumblerd/tumbler-scheduler.h
+++ b/tumblerd/tumbler-scheduler.h
@@ -65,7 +65,7 @@ void tumbler_scheduler_push   
   (TumblerSchedul
   
TumblerSchedulerRequest *request);
 void tumbler_scheduler_unqueue   
(TumblerScheduler*scheduler,
   guint
handle);
-const gchar* tumbler_scheduler_get_name  
(TumblerScheduler*scheduler);
+gchar*   tumbler_scheduler_get_name  
(TumblerScheduler*scheduler);
 void tumbler_scheduler_take_request  
(TumblerScheduler*scheduler,
   
TumblerSchedulerRequest *request);
 void tumbler_scheduler_emit_uri_error
(TumblerScheduler*scheduler,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Small parameter name change in the service dbus XML.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to ade4d2ca8aee0d882366c44f9c9190673391872e (commit)
   from 1bd2cc0812be32cbeb0c7adf3a2cdcfa8a5c7a85 (commit)

commit ade4d2ca8aee0d882366c44f9c9190673391872e
Author: Jannis Pohlmann 
Date:   Tue Oct 6 20:47:48 2009 +0200

Small parameter name change in the service dbus XML.

 tumblerd/tumbler-service-dbus.xml |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tumblerd/tumbler-service-dbus.xml 
b/tumblerd/tumbler-service-dbus.xml
index e898e19..26adbfc 100644
--- a/tumblerd/tumbler-service-dbus.xml
+++ b/tumblerd/tumbler-service-dbus.xml
@@ -4,7 +4,7 @@
 
   
   
-  
+  
   
   
   
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Use a GList for managing the schedulers. Rework the service code a bit.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 779937857784d4043a6a3023280303efc723c4bf (commit)
   from aec1c8ac7b4c5089210ff648fd53dba23b172c01 (commit)

commit 779937857784d4043a6a3023280303efc723c4bf
Author: Jannis Pohlmann 
Date:   Tue Oct 6 20:49:43 2009 +0200

Use a GList for managing the schedulers. Rework the service code a bit.

 tumblerd/tumbler-service.c |  105 +---
 1 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 3f07f9b..40b7420 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -101,8 +101,8 @@ struct _TumblerService
 
   DBusGConnection  *connection;
   TumblerRegistry  *registry;
-  GPtrArray*schedulers;
   GMutex   *mutex;
+  GList*schedulers;
 };
 
 
@@ -199,14 +199,19 @@ static void
 tumbler_service_init (TumblerService *service)
 {
   service->mutex = g_mutex_new ();
-  service->schedulers = g_ptr_array_sized_new (2);
+  service->schedulers = NULL;
 }
 
+
+
 static void
-tumbler_service_add_scheduler (TumblerService *service, TumblerScheduler 
*scheduler)
+tumbler_service_add_scheduler (TumblerService   *service, 
+   TumblerScheduler *scheduler)
 {
-  g_ptr_array_add (service->schedulers, scheduler);
+  /* add the scheduler to the list */
+  service->schedulers = g_list_prepend (service->schedulers, g_object_ref 
(scheduler));
 
+  /* connect to the scheduler signals */
   g_signal_connect (scheduler, "error",
 G_CALLBACK (tumbler_service_scheduler_error), service);
   g_signal_connect (scheduler, "finished", 
@@ -217,17 +222,27 @@ tumbler_service_add_scheduler (TumblerService *service, 
TumblerScheduler *schedu
 G_CALLBACK (tumbler_service_scheduler_started), service);
 }
 
+
+
 static void
 tumbler_service_constructed (GObject *object)
 {
-  TumblerService *service = TUMBLER_SERVICE (object);
+  TumblerService   *service = TUMBLER_SERVICE (object);
+  TumblerScheduler *scheduler;
 
   /* chain up to parent classes */
   if (G_OBJECT_CLASS (tumbler_service_parent_class)->constructed != NULL)
 (G_OBJECT_CLASS (tumbler_service_parent_class)->constructed) (object);
 
-  tumbler_service_add_scheduler (service, tumbler_lifo_scheduler_new 
("foreground"));
-  tumbler_service_add_scheduler (service, tumbler_group_scheduler_new 
("background"));
+  /* create the background scheduler */
+  scheduler = tumbler_group_scheduler_new ("background");
+  tumbler_service_add_scheduler (service, scheduler);
+  g_object_unref (scheduler);
+
+  /* create the foreground scheduler */
+  scheduler = tumbler_lifo_scheduler_new ("foreground");
+  tumbler_service_add_scheduler (service, scheduler);
+  g_object_unref (scheduler);
 }
 
 
@@ -237,9 +252,11 @@ tumbler_service_finalize (GObject *object)
 {
   TumblerService *service = TUMBLER_SERVICE (object);
 
-  g_ptr_array_foreach (service->schedulers, (GFunc) g_object_unref, NULL);
-  g_ptr_array_free (service->schedulers, TRUE);
+  /* release all schedulers and the scheduler list */
+  g_list_foreach (service->schedulers, (GFunc) g_object_unref, NULL);
+  g_list_free (service->schedulers);
 
+  /* release the reference on the thumbnailer registry */
   g_object_unref (service->registry);
 
   dbus_g_connection_unref (service->connection);
@@ -307,8 +324,8 @@ tumbler_service_scheduler_error (TumblerScheduler 
*scheduler,
  const gchar  *message,
  TumblerService   *service)
 {
-  g_signal_emit (service, tumbler_service_signals[SIGNAL_ERROR], 0, handle, 
failed_uris, 
- error_code, message);
+  g_signal_emit (service, tumbler_service_signals[SIGNAL_ERROR], 0, 
+ handle, failed_uris, error_code, message);
 }
 
 
@@ -417,23 +434,29 @@ void
 tumbler_service_queue (TumblerService*service,
const GStrvuris,
const GStrvmime_hints,
-   const gchar   *s_scheduler,
+   const gchar   *desired_scheduler,
guint  handle_to_unqueue,
DBusGMethodInvocation *context)
 {
   TumblerScheduler*scheduler = NULL;
   TumblerSchedulerRequest *scheduler_request;
   TumblerThumbnailer **thumbnailers;
+  GList   *iter;
+  gchar   *name;
+  guinthandle;
   gint num_thumbnailers;
-  guinthandle, i;
+
+  g_debug ("tumbler_service_queue:");
 
   dbus_async_return_if_fail (TUMBLER_IS_SERVICE (service), context);
   dbus_async_return_if_fail (uris != NULL, context);
   dbus_async_return_if_fail (mime_hints != NULL, context);
 
-  if (!s_scheduler || s_scheduler[0] == '\0') {
-s_scheduler = "default";
-  }
+  /* if the scheduler is not defined, fall

[Xfce4-commits] Renamed the kind property to name, using GObject properties

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 5cbf191735dcdd2fd248327471d895fa3532add9 (commit)
   from c8240e613fe2da8d7f4c3ee50b75e6fa1ab8ae67 (commit)

commit 5cbf191735dcdd2fd248327471d895fa3532add9
Author: Philip Van Hoof 
Date:   Tue Oct 6 17:26:46 2009 +0200

Renamed the kind property to name, using GObject properties

Signed-off-by: Jannis Pohlmann 

 autogen.sh |2 +-
 po/tumbler.pot |  162 
 tumblerd/tumbler-group-scheduler.c |   37 +++--
 tumblerd/tumbler-group-scheduler.h |2 +-
 tumblerd/tumbler-lifo-scheduler.c  |   38 +++--
 tumblerd/tumbler-lifo-scheduler.h  |2 +-
 tumblerd/tumbler-scheduler.c   |   26 +++---
 tumblerd/tumbler-scheduler.h   |4 +-
 tumblerd/tumbler-service.c |2 +-
 9 files changed, 42 insertions(+), 233 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index f8695f4..403697e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,7 @@ fi
 which gnome-autogen.sh
 if test x"$?" = x"0"; then
   echo "Building using the GNOME development environment"
-  ./autogen.gnome.sh $@
+  ./autogen-gnome.sh $@
   exit $?
 fi
 
diff --git a/po/tumbler.pot b/po/tumbler.pot
deleted file mode 100644
index 18cd4e1..000
--- a/po/tumbler.pot
+++ /dev/null
@@ -1,162 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-30 02:45+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: .././tumblerd/tumbler-cache-service.c:398
-#, c-format
-msgid "Another thumbnail cache service is already running"
-msgstr ""
-
-#: .././tumblerd/tumbler-service.c:383
-#, c-format
-msgid "Another generic thumbnailer is already running"
-msgstr ""
-
-#: .././tumblerd/tumbler-threshold-scheduler.c:388
-#, c-format
-msgid "No thumbnailer available for \"%s\""
-msgstr ""
-
-#: .././tumblerd/tumbler-manager.c:230
-#, c-format
-msgid "Another thumbnailer manager is already running"
-msgstr ""
-
-#. set the application name. Translators: Don't translate "Tumbler".
-#: .././tumblerd/main.c:63
-msgid "Tumbler Thumbnailing Service"
-msgstr ""
-
-#: .././tumblerd/main.c:78
-#, c-format
-msgid "Failed to connect to the D-Bus session bus: %s"
-msgstr ""
-
-#: .././tumblerd/main.c:90
-#, c-format
-msgid "Failed to start the thumbnail cache service: %s"
-msgstr ""
-
-#: .././tumblerd/main.c:137
-#, c-format
-msgid "Failed to load specialized thumbnailers into the registry: %s"
-msgstr ""
-
-#: .././tumblerd/main.c:155
-#, c-format
-msgid "Failed to start the thumbnailer manager: %s"
-msgstr ""
-
-#: .././tumblerd/main.c:173
-#, c-format
-msgid "Failed to start the thumbnailer service: %s"
-msgstr ""
-
-#: .././tumbler/tumbler-enum-types.c:49 .././tumbler/tumbler-enum-types.c:73
-msgid "Invalid format"
-msgstr ""
-
-#: .././tumbler/tumbler-enum-types.c:50
-msgid "Normal"
-msgstr ""
-
-#: .././tumbler/tumbler-enum-types.c:51
-msgid "Large"
-msgstr ""
-
-#: .././tumbler/tumbler-enum-types.c:52
-msgid "Cropped"
-msgstr ""
-
-#: .././tumbler/tumbler-enum-types.c:74
-msgid "PNG"
-msgstr ""
-
-#: .././tumbler/tumbler-file-info.c:275
-#, c-format
-msgid "The file \"%s\" is a thumbnail itself"
-msgstr ""
-
-#: .././tumbler/tumbler-provider-plugin.c:135
-#, c-format
-msgid "Plugin \"%s\" lacks required symbols."
-msgstr ""
-
-#: .././tumbler/tumbler-provider-plugin.c:142
-#, c-format
-msgid "Failed to load plugin \"%s\": %s"
-msgstr ""
-
-#: .././plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:57
-#: .././plugins/font-thumbnailer/font-thumbnailer-plugin.c:57
-#: .././plugins/xdg-cache/xdg-cache-plugin.c:58
-#, c-format
-msgid "Version mismatch: %s"
-msgstr ""
-
-#: .././plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:62
-msgid "Initializing the Tumbler Pixbuf Thumbnailer plugin"
-msgstr ""
-
-#: .././plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:79
-msgid "Shutting down the Tumbler Pixbuf Thumbnailer plugin"
-msgstr ""
-
-#: .././plugins/font-thumbnailer/font-thumbnailer-plugin.c:62
-msgid "Initializing the Tumbler Font Thumbnailer plugin"
-msgstr ""
-
-#: .././plugins/font-thumbnailer/font-thumbnailer-plugin.c:79
-msgid "Shutting down the Tumbler Font Thumbnailer plugin"
-msgstr ""
-
-#. there was an error in the freetype initialization, abort
-#: .././plugins/font-thumbnailer/font-thumbnailer.c:464
-#, c-format
-msgid "Could not initialize freetype: %s"
-msgstr ""
-
-#. the font file could not be loaded, emit an error signal
-#: .././plugins/font-thumbnailer/font-thumbnailer.c:497
-#, c-format
-msgid "Could not open font file: %s"
-msgstr ""
-
-#. em

[Xfce4-commits] Back to the org.freedesktop.thumbnails namespace. Use API versioning.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to abcebdf3a33db65061003f923a0eedbe7be50269 (commit)
   from bb8928cb7423a1634f11d7dbc6e4ea0601ef (commit)

commit abcebdf3a33db65061003f923a0eedbe7be50269
Author: Jannis Pohlmann 
Date:   Tue Oct 6 21:16:56 2009 +0200

Back to the org.freedesktop.thumbnails namespace. Use API versioning.

This is another in a series of commits aiming at synchronizing the
implemented D-Bus API with the changes recently made to the spec on
http://live.gnome.org/ThumbnailerSpec.

We now append an API version to the D-Bus interface and object path
names. We also use org.freedesktop.thumbnails.SpecializedThumbnailer for
specialized thumbnailers, as we do not need to use another namespace
(previously org.freedesktop.thumbnailer.Thumbnailer was used) for it.

 tumblerd/tumbler-cache-service-dbus.xml|4 ++--
 tumblerd/tumbler-cache-service.c   |4 ++--
 tumblerd/tumbler-manager-dbus.xml  |4 ++--
 tumblerd/tumbler-manager.c |4 ++--
 tumblerd/tumbler-service-dbus.xml  |4 ++--
 tumblerd/tumbler-service.c |8 ++--
 tumblerd/tumbler-specialized-thumbnailer.c |9 +
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/tumblerd/tumbler-cache-service-dbus.xml 
b/tumblerd/tumbler-cache-service-dbus.xml
index c72acb5..0d4ca87 100644
--- a/tumblerd/tumbler-cache-service-dbus.xml
+++ b/tumblerd/tumbler-cache-service-dbus.xml
@@ -1,6 +1,6 @@
 
-
-  
+
+  
 
   
   
diff --git a/tumblerd/tumbler-cache-service.c b/tumblerd/tumbler-cache-service.c
index ffdfcb5..4961fcd 100644
--- a/tumblerd/tumbler-cache-service.c
+++ b/tumblerd/tumbler-cache-service.c
@@ -382,7 +382,7 @@ tumbler_cache_service_start (TumblerCacheService *service,
   connection = dbus_g_connection_get_connection (service->connection);
 
   /* request ownership for the cache interface */
-  result = dbus_bus_request_name (connection, "org.xfce.thumbnails.Cache", 
+  result = dbus_bus_request_name (connection, 
"org.freedesktop.thumbnails.Cache1", 
   DBUS_NAME_FLAG_DO_NOT_QUEUE, &dbus_error);
 
   /* check if that failed */
@@ -413,7 +413,7 @@ tumbler_cache_service_start (TumblerCacheService *service,
 
   /* register the cache instance as a handler of the cache interface */
   dbus_g_connection_register_g_object (service->connection, 
-   "/org/xfce/thumbnails/Cache",
+   "/org/freedesktop/thumbnails/Cache1",
G_OBJECT (service));
 
   g_mutex_unlock (service->mutex);
diff --git a/tumblerd/tumbler-manager-dbus.xml 
b/tumblerd/tumbler-manager-dbus.xml
index cfc3fef..e104b4f 100644
--- a/tumblerd/tumbler-manager-dbus.xml
+++ b/tumblerd/tumbler-manager-dbus.xml
@@ -1,6 +1,6 @@
 
-
-  
+
+  
 
   
   
diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c
index 13f37f3..14502ef 100644
--- a/tumblerd/tumbler-manager.c
+++ b/tumblerd/tumbler-manager.c
@@ -210,7 +210,7 @@ tumbler_manager_start (TumblerManager *manager,
   connection = dbus_g_connection_get_connection (manager->connection);
 
   /* request ownership for the manager interface */
-  result = dbus_bus_request_name (connection, "org.xfce.thumbnails.Manager",
+  result = dbus_bus_request_name (connection, 
"org.freedesktop.thumbnails.Manager1",
   DBUS_NAME_FLAG_DO_NOT_QUEUE, &dbus_error);
 
   /* check if that failed */
@@ -242,7 +242,7 @@ tumbler_manager_start (TumblerManager *manager,
 
   /* register the manager instance as a handler of the manager interface */
   dbus_g_connection_register_g_object (manager->connection, 
-   "/org/xfce/thumbnails/Manager", 
+   "/org/freedesktop/thumbnails/Manager1", 
G_OBJECT (manager));
 
   g_mutex_unlock (manager->mutex);
diff --git a/tumblerd/tumbler-service-dbus.xml 
b/tumblerd/tumbler-service-dbus.xml
index 26adbfc..0026e6c 100644
--- a/tumblerd/tumbler-service-dbus.xml
+++ b/tumblerd/tumbler-service-dbus.xml
@@ -1,6 +1,6 @@
 
-
-  
+
+  
 
   
   
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 40b7420..9890407 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -389,7 +389,7 @@ tumbler_service_start (TumblerService *service,
   connection = dbus_g_connection_get_connection (service->connection);
 
   /* request ownership for the generic thumbnailer interface */
-  result = dbus_bus_request_name (connection, 
"org.freedesktop.thumbnails.Thumbnailer",
+  result = dbus_bus_request_name (connection, 
"org.freedesktop.thumbnails.Thumbnailer1",
   DBUS_NAME_FLAG_DO_NOT_QUEUE, &dbus_error);
 
   /* check if that failed */
@@ -420,7 +420,7 @@ tumbler_service_start (TumblerServic

[Xfce4-commits] Update namespace in service files and Makefile.am.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to cf96f1a466d1d002f901c99c069758ca82781a2e (commit)
   from abcebdf3a33db65061003f923a0eedbe7be50269 (commit)

commit cf96f1a466d1d002f901c99c069758ca82781a2e
Author: Jannis Pohlmann 
Date:   Tue Oct 6 21:25:26 2009 +0200

Update namespace in service files and Makefile.am.

 tumblerd/Makefile.am   |6 +++---
 ...rvice.in => org.xfce.Tumbler.Cache1.service.in} |2 +-
 ...ice.in => org.xfce.Tumbler.Manager1.service.in} |2 +-
 tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in  |3 +++
 tumblerd/org.xfce.TumblerThumbnailer.service.in|3 ---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
index 2991e54..fd9d9b0 100644
--- a/tumblerd/Makefile.am
+++ b/tumblerd/Makefile.am
@@ -76,9 +76,9 @@ tumblerd_LDADD =  
\
 
 servicedir = $(datadir)/dbus-1/services
 service_in_files = \
-   org.xfce.TumblerCache.service.in\
-   org.xfce.TumblerManager.service.in  \
-   org.xfce.TumblerThumbnailer.service.in
+   org.xfce.Tumbler.Cache1.service.in  \
+   org.xfce.Tumbler.Manager1.service.in\
+   org.xfce.Tumbler.Thumbnailer1.service.in
 
 service_DATA = $(service_in_files:.service.in=.service)
 
diff --git a/tumblerd/org.xfce.TumblerCache.service.in 
b/tumblerd/org.xfce.Tumbler.Cache1.service.in
similarity index 52%
rename from tumblerd/org.xfce.TumblerCache.service.in
rename to tumblerd/org.xfce.Tumbler.Cache1.service.in
index ce287c1..814897b 100644
--- a/tumblerd/org.xfce.TumblerCache.service.in
+++ b/tumblerd/org.xfce.Tumbler.Cache1.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.xfce.thumbnails.Cache
+Name=org.freedesktop.thumbnails.Cache1
 ex...@libexecdir@/tumblerd
diff --git a/tumblerd/org.xfce.TumblerManager.service.in 
b/tumblerd/org.xfce.Tumbler.Manager1.service.in
similarity index 51%
rename from tumblerd/org.xfce.TumblerManager.service.in
rename to tumblerd/org.xfce.Tumbler.Manager1.service.in
index af2d536..6a0791b 100644
--- a/tumblerd/org.xfce.TumblerManager.service.in
+++ b/tumblerd/org.xfce.Tumbler.Manager1.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.xfce.thumbnails.Manager
+Name=org.freedesktop.thumbnails.Manager1
 ex...@libexecdir@/tumblerd
diff --git a/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in 
b/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in
new file mode 100644
index 000..2dc0a33
--- /dev/null
+++ b/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.thumbnails.Thumbnailer1
+ex...@libexecdir@/tumblerd
diff --git a/tumblerd/org.xfce.TumblerThumbnailer.service.in 
b/tumblerd/org.xfce.TumblerThumbnailer.service.in
deleted file mode 100644
index cdf8b8e..000
--- a/tumblerd/org.xfce.TumblerThumbnailer.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.xfce.thumbnails.Thumbnailer
-ex...@libexecdir@/tumblerd
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix drag file list variable name.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to faec4c42a7a2e5efd2252a60f78c414f92d850be (commit)
   from 1886a15c1b8129c55dfb917b0ac9bbae4803d9a2 (commit)

commit faec4c42a7a2e5efd2252a60f78c414f92d850be
Author: Jannis Pohlmann 
Date:   Fri Oct 2 11:21:59 2009 +0200

Fix drag file list variable name.

 thunar/thunar-standard-view.c |   18 +-
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 241ffa1..83139fc 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -291,7 +291,7 @@ struct _ThunarStandardViewPrivate
   gintcustom_merge_id;
 
   /* right-click drag/popup support */
-  GList  *drathunar_g_file_list;
+  GList  *drag_g_file_list;
   gintdrag_scroll_timer_id;
   gintdrag_timer_id;
   gintdrag_x;
@@ -714,7 +714,7 @@ thunar_standard_view_finalize (GObject *object)
   g_object_unref (G_OBJECT (standard_view->priv->provider_factory));
 
   /* release the drag path list (just in case the drag-end wasn't fired 
before) */
-  thunar_g_file_list_free (standard_view->priv->drathunar_g_file_list);
+  thunar_g_file_list_free (standard_view->priv->drag_g_file_list);
 
   /* release the drop path list (just in case the drag-leave wasn't fired 
before) */
   thunar_g_file_list_free (standard_view->priv->drop_file_list);
@@ -2892,14 +2892,14 @@ thunar_standard_view_drag_begin (GtkWidget  
*view,
   gintsize;
 
   /* release the drag path list (just in case the drag-end wasn't fired 
before) */
-  thunar_g_file_list_free (standard_view->priv->drathunar_g_file_list);
+  thunar_g_file_list_free (standard_view->priv->drag_g_file_list);
 
   /* query the list of selected URIs */
-  standard_view->priv->drathunar_g_file_list = 
thunar_file_list_to_thunar_g_file_list (standard_view->selected_files);
-  if (G_LIKELY (standard_view->priv->drathunar_g_file_list != NULL))
+  standard_view->priv->drag_g_file_list = 
thunar_file_list_to_thunar_g_file_list (standard_view->selected_files);
+  if (G_LIKELY (standard_view->priv->drag_g_file_list != NULL))
 {
   /* determine the first selected file */
-  file = thunar_file_get 
(standard_view->priv->drathunar_g_file_list->data, NULL);
+  file = thunar_file_get (standard_view->priv->drag_g_file_list->data, 
NULL);
   if (G_LIKELY (file != NULL))
 {
   /* generate an icon based on that file */
@@ -2927,7 +2927,7 @@ thunar_standard_view_drag_data_get (GtkWidget  
*view,
   gchar *uri_string;
 
   /* set the URI list for the drag selection */
-  uri_string = thunar_g_file_list_to_string 
(standard_view->priv->drathunar_g_file_list);
+  uri_string = thunar_g_file_list_to_string 
(standard_view->priv->drag_g_file_list);
   gtk_selection_data_set (selection_data, selection_data->target, 8, (guchar 
*) uri_string, strlen (uri_string));
   g_free (uri_string);
 }
@@ -2955,8 +2955,8 @@ thunar_standard_view_drag_end (GtkWidget  *view,
 g_source_remove (standard_view->priv->drag_scroll_timer_id);
 
   /* release the list of dragged URIs */
-  thunar_g_file_list_free (standard_view->priv->drathunar_g_file_list);
-  standard_view->priv->drathunar_g_file_list = NULL;
+  thunar_g_file_list_free (standard_view->priv->drag_g_file_list);
+  standard_view->priv->drag_g_file_list = NULL;
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Switch back to org.freedesktop.thumbnails.* with API versioning.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 4e5231e8d7bb627ee85fe3cfaaa4e27137b3f073 (commit)
   from faec4c42a7a2e5efd2252a60f78c414f92d850be (commit)

commit 4e5231e8d7bb627ee85fe3cfaaa4e27137b3f073
Author: Jannis Pohlmann 
Date:   Tue Oct 6 21:26:55 2009 +0200

Switch back to org.freedesktop.thumbnails.* with API versioning.

 thunar/Makefile.am |4 ++--
 thunar/thunar-thumbnailer-dbus.xml |5 +++--
 thunar/thunar-thumbnailer-manager-dbus.xml |4 ++--
 thunar/thunar-thumbnailer.c|   15 ---
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 2516929..ee62564 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -332,13 +332,13 @@ thunar-dbus-service-infos.h: 
$(srcdir)/thunar-dbus-service-infos.xml Makefile
 thunar-thumbnailer-proxy.h: $(srcdir)/thunar-thumbnailer-dbus.xml Makefile
dbus-binding-tool --mode=glib-client \
$(srcdir)/thunar-thumbnailer-dbus.xml > 
thunar-thumbnailer-proxy.h \
-   && sed -i -e 
's/org_xfce_thumbnails_Thumbnailer/thunar_thumbnailer_proxy/g' \
+   && sed -i -e 
's/org_freedesktop_thumbnails_Thumbnailer1/thunar_thumbnailer_proxy/g' \
thunar-thumbnailer-proxy.h
 
 thunar-thumbnailer-manager-proxy.h: 
$(srcdir)/thunar-thumbnailer-manager-dbus.xml Makefile
dbus-binding-tool --mode=glib-client \
$(srcdir)/thunar-thumbnailer-manager-dbus.xml > 
thunar-thumbnailer-manager-proxy.h \
-   && sed -i -e 
's/org_xfce_thumbnails_Manager/thunar_thumbnailer_manager_proxy/g' \
+   && sed -i -e 
's/org_freedesktop_thumbnails_Manager1/thunar_thumbnailer_manager_proxy/g' \
thunar-thumbnailer-manager-proxy.h
 endif
 
diff --git a/thunar/thunar-thumbnailer-dbus.xml 
b/thunar/thunar-thumbnailer-dbus.xml
index c040ceb..84ecb65 100644
--- a/thunar/thunar-thumbnailer-dbus.xml
+++ b/thunar/thunar-thumbnailer-dbus.xml
@@ -1,10 +1,11 @@
 
-
-  
+
+  
 
   
   
   
+  
   
   
 
diff --git a/thunar/thunar-thumbnailer-manager-dbus.xml 
b/thunar/thunar-thumbnailer-manager-dbus.xml
index cfc3fef..e104b4f 100644
--- a/thunar/thunar-thumbnailer-manager-dbus.xml
+++ b/thunar/thunar-thumbnailer-manager-dbus.xml
@@ -1,6 +1,6 @@
 
-
-  
+
+  
 
   
   
diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c
index e81cbaf..6a6314e 100644
--- a/thunar/thunar-thumbnailer.c
+++ b/thunar/thunar-thumbnailer.c
@@ -415,9 +415,9 @@ thunar_thumbnailer_init_thumbnailer_proxy 
(ThunarThumbnailer *thumbnailer,
   /* create the shared thumbnailer proxy */
   thunar_thumbnailer_proxy = 
 dbus_g_proxy_new_for_name (connection, 
-   "org.xfce.thumbnails.Thumbnailer",
-   "/org/xfce/thumbnails/Thumbnailer",
-   "org.xfce.thumbnails.Thumbnailer");
+   "org.freedesktop.thumbnails.Thumbnailer1",
+   "/org/freedesktop/thumbnails/Thumbnailer1",
+   "org.freedesktop.thumbnails.Thumbnailer1");
 
   /* make sure to set it to NULL when the last reference is dropped */
   g_object_add_weak_pointer (G_OBJECT (thunar_thumbnailer_proxy),
@@ -487,9 +487,9 @@ thunar_thumbnailer_init_manager_proxy (ThunarThumbnailer 
*thumbnailer,
   /* create the shared manager proxy */
   thunar_thumbnailer_manager_proxy = 
 dbus_g_proxy_new_for_name (connection, 
-   "org.xfce.thumbnails.Manager",
-   "/org/xfce/thumbnails/Manager",
-   "org.xfce.thumbnails.Manager");
+   "org.freedesktop.thumbnails.Manager1",
+   "/org/freedesktop/thumbnails/Manager1",
+   "org.freedesktop.thumbnails.Manager1");
 
   /* make sure to set it to NULL when the last reference is dropped */
   g_object_add_weak_pointer (G_OBJECT (thunar_thumbnailer_manager_proxy),
@@ -783,7 +783,8 @@ thunar_thumbnailer_queue_async (ThunarThumbnailer 
*thumbnailer,
 
   /* queue thumbnails for the given URIs asynchronously */
   call = thunar_thumbnailer_proxy_queue_async (thumbnailer->thumbnailer_proxy,
-   (const gchar **)uris, 
mime_hints, 0, 
+   (const gchar **)uris, 
mime_hints, 
+   "foreground", 0, 

thunar_thumbnailer_queue_async_reply,
thumbnailer_call);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix desktop file Application type

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to 6eb1460dfb697d8f38bb0c9d0c3ce4ebfa4dbd26 (commit)
   from 795a28c9be6e6c3556a10f0064c75de639fedf7f (commit)

commit 6eb1460dfb697d8f38bb0c9d0c3ce4ebfa4dbd26
Author: Ali Abdallah 
Date:   Tue Oct 6 21:48:07 2009 +

Fix desktop file Application type

 data/desktop/parole.desktop.in.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/data/desktop/parole.desktop.in.in 
b/data/desktop/parole.desktop.in.in
index cb86551..1fcd40b 100644
--- a/data/desktop/parole.desktop.in.in
+++ b/data/desktop/parole.desktop.in.in
@@ -3,6 +3,6 @@ _Name=Parole Media Player
 Icon=parole
 Exec=parole %F
 Terminal=false
-Type=Application;
+Type=Application
 Categories=GTK;AudioVideo;Player;Video;
 StartupNotify=true
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] load icon file directly if not in theme

2009-10-06 Thread Brian J . Tarricone

Updating branch refs/heads/libxfce4ui
 to 5e1aafe77ed45feb49feb8f92aa9deb3e5d76ba8 (commit)
   from 185ddcfe8dd494a2caaeaa639eb7514c068826b3 (commit)

commit 5e1aafe77ed45feb49feb8f92aa9deb3e5d76ba8
Author: Brian J. Tarricone 
Date:   Tue Oct 6 14:58:22 2009 -0700

load icon file directly if not in theme

 panel-plugin/desktop-menu-plugin.c |   16 +---
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/panel-plugin/desktop-menu-plugin.c 
b/panel-plugin/desktop-menu-plugin.c
index 83cbc92..5f80fc9 100644
--- a/panel-plugin/desktop-menu-plugin.c
+++ b/panel-plugin/desktop-menu-plugin.c
@@ -120,17 +120,18 @@ dmp_get_icon(const gchar *icon_name, gint size, 
GtkOrientation orientation)
 const gchar *filename;
 gint w, h;
 
-iinfo = gtk_icon_theme_lookup_icon(itheme, icon_name, size, 0);
-if(!iinfo)
-return NULL;
-
 w = orientation == GTK_ORIENTATION_HORIZONTAL ? -1 : size;
 h = orientation == GTK_ORIENTATION_VERTICAL ? -1 : size;
 
-filename = gtk_icon_info_get_filename(iinfo);
+iinfo = gtk_icon_theme_lookup_icon(itheme, icon_name, size, 0);
+if(iinfo)
+filename = gtk_icon_info_get_filename(iinfo);
+else
+filename = icon_name;
+
 if(filename)
 pix = gdk_pixbuf_new_from_file_at_scale(filename, w, h, TRUE, NULL);
-else {
+else if(iinfo) {
 GdkPixbuf *tmp = gtk_icon_info_get_builtin_pixbuf(iinfo);
 
 if(tmp) {
@@ -150,7 +151,8 @@ dmp_get_icon(const gchar *icon_name, gint size, 
GtkOrientation orientation)
 }
 }
 
-gtk_icon_info_free(iinfo);
+if(iinfo)
+gtk_icon_info_free(iinfo);
 
 return pix;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix display formatting of URIs and unit test it properly

2009-10-06 Thread Christian Dywan

Updating branch refs/heads/master
 to 3ed9e482cd09b1d75fa6c0ab5e19385bbdf8dbf0 (commit)
   from ca81aeb0343c067ab0064a6b973aa19158f27382 (commit)

commit 3ed9e482cd09b1d75fa6c0ab5e19385bbdf8dbf0
Author: Christian Dywan 
Date:   Tue Oct 6 23:43:33 2009 +0200

Fix display formatting of URIs and unit test it properly

 midori/midori-locationaction.c |   10 +
 midori/sokoke.c|   93 +++
 tests/magic-uri.c  |   52 +++---
 3 files changed, 120 insertions(+), 35 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 1c7c9a1..568479f 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -635,7 +635,6 @@ midori_location_entry_render_text_cb (GtkCellLayout*   
layout,
   GtkTreeIter* iter,
   gpointer data)
 {
-gchar* uri_raw;
 gchar* uri;
 gchar* title;
 gchar* desc;
@@ -649,14 +648,7 @@ midori_location_entry_render_text_cb (GtkCellLayout*   
layout,
 gchar** parts;
 size_t len;
 
-gtk_tree_model_get (model, iter, URI_COL, &uri_raw, TITLE_COL, &title, -1);
-
-#if GLIB_CHECK_VERSION (2, 22, 0)
-uri = g_hostname_to_unicode (uri_raw);
-g_free (uri_raw);
-#else
-uri = uri_raw;
-#endif
+gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1);
 
 desc = desc_uri = desc_title = key = NULL;
 if (G_LIKELY (data))
diff --git a/midori/sokoke.c b/midori/sokoke.c
index a1fa336..2a9d966 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -185,6 +185,59 @@ sokoke_spawn_program (const gchar* command,
 return TRUE;
 }
 
+#if defined (HAVE_LIBSOUP_2_27_90) || HAVE_LIBIDN
+/**
+ * sokoke_hostname_from_uri:
+ * @uri: an URI string
+ * @path: location of a string pointer
+ *
+ * Returns the hostname of the specified URI,
+ * and stores the path in @path.
+ * @path is at least set to ""
+ *
+ * Return value: a newly allocated hostname
+ **/
+static gchar*
+sokoke_hostname_from_uri (const gchar* uri,
+  gchar**  path)
+{
+gchar* hostname;
+
+*path = "";
+if ((hostname = g_utf8_strchr (uri, -1, '/')))
+{
+if (hostname[1] == '/')
+hostname += 2;
+if ((*path = g_utf8_strchr (hostname, -1, '/')))
+{
+gulong offset = g_utf8_pointer_to_offset (hostname, *path);
+gchar* buffer = g_malloc0 (offset + 1);
+g_utf8_strncpy (buffer, hostname, offset);
+hostname = buffer;
+}
+else
+hostname = g_strdup (hostname);
+}
+else
+hostname = g_strdup (uri);
+return hostname;
+}
+#endif
+
+/**
+ * sokoke_idn_to_punycode:
+ * @uri: an URI string
+ *
+ * The specified URI is parsed and the hostname
+ * part of it is encoded if it is not ASCII.
+ *
+ * If libIDN is not available at compile time,
+ * this code will pass the string unaltered.
+ *
+ * The called function owns the passed string.
+ *
+ * Return value: a newly allocated ASCII URI
+ **/
 gchar*
 sokoke_idn_to_punycode (gchar* uri)
 {
@@ -212,23 +265,7 @@ sokoke_idn_to_punycode (gchar* uri)
 proto = buffer;
 }
 
-path = NULL;
-if ((hostname = g_utf8_strchr (uri, -1, '/')))
-{
-if (hostname[1] == '/')
-hostname += 2;
-if ((path = g_utf8_strchr (hostname, -1, '/')))
-{
-gulong offset = g_utf8_pointer_to_offset (hostname, path);
-gchar* buffer = g_malloc0 (offset + 1);
-g_utf8_strncpy (buffer, hostname, offset);
-hostname = buffer;
-}
-else
-hostname = g_strdup (hostname);
-}
-else
-hostname = g_strdup (uri);
+hostname = sokoke_hostname_from_uri (uri, &path);
 
 if (!(q = stringprep_utf8_to_ucs4 (hostname, -1, NULL)))
 {
@@ -294,6 +331,16 @@ gchar* sokoke_search_uri (const gchar* uri,
 return search;
 }
 
+/**
+ * sokoke_magic_uri:
+ * @uri: a string typed by a user
+ * @search_engines: search engines
+ *
+ * Takes a string that was typed by a user,
+ * guesses what it is, and returns an URI.
+ *
+ * Return value: a newly allocated URI
+ **/
 gchar*
 sokoke_magic_uri (const gchar* uri,
   KatzeArray*  search_engines)
@@ -358,6 +405,7 @@ sokoke_magic_uri (const gchar* uri,
 return search;
 }
 
+
 /**
  * sokoke_format_uri_for_display:
  * @uri: an URI string
@@ -374,12 +422,19 @@ sokoke_format_uri_for_display (const gchar* uri)
 {
 gchar* unescaped = g_uri_unescape_string (uri, NULL);
 #ifdef HAVE_LIBSOUP_2_27_90
-gchar* decoded = g_hostname_to_unicode (unescaped);
+gchar* path;
+gchar* hostname = sokoke_hostname_from_uri (unescaped, &path);
+gchar* decoded = g_hostname_to_unicode (hostname);
+
 if (decoded)
 {
+gchar* result = g_strconcat

[Xfce4-commits] Fix make distcheck, update translation files, add pot file back.

2009-10-06 Thread Jannis Pohlmann

Updating branch refs/heads/master
 to 9f2588a3cb6cd9356b58e97d44237124068abe74 (commit)
   from cf96f1a466d1d002f901c99c069758ca82781a2e (commit)

commit 9f2588a3cb6cd9356b58e97d44237124068abe74
Author: Jannis Pohlmann 
Date:   Wed Oct 7 03:02:42 2009 +0200

Fix make distcheck, update translation files, add pot file back.

 po/POTFILES.in |4 +-
 po/ast.po  |   81 +++
 po/da.po   |   81 +++
 po/en_GB.po|   81 +++
 po/tr.po   |   81 +++
 po/tumbler.pot |  169 
 6 files changed, 347 insertions(+), 150 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 92ae67e..c55ea54 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,12 @@
 tumblerd/tumbler-cache-service.c
+tumblerd/tumbler-group-scheduler.c
+tumblerd/tumbler-lifo-scheduler.c
 tumblerd/tumbler-service.c
 tumblerd/tumbler-specialized-thumbnailer.c
-tumblerd/tumbler-threshold-scheduler.c
 tumblerd/tumbler-manager.c
 tumblerd/tumbler-scheduler.c
 tumblerd/main.c
 tumblerd/tumbler-registry.c
-tumblerd/tumbler-naive-scheduler.c
 tumbler/tumbler-enum-types.c
 tumbler/tumbler-config.c
 tumbler/tumbler-cache-provider.c
diff --git a/po/ast.po b/po/ast.po
index 60b26b0..c7f6916 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tumbler\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-30 02:45+0200\n"
+"POT-Creation-Date: 2009-10-07 02:59+0200\n"
 "PO-Revision-Date: 2009-09-02 16:29+0100\n"
 "Last-Translator: astur \n"
 "Language-Team: en_GB\n"
@@ -15,149 +15,156 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .././tumblerd/tumbler-cache-service.c:398
+#: ../tumblerd/tumbler-cache-service.c:402
 #, c-format
 msgid "Another thumbnail cache service is already running"
 msgstr "Ta executÃ¡ndose otru serviciu cachÃ© de miniatures"
 
-#: .././tumblerd/tumbler-service.c:383
-#, c-format
-msgid "Another generic thumbnailer is already running"
-msgstr "Ta executÃ¡ndose otru xestor de miniatures xenÃ©ricu"
-
-#: .././tumblerd/tumbler-threshold-scheduler.c:388
+#: ../tumblerd/tumbler-group-scheduler.c:426
+#: ../tumblerd/tumbler-lifo-scheduler.c:379
 #, c-format
 msgid "No thumbnailer available for \"%s\""
 msgstr "Nun hai miniatures disponibles pa \"%s\""
 
-#: .././tumblerd/tumbler-manager.c:230
+#: ../tumblerd/tumbler-service.c:409
+#, c-format
+msgid "Another generic thumbnailer is already running"
+msgstr "Ta executÃ¡ndose otru xestor de miniatures xenÃ©ricu"
+
+#: ../tumblerd/tumbler-manager.c:230
 #, c-format
 msgid "Another thumbnailer manager is already running"
 msgstr "Ta executÃ¡ndose otru xestor de miniatures"
 
 #. set the application name. Translators: Don't translate "Tumbler".
-#: .././tumblerd/main.c:63
+#: ../tumblerd/main.c:63
 msgid "Tumbler Thumbnailing Service"
 msgstr "Serviciu de Miniatures Tumbler"
 
-#: .././tumblerd/main.c:78
+#: ../tumblerd/main.c:78
 #, c-format
 msgid "Failed to connect to the D-Bus session bus: %s"
 msgstr "FallÃ³ al coneutar a la sesiÃ³n bus D-Bus: %s"
 
-#: .././tumblerd/main.c:90
+#: ../tumblerd/main.c:90
 #, c-format
 msgid "Failed to start the thumbnail cache service: %s"
 msgstr "FallÃ³ al aniciar el serviciu cachÃ© de miniatures: %s"
 
-#: .././tumblerd/main.c:137
+#: ../tumblerd/main.c:137
 #, c-format
 msgid "Failed to load specialized thumbnailers into the registry: %s"
 msgstr "FallÃ³ al cargar miniatures especializaes nel rexistru: %s"
 
-#: .././tumblerd/main.c:155
+#: ../tumblerd/main.c:155
 #, c-format
 msgid "Failed to start the thumbnailer manager: %s"
 msgstr "FallÃ³ al aniciar el xestor de miniatures: %s"
 
-#: .././tumblerd/main.c:173
+#: ../tumblerd/main.c:173
 #, c-format
 msgid "Failed to start the thumbnailer service: %s"
 msgstr "FallÃ³ al aniciar el serviciu de miniatures: %s"
 
-#: .././tumbler/tumbler-enum-types.c:49 .././tumbler/tumbler-enum-types.c:73
+#: ../tumbler/tumbler-enum-types.c:49 ../tumbler/tumbler-enum-types.c:73
 msgid "Invalid format"
 msgstr "Formatu invÃ¡lidu"
 
-#: .././tumbler/tumbler-enum-types.c:50
+#: ../tumbler/tumbler-enum-types.c:50
 msgid "Normal"
 msgstr "Normal"
 
-#: .././tumbler/tumbler-enum-types.c:51
+#: ../tumbler/tumbler-enum-types.c:51
 msgid "Large"
 msgstr "Grande"
 
-#: .././tumbler/tumbler-enum-types.c:52
+#: ../tumbler/tumbler-enum-types.c:52
 msgid "Cropped"
 msgstr "CortÃ¡u"
 
-#: .././tumbler/tumbler-enum-types.c:74
+#: ../tumbler/tumbler-enum-types.c:74
 msgid "PNG"
 msgstr "PNG"
 
-#: .././tumbler/tumbler-file-info.c:275
+#: ../tumbler/tumbler-file-info.c:275
 #, c-format
 msgid "The file \"%s\" is a thumbnail itself"
 msgstr ""
 
-#: .././tumbler/tumbler-provider-plugin.c:135
+#: ../tumbler/tumbler-provider-plugin.c:135
 #, c-format
 msgid "Plugin \"%s\" lacks required symbols."
 msgstr "Plugin \"%s\" carez de los sÃmbolos necesarios."
 
-#:

[Xfce4-commits] l10n: Uploading a french translation.

2009-10-06 Thread Transifex

Updating branch refs/heads/master
 to 051f1a31c797c60ccedd1a36b6403aac9b950ed8 (commit)
   from 6eb1460dfb697d8f38bb0c9d0c3ce4ebfa4dbd26 (commit)

commit 051f1a31c797c60ccedd1a36b6403aac9b950ed8
Author: Steve Dodier 
Date:   Wed Oct 7 05:23:23 2009 +

l10n: Uploading a french translation.

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

 po/{gl.po => fr.po} |  354 ++-
 1 files changed, 179 insertions(+), 175 deletions(-)

diff --git a/po/gl.po b/po/fr.po
similarity index 72%
copy from po/gl.po
copy to po/fr.po
index 59ed33a..e917d6d 100644
--- a/po/gl.po
+++ b/po/fr.po
@@ -1,28 +1,24 @@
-# Galician translation of notification-daemon-xfce
-# Copyright (C) 2009 Leandro Regueiro.
-# This file is distributed under the same license as the Xfce package.
-#
-# Leandro Regueiro , 2009.
-#
-# Proxecto Trasno - AdaptaciÃ³n do software libre Ã¡ lingua galega:  Se desexas
-# colaborar connosco, podes atopar mÃ¡is informaciÃ³n en 
-#
+# French translations of parole
+# Copyright (C) 2009 the parole-media-player's copyright holder
+# This file is distributed under the same license as the parole-media-player 
package.
+# Steve Dodier 
 msgid ""
 msgstr ""
-"Project-Id-Version: Parole 0.1\n"
+"Project-Id-Version: ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-16 16:02+0200\n"
-"PO-Revision-Date: 2009-10-04 14:50+0100\n"
-"Last-Translator: Leandro Regueiro \n"
-"Language-Team: Galician \n"
+"POT-Creation-Date: 2009-10-04 10:38:54+02:00\n"
+"PO-Revision-Date: 2009-10-04 11:48+0100\n"
+"Last-Translator: Steve Dodier \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"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: France\n"
+"Language-Team: \n"
 
 #: ../data/interfaces/parole.ui.h:1
 msgid "16:9 (Widescreen)"
-msgstr "16:9 (PanorÃ¡mico)"
+msgstr "16:9 (Ãcran large)"
 
 #: ../data/interfaces/parole.ui.h:2
 msgid "20:9 (DVB)"
@@ -33,46 +29,47 @@ msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
 #: ../data/interfaces/parole.ui.h:4
-#, fuzzy
 msgid "Aspect Ratio"
-msgstr "ProporciÃ³n de aspecto:"
+msgstr "Ratio d'Aspect"
 
 #: ../data/interfaces/parole.ui.h:5
-#, fuzzy
 msgid "Auto"
-msgstr "AutomÃ¡tico"
+msgstr "Auto"
 
 #: ../data/interfaces/parole.ui.h:6
+#, fuzzy
 msgid "Chapter Menu"
-msgstr "MenÃº de capÃtulos"
+msgstr "Menu des Chapitres"
 
 #: ../data/interfaces/parole.ui.h:7
+#, fuzzy
 msgid "DVD Menu"
-msgstr "MenÃº do DVD"
+msgstr "Menu du DVD"
 
 #: ../data/interfaces/parole.ui.h:8
 #: ../parole/parole-player.c:288
 msgid "Hide playlist"
-msgstr "Ocultar a lista de reproduciÃ³n"
+msgstr "Cacher la liste de lecture"
 
 #: ../data/interfaces/parole.ui.h:9
 msgid "Media player"
-msgstr "Reprodutor multimedia"
+msgstr "Lecteur MÃ©dia"
 
 #: ../data/interfaces/parole.ui.h:10
+#, fuzzy
 msgid "Mute"
-msgstr "Silencio"
+msgstr "Mettre en sourdine"
 
 #: ../data/interfaces/parole.ui.h:11
 #: ../parole/parole-player.c:1002
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
-msgstr "CapÃtulo seguinte"
+msgstr "Chapitre Suivant"
 
 #: ../data/interfaces/parole.ui.h:12
 #, fuzzy
 msgid "None"
-msgstr "Ningunha"
+msgstr "Aucun"
 
 #: ../data/interfaces/parole.ui.h:13
 #: ../data/desktop/parole.desktop.in.in.h:1
@@ -80,29 +77,31 @@ msgstr "Ningunha"
 #: ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
-msgstr "Reprodutor multimedia Parole"
+msgstr "Lecteur MÃ©dia Parole"
 
 #: ../data/interfaces/parole.ui.h:14
 msgid "Plugins"
-msgstr "Engadidos"
+msgstr "Greffons"
 
 #: ../data/interfaces/parole.ui.h:15
 #: ../parole/parole-player.c:1014
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
-msgstr "CapÃtulo anterior"
+msgstr "Chapitre PrÃ©cÃ©dent"
 
 #: ../data/interfaces/parole.ui.h:16
 msgid "Repeat"
-msgstr "Repetir"
+msgstr "RÃ©pÃ©ter"
 
 #: ../data/interfaces/parole.ui.h:17
+#, fuzzy
 msgid "Select Track"
-msgstr "Escoller pista"
+msgstr "SÃ©lectionner une Piste"
 
 #: ../data/interfaces/parole.ui.h:18
+#, fuzzy
 msgid "Shuffle"
-msgstr "Aleatorio"
+msgstr "MÃ©langer"
 
 #: ../data/interfaces/parole.ui.h:19
 msgid "Sound"
@@ -110,138 +109,133 @@ msgstr "Son"
 
 #: ../data/interfaces/parole.ui.h:20
 msgid "Square"
-msgstr "Cadrado"
+msgstr "CarrÃ©"
 
 #: ../data/interfaces/parole.ui.h:21
 msgid "Volume Down"
-msgstr "Baixar o volume"
+msgstr "Diminuer le Volume"
 
 #: ../data/interfaces/parole.ui.h:22
 msgid "Volume Up"
-msgstr "Subir o volume"
+msgstr "Augmenter le Volume"
 
 #: ../data/interfaces/parole.ui.h:23
 msgid "_Edit"
-msgstr "_Editar"
+msgstr "_Ãditer"
 
 #: ../data/interfaces/parole.ui.h:24
 msgid "_Help"
-msgstr "A_xuda"
+msgstr "Aid_e"
 
 #: ../data/interfaces/parole.ui.h:25
 msgid "_Media"
-msgstr "_Soportes"
+msgstr "_MÃ©dia"
 
 #: ../data/interfaces/parole.ui.h:26
 msgid "_View"
-msgstr "_Ver"
+msgstr "_Affichage"
 
 #: ../d

[Xfce4-commits] l10n: Updates to French (fr) translation

2009-10-06 Thread Transifex

Updating branch refs/heads/master
 to e579136365068c799c6964dedf4ab2532a4e38e4 (commit)
   from 89289414e601cec38126beebfe652c1530324244 (commit)

commit e579136365068c799c6964dedf4ab2532a4e38e4
Author: Steve Dodier 
Date:   Wed Oct 7 05:25:38 2009 +

l10n: Updates to French (fr) translation

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

 po/fr.po |  238 --
 1 files changed, 108 insertions(+), 130 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index a00d498..3ab307e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n"
 "POT-Creation-Date: 2009-09-27 23:47+0200\n"
-"PO-Revision-Date: 2008-11-29 12:08+0100\n"
-"Last-Translator: Mike Massonnet \n"
+"PO-Revision-Date: 2009-10-04 13:00+0100\n"
+"Last-Translator: Steve Dodier \n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,8 +35,7 @@ msgid ""
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
-"Essayez %s --help pour voir une liste complÃ¨te des options en ligne de "
-"commande.\n"
+"Essayez %s --help pour voir une liste complÃ¨te des options en ligne de 
commande.\n"
 
 #. File Menu
 #: ../src/main_window.c:264
@@ -45,15 +44,13 @@ msgstr "_Fichier"
 
 #: ../src/main_window.c:265
 msgid "_Open"
-msgstr ""
+msgstr "_Ouvrir"
 
 #: ../src/main_window.c:265
-#, fuzzy
 msgid "Open an image"
 msgstr "Ouvrir une image"
 
 #: ../src/main_window.c:266
-#, fuzzy
 msgid "Open _Folder"
 msgstr "O_uvrir un rÃ©pertoire"
 
@@ -64,73 +61,65 @@ msgstr "Ouvrir un rÃ©pertoire"
 
 #: ../src/main_window.c:267
 msgid "_Save copy"
-msgstr ""
+msgstr "_Enregistrer une copie"
 
 #: ../src/main_window.c:267
 msgid "Save a copy of the image"
-msgstr ""
+msgstr "Enregistrer une copie de l'image"
 
 #: ../src/main_window.c:268
 msgid "_Print"
-msgstr ""
+msgstr "_Imprimer"
 
 #: ../src/main_window.c:268
 #, fuzzy
 msgid "Print the image"
-msgstr "_PrÃ©charger les images"
+msgstr "_Imprimer l'image"
 
 #: ../src/main_window.c:269
-#, fuzzy
 msgid "_Close"
-msgstr "Fermer _tout"
+msgstr "_Fermer"
 
 #: ../src/main_window.c:269
 msgid "Close this image"
-msgstr ""
+msgstr "Fermer cette image"
 
 #: ../src/main_window.c:270
-#, fuzzy
 msgid "_Close All"
-msgstr "Fermer _tout"
+msgstr "Fermer _Tout"
 
 #: ../src/main_window.c:270
-#, fuzzy
 msgid "Close all images"
-msgstr "Fermer _tout"
+msgstr "Fermer toutes les images"
 
 #: ../src/main_window.c:271
-#, fuzzy
 msgid "_Quit"
-msgstr "_Editer"
+msgstr "_Quitter"
 
 #: ../src/main_window.c:271
-#, fuzzy
 msgid "Quit Ristretto"
-msgstr "Ristretto"
+msgstr "Quitter Ristretto"
 
 #. Edit Menu
 #: ../src/main_window.c:273
 msgid "_Edit"
-msgstr "_Editer"
+msgstr "_Ãditer"
 
 #: ../src/main_window.c:274
-#, fuzzy
 msgid "_Open with..."
 msgstr "_Ouvrir avec..."
 
 #: ../src/main_window.c:275
-#, fuzzy
 msgid "_Sorting"
-msgstr "_Zoom"
+msgstr "_Trier par"
 
 #: ../src/main_window.c:276
 msgid "_Delete"
-msgstr ""
+msgstr "_Effacer"
 
 #: ../src/main_window.c:277
-#, fuzzy
 msgid "_Preferences"
-msgstr "PrÃ©fÃ©rences du visualiseur dâimages"
+msgstr "PrÃ©fÃ©rences"
 
 #. View Menu
 #: ../src/main_window.c:279
@@ -139,14 +128,13 @@ msgstr "_Afficher"
 
 #: ../src/main_window.c:280
 msgid "_Fullscreen"
-msgstr ""
+msgstr "_Plein Ã©cran"
 
 #: ../src/main_window.c:281
 msgid "_Leave Fullscreen"
-msgstr ""
+msgstr "_Quitter le plein Ã©cran"
 
 #: ../src/main_window.c:282
-#, fuzzy
 msgid "_Set as Wallpaper"
 msgstr "_Utiliser en tant que fond d'Ã©cran"
 
@@ -156,56 +144,58 @@ msgid "_Zooming"
 msgstr "_Zoom"
 
 #: ../src/main_window.c:285
-#, fuzzy
 msgid "Zoom _In"
-msgstr "_Zoom"
+msgstr "Zoom _Avant"
 
 #: ../src/main_window.c:286
 msgid "Zoom _Out"
-msgstr ""
+msgstr "Zoom _Avant"
 
 #: ../src/main_window.c:287
 msgid "Zoom _Fit"
-msgstr ""
+msgstr "Zoom au _Mieux"
 
 #: ../src/main_window.c:288
 msgid "_Normal Size"
-msgstr ""
+msgstr "_Taille Normale"
 
 #. Rotation submenu
 #: ../src/main_window.c:290
-#, fuzzy
 msgid "_Rotation"
 msgstr "_Rotation"
 
 #: ../src/main_window.c:291
 msgid "Rotate _Right"
-msgstr "Tourner vers la _droite"
+msgstr "Tourner vers la _Droite"
 
 #: ../src/main_window.c:292
 msgid "Rotate _Left"
-msgstr "Tourner vers la _gauche"
+msgstr "Tourner vers la _Gauche"
 
 #. Go Menu
 #: ../src/main_window.c:294
 msgid "_Go"
-msgstr "A_ller"
+msgstr "A_ller Ã "
 
 #: ../src/main_window.c:295
+#, fuzzy
 msgid "_Forward"
-msgstr ""
+msgstr "_Suivante"
 
 #: ../src/main_window.c:296
+#, fuzzy
 msgid "_Back"
-msgstr ""
+msgstr "_PrÃ©cÃ©dente"
 
 #: ../src/main_window.c:297
+#, fuzzy
 msgid "_First"
-msgstr ""
+msgstr "Pre_miÃ¨re"
 
 #: ../src/main_window.c:298
+#, fuzzy
 msgid "_Last"
-msgstr ""
+msgstr "_DerniÃ¨re"
 
 #. Help Menu
 #: ../src/main_window.c:300
@@ -213,20 +203,23 @@ msgid "_Help"
 msgstr "A_ide"
 
 #: ../src/main_window.c:302
+#, fuz

[Xfce4-commits] Added German transaltion

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to c30195f5b7d372f207d039b07d348d795886d926 (commit)
   from 051f1a31c797c60ccedd1a36b6403aac9b950ed8 (commit)

commit c30195f5b7d372f207d039b07d348d795886d926
Author: Ali Abdallah 
Date:   Wed Oct 7 08:35:21 2009 +

Added German transaltion

 po/LINGUAS  |2 +-
 po/{da.po => de.po} |  350 ---
 2 files changed, 166 insertions(+), 186 deletions(-)

diff --git a/po/LINGUAS b/po/LINGUAS
index 97fa9f4..78da3e1 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # set of available languages (in alphabetic order)
-ast da es id ja ru sk tr uk
+ast da de es fr id ja ru sk tr uk
diff --git a/po/da.po b/po/de.po
similarity index 72%
copy from po/da.po
copy to po/de.po
index 57a9de5..35832c6 100644
--- a/po/da.po
+++ b/po/de.po
@@ -1,25 +1,26 @@
-# Danish translation of parole.
-# Copyright (C) 2009 parole
-# This file is distributed under the same license as the parole package.
-# Per Kongstad , 2009.
+# German translation of Parole.
+# Copyright (C) 2009 Parole's COPYRIGHT HOLDER
+# This file is distributed under the same license as the Parole package.
+# Mario BlÃ¤ttermann , 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: parole 0.1.90\n"
+"Project-Id-Version: parole master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-10-06 15:54+\n"
-"PO-Revision-Date: 2009-08-23 23:08+0100\n"
-"Last-Translator: Per Kongstad \n"
-"Language-Team: Danish \n"
+"PO-Revision-Date: 2009-10-06 22:56+0100\n"
+"Last-Translator: Mario BlÃ¤ttermann \n"
+"Language-Team: German \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Danish\n"
-"X-Poedit-Country: Denmark\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: GERMANY\n"
 
 #: ../data/interfaces/parole.ui.h:1
 msgid "16:9 (Widescreen)"
-msgstr "16:9 (Widescreen)"
+msgstr "16:9 (Breitbild)"
 
 #: ../data/interfaces/parole.ui.h:2
 msgid "20:9 (DVB)"
@@ -31,151 +32,147 @@ msgstr "4:3 (TV)"
 
 #: ../data/interfaces/parole.ui.h:4
 msgid "Aspect Ratio"
-msgstr "SkÃ¦rmforhold"
+msgstr "SeitenverhÃ¤ltnis"
 
 #: ../data/interfaces/parole.ui.h:5
 msgid "Auto"
-msgstr "Auto"
+msgstr "Automatisch"
 
 #: ../data/interfaces/parole.ui.h:6
 msgid "Chapter Menu"
-msgstr "Afsnitsmenu"
+msgstr "KapitelmenÃ¼"
 
 #: ../data/interfaces/parole.ui.h:7
 msgid "DVD Menu"
-msgstr "Dvd-menu"
+msgstr "DVD-MenÃ¼"
 
 #: ../data/interfaces/parole.ui.h:8
 msgid "Media player"
-msgstr "Medieafspiller"
+msgstr "Medien-Abspieler"
 
 #: ../data/interfaces/parole.ui.h:9
 msgid "Mute"
-msgstr "SlÃ¥ lyd fra"
+msgstr "Stumm"
 
 #: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
-msgstr "NÃ¦ste kapitel"
+msgstr "NÃ¤chstes Kapitel/Film"
 
 #: ../data/interfaces/parole.ui.h:11
 msgid "None"
-msgstr "Ingen"
+msgstr "Kein"
 
 #: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
 #: ../parole/parole-player.c:234 ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
-msgstr "Parole medieafspiller"
+msgstr "Parole Medien-Abspieler"
 
 #: ../data/interfaces/parole.ui.h:13
 msgid "Plugins"
-msgstr "Udvidelsesmoduler"
+msgstr "Plugins"
 
 #: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
-msgstr "Tidligere kapitel"
+msgstr "Vorheriges Kapitel/Film"
 
 #: ../data/interfaces/parole.ui.h:15
 msgid "Repeat"
-msgstr "Gentag"
+msgstr "Endlosschleife"
 
 #: ../data/interfaces/parole.ui.h:16
 msgid "Select Track"
-msgstr "VÃ¦lg spor"
+msgstr "Titel auswÃ¤hlen"
 
 #: ../data/interfaces/parole.ui.h:17
 msgid "Shuffle"
-msgstr "Blande"
+msgstr "Zufallsmodus"
 
 #: ../data/interfaces/parole.ui.h:18
 msgid "Sound"
-msgstr "Lyd"
+msgstr "Sound"
 
 #: ../data/interfaces/parole.ui.h:19
 msgid "Square"
-msgstr "Kvadratisk"
+msgstr "Quadratisch"
 
 #: ../data/interfaces/parole.ui.h:20
 msgid "Volume Down"
-msgstr "Lydstyrke ned"
+msgstr "Leiser"
 
 #: ../data/interfaces/parole.ui.h:21
 msgid "Volume Up"
-msgstr "Lydstyrke op"
+msgstr "Lauter"
 
 #: ../data/interfaces/parole.ui.h:22
 msgid "_Edit"
-msgstr "_RedigÃ©r"
+msgstr "_Bearbeiten"
 
 #: ../data/interfaces/parole.ui.h:23
 msgid "_Help"
-msgstr "_HjÃ¦lp"
+msgstr "_Hilfe"
 
 #: ../data/interfaces/parole.ui.h:24
 msgid "_Media"
-msgstr "_Medie"
+msgstr "_Medien"
 
 #: ../data/interfaces/parole.ui.h:25
-#, fuzzy
 msgid "_Open location"
-msgstr "Ãbn sted..."
+msgstr "_Ort Ã¶ffnen"
 
 #: ../data/interfaces/parole.ui.h:26
 msgid "_View"
-msgstr "_Vis"
+msgstr "_Ansicht"
 
 #: ../data/interfaces/plugins.ui.h:1
 msgid "Author:"
-msgstr "Forfatter:"
+msgstr "Autor:"
 
 #: ../data/interfaces/plugins.ui.h:2
 msgid "Description:"
-msgstr "Beskrivelse:"
+msgstr "Beschreibung:"

[Xfce4-commits] Fix hibernate-label alignment+use CLEANFILES for the interface file

2009-10-06 Thread Ali Abdallah

Updating branch refs/heads/master
 to c690d076b4606dcc40c2eee7a82c9f7ca400da59 (commit)
   from e277cb14c45c8743c011bf37dfc86d8237826350 (commit)

commit c690d076b4606dcc40c2eee7a82c9f7ca400da59
Author: Ali Abdallah 
Date:   Wed Oct 7 08:54:01 2009 +

Fix hibernate-label alignment+use CLEANFILES for the interface file

 data/interfaces/Makefile.am  |6 --
 data/interfaces/xfpm-settings.ui |1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index f7e309f..a098a3f 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -5,13 +5,15 @@ interfaces_h =\
$(interfaces:.ui=_ui.h)
 
 if MAINTAINER_MODE
+
 BUILT_SOURCES = $(interfaces_h)
+
 xfpm-settings_ui.h: xfpm-settings.ui
exo-csource --static --strip-comments --strip-content 
--name=xfpm_settings_ui $< > $@
 endif
 
-MAINTAINERCLEANFILES = \
-   $(interfaces_h)
+CLEANFILES =   \
+   $(BUILT_SOURCES)
 
 EXTRA_DIST =   \
$(interfaces)   \
diff --git a/data/interfaces/xfpm-settings.ui b/data/interfaces/xfpm-settings.ui
index ed7f9f4..50c6f7c 100644
--- a/data/interfaces/xfpm-settings.ui
+++ b/data/interfaces/xfpm-settings.ui
@@ -264,6 +264,7 @@
 
   
 True
+   0
 When hibernate button is pressed:
   
   
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

61 matches

Mail list logo