[Xfce4-commits] xfce4-power-manager:master Use __FreeBSD__ instead of HAVE_FREEBSD as it is not defined in config.h.
Updating branch refs/heads/master to 7714d57008384c30f64bee2b6e7cdb1e1b377be0 (commit) from 50f8c1aa194be51b2f12b8be2d12dcf9911ee2e1 (commit) commit 7714d57008384c30f64bee2b6e7cdb1e1b377be0 Author: Ali Abdallah al...@xfce.org Date: Fri Jan 7 15:23:35 2011 +0100 Use __FreeBSD__ instead of HAVE_FREEBSD as it is not defined in config.h. src/xfpm-polkit.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c index 0460cf1..a50c2db 100644 --- a/src/xfpm-polkit.c +++ b/src/xfpm-polkit.c @@ -32,7 +32,7 @@ #include sys/types.h -#ifndef HAVE_FREEBSD +#if defined(__FreeBSD__) #include sys/stat.h #else #include sys/param.h ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-power-manager:master Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-power-manager
Updating branch refs/heads/master to c8d29b6e2dde6091e0bebbd2761f98f323beba02 (commit) from 7714d57008384c30f64bee2b6e7cdb1e1b377be0 (commit) commit c8d29b6e2dde6091e0bebbd2761f98f323beba02 Merge: 7714d57 3316d8e Author: Ali Abdallah al...@xfce.org Date: Mon Feb 14 10:53:35 2011 +0100 Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-power-manager commit 3316d8e6c7dc7fc38b8c474f595fc9ba68f859ac Author: Xavier Devlamynck magicrhe...@ouranos.be Date: Sun Jan 30 10:39:42 2011 +0100 l10n: Updated French (fr) translation to 100% New status: 198 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit aed0d6d9f371dec88f5b8bc61752f9368672 Author: gianluca foddis gianluca.fod...@gmail.com Date: Sat Jan 15 14:37:20 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 198 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 108 + po/it.po | 317 ++ 2 files changed, 200 insertions(+), 225 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0c15dee..a719cce 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,16 +9,16 @@ msgid msgstr Project-Id-Version: xfce4-power-manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-10-18 04:02+\n +POT-Creation-Date: 2011-01-30 05:03+\n PO-Revision-Date: 2010-02-08 18:17+0100\n Last-Translator: Douart Patrick patric...@laposte.net\n Language-Team: French xfce-i...@xfce.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +X-Poedit-Country: FRANCE\n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Poedit-Language: French\n -X-Poedit-Country: FRANCE\n #: ../data/interfaces/xfpm-settings.ui.h:1 msgid bActions/b @@ -155,7 +155,7 @@ msgstr Appui sur le bouton de mise en veille : #: ../data/interfaces/xfpm-settings.ui.h:31 #: ../settings/xfpm-settings-main.c:121 ../src/xfpm-power.c:520 -#: ../src/xfpm-power.c:691 ../src/xfpm-main.c:415 +#: ../src/xfpm-power.c:691 ../src/xfpm-main.c:410 #: ../src/xfce4-power-manager.desktop.in.h:2 msgid Xfce Power Manager msgstr Gestionnaire d'alimentation @@ -197,9 +197,8 @@ msgstr Secondes #: ../settings/xfpm-settings.c:761 ../settings/xfpm-settings.c:948 #: ../settings/xfpm-settings.c:1410 -#, fuzzy msgid Hibernate and suspend operations not supported -msgstr Opérations de mise en veille prolongée et de mise en veille non autorisées +msgstr Opérations de mise en veille prolongée et de mise en veille non supportées #: ../settings/xfpm-settings.c:766 ../settings/xfpm-settings.c:953 #: ../settings/xfpm-settings.c:1415 @@ -245,18 +244,16 @@ msgid Disable Display Power Management Signaling (DPMS), e.g don't attempt to s msgstr Désactiver le DPMS, e.g. pour ne pas tenter l'extinction de l'écran ou sa mise en veille #: ../settings/xfpm-settings.c:1319 -#, fuzzy msgid Suspend operation not supported -msgstr Opération de mise en veille non autorisée +msgstr Opération de mise en veille non supportée #: ../settings/xfpm-settings.c:1325 msgid Suspend operation not permitted msgstr Opération de mise en veille non autorisée #: ../settings/xfpm-settings.c:1331 -#, fuzzy msgid Hibernate operation not supported -msgstr Opération de mise en veille prolongée non autorisée +msgstr Opération de mise en veille prolongée non supportée #: ../settings/xfpm-settings.c:1336 msgid Hibernate operation not permitted @@ -294,7 +291,7 @@ msgstr Socket du gestionnaire de paramètres msgid SOCKET ID msgstr ID SOCKET -#: ../settings/xfpm-settings-main.c:89 ../src/xfpm-main.c:291 +#: ../settings/xfpm-settings-main.c:89 ../src/xfpm-main.c:286 #: ../src/xfpm-power-info.c:948 #, c-format msgid Type '%s --help' for usage. @@ -308,7 +305,7 @@ msgstr Impossible de charger la configuration, les paramètres par défauts ser msgid Unable to connect to Xfce Power Manager msgstr Échec au chargement du gestionnaire d'alimentation Xfce -#: ../settings/xfpm-settings-main.c:190 ../src/xfpm-main.c:331 +#: ../settings/xfpm-settings-main.c:190 ../src/xfpm-main.c:326 #, c-format msgid Xfce power manager is not running msgstr Le gestionnaire d'alimentation Xfce n'est pas lancé @@ -355,9 +352,8 @@ msgid Quit msgstr Quitter #: ../src/xfpm-power.c:422 -#, fuzzy msgid All running instances of the power manager will exit -msgstr Gestionnaire d'alimentation Xfce +msgstr Toutes les instances en fonctionnement du gestionnaire d'énergie vont quitter #: ../src/xfpm-power.c:424 msgid Quit Xfce power manager? @@ -365,7 +361,6 @@ msgstr Quitter le gestionnaire d'alimentation Xfce #. Power information #: ../src/xfpm-power.c:494 ../src/xfpm-power-info.c:818 -#, fuzzy msgid Power Information msgstr Information de la batterie @@ -456,9 +451,8 @@ msgid Lithium polymer msgstr Lithium
[Xfce4-commits] xfce4-power-manager:master Remove Xfce prefix from notifications, dialogs, ... (bug#7268)
Updating branch refs/heads/master
to 747b3956d8f83a1c144a6f8de60f701bc33a274e (commit)
from c8d29b6e2dde6091e0bebbd2761f98f323beba02 (commit)
commit 747b3956d8f83a1c144a6f8de60f701bc33a274e
Author: Ali Abdallah al...@xfce.org
Date: Mon Feb 14 11:01:55 2011 +0100
Remove Xfce prefix from notifications, dialogs, ... (bug#7268)
settings/xfce4-power-manager-settings.desktop.in |4 ++--
src/xfce4-power-manager.desktop.in |2 +-
src/xfpm-battery.c |2 +-
src/xfpm-power.c | 14 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/settings/xfce4-power-manager-settings.desktop.in
b/settings/xfce4-power-manager-settings.desktop.in
index 55fc303..7cbd09f 100644
--- a/settings/xfce4-power-manager-settings.desktop.in
+++ b/settings/xfce4-power-manager-settings.desktop.in
@@ -1,8 +1,8 @@
[Desktop Entry]
Version=1.0
-_Name=Xfce 4 Power Manager
+_Name=Power Manager
_GenericName=Power Manager
-_Comment=Settings for the Xfce 4 Power Manager
+_Comment=Settings for the Xfce Power Manager
Exec=xfce4-power-manager-settings
Icon=xfpm-ac-adapter
Terminal=false
diff --git a/src/xfce4-power-manager.desktop.in
b/src/xfce4-power-manager.desktop.in
index 6df34ad..34074eb 100644
--- a/src/xfce4-power-manager.desktop.in
+++ b/src/xfce4-power-manager.desktop.in
@@ -1,5 +1,5 @@
[Desktop Entry]
-_Name=Xfce Power Manager
+_Name=Power Manager
_Comment=Power management for the Xfce desktop
Icon=xfpm-ac-adapter
Exec=xfce4-power-manager
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index 81f4a4c..73208fb 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -226,7 +226,7 @@ xfpm_battery_notify_idle (gpointer data)
return FALSE;
xfpm_notify_show_notification (battery-priv-notify,
- _(Xfce power manager),
+ _(Power Manager),
message,
gtk_status_icon_get_icon_name
(GTK_STATUS_ICON (battery)),
8000,
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index ff12d69..6c5d80f 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -297,7 +297,7 @@ xfpm_power_report_error (XfpmPower *power, const gchar
*error, const gchar *icon
}
xfpm_notify_show_notification (power-priv-notify,
- _(Xfce power manager),
+ _(Power Manager),
error,
icon_name,
1,
@@ -421,7 +421,7 @@ xfpm_power_tray_exit_activated_cb (gpointer data)
_(Quit),
_(All running instances of the power manager
will exit),
%s,
- _(Quit Xfce power manager?));
+ _(Quit the power manager?));
if ( ret )
{
xfpm_quit ();
@@ -517,7 +517,7 @@ xfpm_power_show_tray_menu (XfpmPower *power,
mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, NULL);
gtk_widget_set_sensitive (mi, TRUE);
gtk_widget_show (mi);
-g_signal_connect (mi, activate, G_CALLBACK (xfpm_about), _(Xfce Power
Manager));
+g_signal_connect (mi, activate, G_CALLBACK (xfpm_about), _(Power
Manager));
gtk_menu_shell_append (GTK_MENU_SHELL(menu), mi);
@@ -652,7 +652,7 @@ xfpm_power_show_critical_action_notification (XfpmPower
*power, XfpmBattery *bat
n =
xfpm_notify_new_notification (power-priv-notify,
- _(Xfce power manager),
+ _(Power Manager),
message,
gtk_status_icon_get_icon_name
(GTK_STATUS_ICON (battery)),
2,
@@ -688,7 +688,7 @@ xfpm_power_show_critical_action_gtk (XfpmPower *power)
message = _(System is running on low power. \
Save your work to avoid losing data);
-dialog = gtk_dialog_new_with_buttons (_(Xfce Power Manager), NULL,
GTK_DIALOG_MODAL,
+dialog = gtk_dialog_new_with_buttons (_(Power Manager), NULL,
GTK_DIALOG_MODAL,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -840,7 +840,7 @@ xfpm_power_battery_charge_changed_cb (XfpmBattery *battery,
XfpmPower *power)
{
if ( notify )
xfpm_notify_show_notification (power-priv-notify,
- _(Xfce power manager),
+ _(Power Manager),
_(System is running on low
power),
[Xfce4-commits] postler:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to f5c394902a44b6b950c53732d796b436f6ccd17c (commit) from d312242be8905d71528a636e9b07801d3e7d7843 (commit) commit f5c394902a44b6b950c53732d796b436f6ccd17c Author: Sergio Marques smarque...@gmail.com Date: Mon Feb 14 11:36:55 2011 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 236 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 249 -- 1 files changed, 129 insertions(+), 120 deletions(-) diff --git a/po/pt.po b/po/pt.po index dfc624f..00a7dac 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: postler\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-02-11 11:17+\n +POT-Creation-Date: 2011-02-14 05:17+\n PO-Revision-Date: 2011-01-25 00:39-\n Last-Translator: Sérgio Marques smarque...@gmail.com\n Language-Team: \n @@ -30,8 +30,8 @@ msgstr Leitor de mensagens msgid Postler msgstr Postler -#: ../postler/postler-accounts.vala:70 ../postler/postler-accounts.vala:196 -#: ../postler/postler-service.vala:181 +#: ../postler/postler-accounts.vala:70 ../postler/postler-accounts.vala:197 +#: ../postler/postler-service.vala:194 msgid Inbox msgstr Caixa de entrada @@ -60,60 +60,60 @@ msgstr Arquivo msgid Junk msgstr Lixo eletrónico -#: ../postler/postler-accounts.vala:167 +#: ../postler/postler-accounts.vala:168 msgid Failed to find a root certificate file. msgstr Ocorreu um erro ao procurar o certificado. -#: ../postler/postler-accounts.vala:201 +#: ../postler/postler-accounts.vala:202 msgid Config folder couldn't be created. msgstr A pasta de configuração não foi criada. -#: ../postler/postler-accounts.vala:365 +#: ../postler/postler-accounts.vala:366 #, c-format msgid Invalid type \%s\ msgstr O tipo \%s\ é inválido #. i18n: File was found but can't contains invalid values -#: ../postler/postler-accounts.vala:369 +#: ../postler/postler-accounts.vala:370 #, c-format msgid Failed to parse account in \%s\: %s msgstr Falha ao processar a conta em \%s\: %s -#: ../postler/postler-accounts.vala:406 +#: ../postler/postler-accounts.vala:407 msgid Cache folder couldn't be created. msgstr A pasta de \cache\ não foi criada. -#: ../postler/postler-accounts.vala:416 +#: ../postler/postler-accounts.vala:417 msgid This type can't receive mail. msgstr Este tipo não consegue receber mensagens. -#: ../postler/postler-accounts.vala:426 +#: ../postler/postler-accounts.vala:427 msgid No SSL certificates available msgstr Nenhum certificado SSL disponível -#: ../postler/postler-accounts.vala:431 +#: ../postler/postler-accounts.vala:432 msgid Invalid address msgstr Endereço inválido -#: ../postler/postler-accounts.vala:441 ../postler/postler-accounts.vala:443 +#: ../postler/postler-accounts.vala:442 ../postler/postler-accounts.vala:444 msgid Hostname is missing msgstr Falta o nome do servidor -#: ../postler/postler-accounts.vala:445 +#: ../postler/postler-accounts.vala:446 msgid Username is missing msgstr Falta o nome de utilizador -#: ../postler/postler-accounts.vala:447 +#: ../postler/postler-accounts.vala:448 msgid Password is missing msgstr Falta a senha -#: ../postler/postler-accounts.vala:541 ../postler/postler-accounts.vala:559 -#: ../postler/postler-accounts.vala:579 +#: ../postler/postler-accounts.vala:542 ../postler/postler-accounts.vala:560 +#: ../postler/postler-accounts.vala:580 #, c-format msgid Account \%s\ can't receive mail. msgstr A conta \%s\ não recebe mensagens. -#: ../postler/postler-accounts.vala:562 ../postler/postler-accounts.vala:582 +#: ../postler/postler-accounts.vala:563 ../postler/postler-accounts.vala:583 msgid Mail folder couldn't be created. msgstr A pasta de correio não foi criada. @@ -238,249 +238,258 @@ msgstr _Enviar msgid _Receive Mail msgstr _Receber correio -#: ../postler/postler-app.vala:164 +#: ../postler/postler-app.vala:168 msgid Failed to launch external application. msgstr Falha ao iniciar a aplicação externa. -#: ../postler/postler-app.vala:183 +#: ../postler/postler-app.vala:187 msgid Failed to execute external command. msgstr Falha ao executar o comando externo. -#: ../postler/postler-app.vala:208 +#: ../postler/postler-app.vala:212 #, c-format msgid Failed to open module %s. msgstr Falha ao abrir o módulo %s. -#: ../postler/postler-app.vala:222 +#: ../postler/postler-app.vala:226 msgid Failed to initialize. msgstr Falha ao iniciar. -#: ../postler/postler-app.vala:234 +#: ../postler/postler-app.vala:238 msgid Open msgstr Abrir -#: ../postler/postler-app.vala:246 +#: ../postler/postler-app.vala:250 #, c-format msgid Failed to send notification: %s msgstr Falha ao enviar a notificação: %s -#: ../postler/postler-bureau.vala:134 ../postler/postler-bureau.vala:143 +#: ../postler/postler-bureau.vala:127
[Xfce4-commits] thunar:master Make sure to reset the thumbnail timeout/idle handler ID.
Updating branch refs/heads/master to 57cee92472be55feb9cb3549725190dfc035c314 (commit) from d2dd3f68af0afaf4035a3ffbc7340d257703a003 (commit) commit 57cee92472be55feb9cb3549725190dfc035c314 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Feb 7 16:50:15 2011 +0100 Make sure to reset the thumbnail timeout/idle handler ID. thunar/thunar-standard-view.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c index 6686052..0d3257f 100644 --- a/thunar/thunar-standard-view.c +++ b/thunar/thunar-standard-view.c @@ -3438,6 +3438,9 @@ thunar_standard_view_request_thumbnails (ThunarStandardView *standard_view) gtk_tree_path_free (end_path); } + /* reset the timeout or idle handler ID */ + standard_view-priv-thumbnail_source_id = 0; + return FALSE; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add thunar_thumbnail_cache_copy_file().
Updating branch refs/heads/master
to bdfbba792be55b094647fe06c739c5ac151b134f (commit)
from 133d32f0fcc2c37f5c581d647ae5fd02014244f3 (commit)
commit bdfbba792be55b094647fe06c739c5ac151b134f
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Feb 7 21:49:22 2011 +0100
Add thunar_thumbnail_cache_copy_file().
This one also uses a queue and a timeout of 250ms to group Copy() D-Bus
method calls.
thunar/thunar-thumbnail-cache.c | 149 +++
thunar/thunar-thumbnail-cache.h |3 +
2 files changed, 152 insertions(+), 0 deletions(-)
diff --git a/thunar/thunar-thumbnail-cache.c b/thunar/thunar-thumbnail-cache.c
index 22d9eaf..fe62dc3 100644
--- a/thunar/thunar-thumbnail-cache.c
+++ b/thunar/thunar-thumbnail-cache.c
@@ -58,6 +58,10 @@ struct _ThunarThumbnailCache
GList *move_target_queue;
guint move_queue_idle_id;
+ GList *copy_source_queue;
+ GList *copy_target_queue;
+ guint copy_queue_idle_id;
+
GList *delete_queue;
guint delete_queue_idle_id;
@@ -130,6 +134,14 @@ thunar_thumbnail_cache_finalize (GObject *object)
g_list_free (cache-move_source_queue);
g_list_free (cache-move_target_queue);
+ /* drop the copy queue idle and all queued files */
+ if (cache-copy_queue_idle_id 0)
+g_source_remove (cache-copy_queue_idle_id);
+ g_list_foreach (cache-copy_source_queue, (GFunc) g_object_unref, NULL);
+ g_list_foreach (cache-copy_target_queue, (GFunc) g_object_unref, NULL);
+ g_list_free (cache-copy_source_queue);
+ g_list_free (cache-copy_target_queue);
+
/* drop the delete queue idle and all queued files */
if (cache-delete_queue_idle_id 0)
g_source_remove (cache-delete_queue_idle_id);
@@ -185,6 +197,34 @@ thunar_thumbnail_cache_move_async (ThunarThumbnailCache
*cache,
static void
+thunar_thumbnail_cache_copy_async_reply (DBusGProxy *proxy,
+ GError *error,
+ gpointeruser_data)
+{
+ _thunar_return_if_fail (DBUS_IS_G_PROXY (proxy));
+}
+
+
+
+static void
+thunar_thumbnail_cache_copy_async (ThunarThumbnailCache *cache,
+ const gchar **source_uris,
+ const gchar **target_uris)
+{
+ _thunar_return_if_fail (THUNAR_IS_THUMBNAIL_CACHE (cache));
+ _thunar_return_if_fail (source_uris != NULL);
+ _thunar_return_if_fail (target_uris != NULL);
+
+ /* request a thumbnail cache update asynchronously */
+ thunar_thumbnail_cache_proxy_copy_async (cache-cache_proxy,
+ source_uris, target_uris,
+
thunar_thumbnail_cache_copy_async_reply,
+ NULL);
+}
+
+
+
+static void
thunar_thumbnail_cache_delete_async_reply (DBusGProxy *proxy,
GError *error,
gpointeruser_data)
@@ -277,6 +317,73 @@ thunar_thumbnail_cache_process_move_queue
(ThunarThumbnailCache *cache)
static gboolean
+thunar_thumbnail_cache_process_copy_queue (ThunarThumbnailCache *cache)
+{
+ GList *sp;
+ GList *tp;
+ gchar **source_uris;
+ gchar **target_uris;
+ guint n_uris;
+ guint n;
+
+ _thunar_return_val_if_fail (THUNAR_IS_THUMBNAIL_CACHE (cache), FALSE);
+
+ /* acquire a cache lock */
+ g_mutex_lock (cache-lock);
+
+ /* compute how many URIs there are */
+ n_uris = g_list_length (cache-copy_source_queue);
+
+ /* allocate a string array for the URIs */
+ source_uris = g_new0 (gchar *, n_uris + 1);
+ target_uris = g_new0 (gchar *, n_uris + 1);
+
+ /* fill URI array with file URIs from the copy queue */
+ for (n = 0,
+ sp = g_list_last (cache-copy_source_queue),
+ tp = g_list_last (cache-copy_target_queue);
+ sp != NULL tp != NULL;
+ sp = sp-prev, tp = tp-prev, ++n)
+{
+ source_uris[n] = g_file_get_uri (sp-data);
+ target_uris[n] = g_file_get_uri (tp-data);
+
+ /* release the file objects */
+ g_object_unref (sp-data);
+ g_object_unref (tp-data);
+}
+
+ /* NULL-terminate the URI arrays */
+ source_uris[n] = NULL;
+ target_uris[n] = NULL;
+
+ /* asynchronously copy the thumbnails */
+ thunar_thumbnail_cache_copy_async (cache,
+ (const gchar **)source_uris,
+ (const gchar **)target_uris);
+
+ /* free the URI arrays */
+ g_free (source_uris);
+ g_free (target_uris);
+
+ /* release the copy queue lists */
+ g_list_free (cache-copy_source_queue);
+ g_list_free (cache-copy_target_queue);
+ cache-copy_source_queue = NULL;
+ cache-copy_target_queue = NULL;
+
+ /* reset the copy queue idle ID */
+ cache-copy_queue_idle_id = 0;
+
+ /* release the cache lock */
+ g_mutex_unlock (cache-lock);
+
+ return FALSE;
+}
+
+
+
+static gboolean
[Xfce4-commits] thunar:master Use a timeout/idle to request thumbnails in ThunarStandardView.
Updating branch refs/heads/master
to 834e6455488ccfb505127ba175e5366e1c652691 (commit)
from f19df728cf8798152b175dd61467ea1633663660 (commit)
commit 834e6455488ccfb505127ba175e5366e1c652691
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Feb 7 15:12:29 2011 +0100
Use a timeout/idle to request thumbnails in ThunarStandardView.
This is the second part of redesigning how thumbnails are requested in
Thunar. Each ThunarStandardView now has a ThunerThumbnailer object.
On scroll and resize events and whenever a new directory has finished
loading, ThunarStandardView now schedules a timeout or idle handler
(depending on the situation) to request thumbnails for all visible items
of the view.
This timeout/idle handler is rescheduled whenever the user starts
or continues scrolling or resizing. This avoids sending requests while
the user is scrolling and its important to not have D-Bus interfere with
the Thunar main loop. We now have a much more responsive thumbnailing
and scrolling experience!
Requests are also dropped by each view when a directory is closed/left.
This means that we no longer generate thumbnails the user is not
interested in any more.
This commit also uses the proper D-Bus method for cancelling thumbnail
requests (it's called Dequeue, not Unqueue).
The properties dialog is updated to match changes in the
ThunarThumbnailer API.
thunar/thunar-properties-dialog.c | 60
thunar/thunar-standard-view.c | 258 ++--
thunar/thunar-thumbnailer-dbus.xml |2 +-
thunar/thunar-thumbnailer.c| 191 ---
thunar/thunar-thumbnailer.h| 14 +-
5 files changed, 307 insertions(+), 218 deletions(-)
diff --git a/thunar/thunar-properties-dialog.c
b/thunar/thunar-properties-dialog.c
index 2633950..f52c20b 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -108,34 +108,34 @@ struct _ThunarPropertiesDialogClass
struct _ThunarPropertiesDialog
{
- ThunarAbstractDialog __parent__;
-
- ThunarxProviderFactory *provider_factory;
- GList *provider_pages;
-
- ThunarPreferences *preferences;
-
- ThunarFile *file;
-
- ThunarThumbnailer *thumbnailer;
- ThunarThumbnailerRequest thumbnail_request;
-
- GtkWidget *notebook;
- GtkWidget *icon_button;
- GtkWidget *icon_image;
- GtkWidget *name_entry;
- GtkWidget *kind_ebox;
- GtkWidget *kind_label;
- GtkWidget *openwith_chooser;
- GtkWidget *link_label;
- GtkWidget *origin_label;
- GtkWidget *deleted_label;
- GtkWidget *modified_label;
- GtkWidget *accessed_label;
- GtkWidget *freespace_label;
- GtkWidget *volume_image;
- GtkWidget *volume_label;
- GtkWidget *permissions_chooser;
+ ThunarAbstractDialog__parent__;
+
+ ThunarxProviderFactory *provider_factory;
+ GList *provider_pages;
+
+ ThunarPreferences *preferences;
+
+ ThunarFile *file;
+
+ ThunarThumbnailer *thumbnailer;
+ guint thumbnail_request;
+
+ GtkWidget *notebook;
+ GtkWidget *icon_button;
+ GtkWidget *icon_image;
+ GtkWidget *name_entry;
+ GtkWidget *kind_ebox;
+ GtkWidget *kind_label;
+ GtkWidget *openwith_chooser;
+ GtkWidget *link_label;
+ GtkWidget *origin_label;
+ GtkWidget *deleted_label;
+ GtkWidget *modified_label;
+ GtkWidget *accessed_label;
+ GtkWidget *freespace_label;
+ GtkWidget *volume_image;
+ GtkWidget *volume_label;
+ GtkWidget *permissions_chooser;
};
@@ -526,7 +526,7 @@ thunar_properties_dialog_finalize (GObject *object)
/* cancel any pending thumbnailer requests */
if (dialog-thumbnail_request 0)
{
- thunar_thumbnailer_unqueue (dialog-thumbnailer,
dialog-thumbnail_request);
+ thunar_thumbnailer_dequeue (dialog-thumbnailer,
dialog-thumbnail_request);
dialog-thumbnail_request = 0;
}
@@ -835,7 +835,7 @@ thunar_properties_dialog_update (ThunarPropertiesDialog
*dialog)
/* cancel any pending thumbnail requests */
if (dialog-thumbnail_request 0)
{
- thunar_thumbnailer_unqueue (dialog-thumbnailer,
dialog-thumbnail_request);
+ thunar_thumbnailer_dequeue (dialog-thumbnailer,
dialog-thumbnail_request);
dialog-thumbnail_request = 0;
}
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index f671f05..6686052 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
[Xfce4-commits] thunar:master Add thunar_thumbnail_cache_delete_file(). Use queues for processing.
Updating branch refs/heads/master
to 133d32f0fcc2c37f5c581d647ae5fd02014244f3 (commit)
from 57cee92472be55feb9cb3549725190dfc035c314 (commit)
commit 133d32f0fcc2c37f5c581d647ae5fd02014244f3
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Feb 7 21:21:58 2011 +0100
Add thunar_thumbnail_cache_delete_file(). Use queues for processing.
We again use something like the wait queue in the old ThunarThumbnailer
here for grouping Move() and Delete() calls. The same will be done for
Copy(). It performs really well, moving 200 images from one folder to
another only generates a single Move() request with all images. At least
on my fast machine.
The actual calls to thunar_thumbnail_cache_move_file() and
thunar_thumbnail_cache_delete_file() in the transfer and I/O jobs still
have to be added.
thunar/thunar-thumbnail-cache.c | 236 ---
thunar/thunar-thumbnail-cache.h | 12 +-
2 files changed, 226 insertions(+), 22 deletions(-)
diff --git a/thunar/thunar-thumbnail-cache.c b/thunar/thunar-thumbnail-cache.c
index c71c672..22d9eaf 100644
--- a/thunar/thunar-thumbnail-cache.c
+++ b/thunar/thunar-thumbnail-cache.c
@@ -53,6 +53,13 @@ struct _ThunarThumbnailCache
#ifdef HAVE_DBUS
DBusGProxy *cache_proxy;
+
+ GList *move_source_queue;
+ GList *move_target_queue;
+ guint move_queue_idle_id;
+
+ GList *delete_queue;
+ guint delete_queue_idle_id;
GMutex *lock;
#endif
@@ -115,6 +122,20 @@ thunar_thumbnail_cache_finalize (GObject *object)
/* acquire a cache lock */
g_mutex_lock (cache-lock);
+ /* drop the move queue idle and all queued files */
+ if (cache-move_queue_idle_id 0)
+g_source_remove (cache-move_queue_idle_id);
+ g_list_foreach (cache-move_source_queue, (GFunc) g_object_unref, NULL);
+ g_list_foreach (cache-move_target_queue, (GFunc) g_object_unref, NULL);
+ g_list_free (cache-move_source_queue);
+ g_list_free (cache-move_target_queue);
+
+ /* drop the delete queue idle and all queued files */
+ if (cache-delete_queue_idle_id 0)
+g_source_remove (cache-delete_queue_idle_id);
+ g_list_foreach (cache-delete_queue, (GFunc) g_object_unref, NULL);
+ g_list_free (cache-delete_queue);
+
/* check if we have a valid cache proxy */
if (cache-cache_proxy != NULL)
{
@@ -160,6 +181,150 @@ thunar_thumbnail_cache_move_async (ThunarThumbnailCache
*cache,
thunar_thumbnail_cache_move_async_reply,
NULL);
}
+
+
+
+static void
+thunar_thumbnail_cache_delete_async_reply (DBusGProxy *proxy,
+ GError *error,
+ gpointeruser_data)
+{
+ _thunar_return_if_fail (DBUS_IS_G_PROXY (proxy));
+}
+
+
+
+static void
+thunar_thumbnail_cache_delete_async (ThunarThumbnailCache *cache,
+ const gchar **uris)
+{
+ _thunar_return_if_fail (THUNAR_IS_THUMBNAIL_CACHE (cache));
+ _thunar_return_if_fail (uris != NULL);
+
+ /* request a thumbnail cache update asynchronously */
+ thunar_thumbnail_cache_proxy_delete_async (cache-cache_proxy, uris,
+
thunar_thumbnail_cache_delete_async_reply,
+ NULL);
+}
+
+
+
+static gboolean
+thunar_thumbnail_cache_process_move_queue (ThunarThumbnailCache *cache)
+{
+ GList *sp;
+ GList *tp;
+ gchar **source_uris;
+ gchar **target_uris;
+ guint n_uris;
+ guint n;
+
+ _thunar_return_val_if_fail (THUNAR_IS_THUMBNAIL_CACHE (cache), FALSE);
+
+ /* acquire a cache lock */
+ g_mutex_lock (cache-lock);
+
+ /* compute how many URIs there are */
+ n_uris = g_list_length (cache-move_source_queue);
+
+ /* allocate a string array for the URIs */
+ source_uris = g_new0 (gchar *, n_uris + 1);
+ target_uris = g_new0 (gchar *, n_uris + 1);
+
+ /* fill URI array with file URIs from the move queue */
+ for (n = 0,
+ sp = g_list_last (cache-move_source_queue),
+ tp = g_list_last (cache-move_target_queue);
+ sp != NULL tp != NULL;
+ sp = sp-prev, tp = tp-prev, ++n)
+{
+ source_uris[n] = g_file_get_uri (sp-data);
+ target_uris[n] = g_file_get_uri (tp-data);
+
+ /* release the file objects */
+ g_object_unref (sp-data);
+ g_object_unref (tp-data);
+}
+
+ /* NULL-terminate the URI arrays */
+ source_uris[n] = NULL;
+ target_uris[n] = NULL;
+
+ /* asynchronously move the thumbnails */
+ thunar_thumbnail_cache_move_async (cache,
+ (const gchar **)source_uris,
+ (const gchar **)target_uris);
+
+ /* free the URI arrays */
+ g_free (source_uris);
+ g_free (target_uris);
+
+ /* release the move queue lists */
+ g_list_free (cache-move_source_queue);
+ g_list_free (cache-move_target_queue);
+
[Xfce4-commits] thunar:master Make the thumbnailing in ThunarStandardView a bit more responsive.
Updating branch refs/heads/master to 216f3e9921557ddf2c763ac12d95ec085836cf14 (commit) from d52a31fda15823809f23c42724ae43c39ecd20df (commit) commit 216f3e9921557ddf2c763ac12d95ec085836cf14 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Feb 7 22:24:55 2011 +0100 Make the thumbnailing in ThunarStandardView a bit more responsive. Use a timeout of 175ms instead of 250ms. thunar/thunar-standard-view.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c index 0d3257f..2478d7e 100644 --- a/thunar/thunar-standard-view.c +++ b/thunar/thunar-standard-view.c @@ -3341,7 +3341,7 @@ thunar_standard_view_schedule_thumbnail_timeout (ThunarStandardView *standard_vi /* schedule the timeout handler */ standard_view-priv-thumbnail_source_id = -g_timeout_add (250, (GSourceFunc) thunar_standard_view_request_thumbnails, +g_timeout_add (175, (GSourceFunc) thunar_standard_view_request_thumbnails, standard_view); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix build without D-Bus.
Updating branch refs/heads/master
to 5a20e93a0d2734e8cb200d29dcb0ca31560805d0 (commit)
from 216f3e9921557ddf2c763ac12d95ec085836cf14 (commit)
commit 5a20e93a0d2734e8cb200d29dcb0ca31560805d0
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Feb 8 11:40:07 2011 +0100
Fix build without D-Bus.
thunar/thunar-thumbnail-cache.c |2 +-
thunar/thunar-thumbnailer.c |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/thunar/thunar-thumbnail-cache.c b/thunar/thunar-thumbnail-cache.c
index 4725498..0fdf941 100644
--- a/thunar/thunar-thumbnail-cache.c
+++ b/thunar/thunar-thumbnail-cache.c
@@ -120,9 +120,9 @@ thunar_thumbnail_cache_init (ThunarThumbnailCache *cache)
static void
thunar_thumbnail_cache_finalize (GObject *object)
{
+#ifdef HAVE_DBUS
ThunarThumbnailCache *cache = THUNAR_THUMBNAIL_CACHE (object);
-#ifdef HAVE_DBUS
/* acquire a cache lock */
g_mutex_lock (cache-lock);
diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c
index 296f256..32d6218 100644
--- a/thunar/thunar-thumbnailer.c
+++ b/thunar/thunar-thumbnailer.c
@@ -80,7 +80,7 @@
-#if HAVE_DBUS
+#ifdef HAVE_DBUS
typedef enum
{
THUNAR_THUMBNAILER_IDLE_ERROR,
@@ -777,9 +777,9 @@ thunar_thumbnailer_queue_files (ThunarThumbnailer
*thumbnailer,
GList *files,
guint *request)
{
- const gchar **mime_hints;
gboolean success = FALSE;
#ifdef HAVE_DBUS
+ const gchar **mime_hints;
gchar **uris;
GList*lp;
GList*supported_files = NULL;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Improve the thumbnail cache support in transfer jobs a tiny bit.
Updating branch refs/heads/master
to d52a31fda15823809f23c42724ae43c39ecd20df (commit)
from 9317f1b660ac0e3753c5a6cc6341a1b59d609381 (commit)
commit d52a31fda15823809f23c42724ae43c39ecd20df
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Feb 7 22:22:40 2011 +0100
Improve the thumbnail cache support in transfer jobs a tiny bit.
thunar/thunar-transfer-job.c | 35 ---
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/thunar/thunar-transfer-job.c b/thunar/thunar-transfer-job.c
index 801f98e..f77839f 100644
--- a/thunar/thunar-transfer-job.c
+++ b/thunar/thunar-transfer-job.c
@@ -502,6 +502,11 @@ thunar_transfer_job_copy_node (ThunarTransferJob *job,
* wrt restoring files from the trash. Other transfer_nodes will be called
with target_parent_file.
*/
+ /* take a reference on the thumbnail cache */
+ application = thunar_application_get ();
+ thumbnail_cache = thunar_application_get_thumbnail_cache (application);
+ g_object_unref (application);
+
for (; err == NULL node != NULL; node = node-next)
{
/* guess the target file for this node (unless already provided) */
@@ -541,12 +546,9 @@ retry_copy:
if (G_LIKELY (node-source_file != real_target_file))
{
/* notify the thumbnail cache of the copy operation */
- application = thunar_application_get ();
- thumbnail_cache = thunar_application_get_thumbnail_cache
(application);
- thunar_thumbnail_cache_copy_file (thumbnail_cache,
node-source_file,
+ thunar_thumbnail_cache_copy_file (thumbnail_cache,
+node-source_file,
real_target_file);
- g_object_unref (thumbnail_cache);
- g_object_unref (application);
/* check if we have children to copy */
if (node-children != NULL)
@@ -585,13 +587,8 @@ retry_remove:
err))
{
/* notify the thumbnail cache of the delete operation */
- application = thunar_application_get ();
- thumbnail_cache =
-thunar_application_get_thumbnail_cache (application);
thunar_thumbnail_cache_delete_file (thumbnail_cache,
node-source_file);
- g_object_unref (thumbnail_cache);
- g_object_unref (application);
}
else
{
@@ -636,6 +633,9 @@ retry_remove:
g_object_unref (info);
}
+ /* release the thumbnail cache */
+ g_object_unref (thumbnail_cache);
+
/* propagate error if we failed or the job was cancelled */
if (G_UNLIKELY (err != NULL))
g_propagate_error (error, err);
@@ -671,6 +671,11 @@ thunar_transfer_job_execute (ExoJob *job,
exo_job_info_message (job, _(Collecting files...));
+ /* take a reference on the thumbnail cache */
+ application = thunar_application_get ();
+ thumbnail_cache = thunar_application_get_thumbnail_cache (application);
+ g_object_unref (application);
+
for (sp = transfer_job-source_node_list, tp =
transfer_job-target_file_list;
sp != NULL tp != NULL err == NULL;
sp = snext, tp = tnext)
@@ -777,12 +782,9 @@ thunar_transfer_job_execute (ExoJob *job,
NULL, NULL, err))
{
/* notify the thumbnail cache of the move operation */
- application = thunar_application_get ();
- thumbnail_cache = thunar_application_get_thumbnail_cache
(application);
thunar_thumbnail_cache_move_file (thumbnail_cache,
-node-source_file, tp-data);
- g_object_unref (thumbnail_cache);
- g_object_unref (application);
+node-source_file,
+tp-data);
/* add the target file to the new files list */
new_files_list = thunar_g_file_list_prepend (new_files_list,
tp-data);
@@ -821,6 +823,9 @@ thunar_transfer_job_execute (ExoJob *job,
g_object_unref (info);
}
+ /* release the thumbnail cache */
+ g_object_unref (thumbnail_cache);
+
/* continue if there were no errors yet */
if (G_LIKELY (err == NULL))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Call thunar_thumbnail_cache_delete_file() in the unlink job.
Updating branch refs/heads/master
to 4f6e985763adc4c6dfed5153aaa5ec973f498f82 (commit)
from bdfbba792be55b094647fe06c739c5ac151b134f (commit)
commit 4f6e985763adc4c6dfed5153aaa5ec973f498f82
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Feb 7 21:51:17 2011 +0100
Call thunar_thumbnail_cache_delete_file() in the unlink job.
This helps removing thumbnails from the on-disk cache that are no longer
needed because the original file no longer exists. It does a pretty good
job at that but there's more work to do to integrate Copy(), Move() and
Delete() in all the jobs.
thunar/thunar-io-jobs.c | 28
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/thunar/thunar-io-jobs.c b/thunar/thunar-io-jobs.c
index 898118a..7eb46db 100644
--- a/thunar/thunar-io-jobs.c
+++ b/thunar/thunar-io-jobs.c
@@ -24,6 +24,7 @@
#include gio/gio.h
+#include thunar/thunar-application.h
#include thunar/thunar-enum-types.h
#include thunar/thunar-gio-extensions.h
#include thunar/thunar-io-scan-directory.h
@@ -32,6 +33,7 @@
#include thunar/thunar-job.h
#include thunar/thunar-private.h
#include thunar/thunar-simple-job.h
+#include thunar/thunar-thumbnail-cache.h
#include thunar/thunar-transfer-job.h
@@ -367,13 +369,15 @@ _thunar_io_jobs_unlink (ThunarJob *job,
GValueArray *param_values,
GError **error)
{
- ThunarJobResponse response;
- GFileInfo*info;
- GError *err = NULL;
- GList*file_list;
- GList*lp;
- gchar*base_name;
- gchar*display_name;
+ ThunarThumbnailCache *thumbnail_cache;
+ ThunarApplication*application;
+ ThunarJobResponse response;
+ GFileInfo*info;
+ GError *err = NULL;
+ GList*file_list;
+ GList*lp;
+ gchar*base_name;
+ gchar*display_name;
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), FALSE);
_thunar_return_val_if_fail (param_values != NULL, FALSE);
@@ -415,7 +419,15 @@ _thunar_io_jobs_unlink (ThunarJob *job,
again:
/* try to delete the file */
- if (!g_file_delete (lp-data, exo_job_get_cancellable (EXO_JOB (job)),
err))
+ if (g_file_delete (lp-data, exo_job_get_cancellable (EXO_JOB (job)),
err))
+{
+ application = thunar_application_get ();
+ thumbnail_cache = thunar_application_get_thumbnail_cache
(application);
+ thunar_thumbnail_cache_delete_file (thumbnail_cache, lp-data);
+ g_object_unref (thumbnail_cache);
+ g_object_unref (application);
+}
+ else
{
/* query the file info for the display name */
info = g_file_query_info (lp-data,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Refactor ThunarThumbnailer and implement unqueue.
Updating branch refs/heads/master
to f19df728cf8798152b175dd61467ea1633663660 (commit)
from cc468f4b3f33c298c33942ee0ce64000a920c8ed (commit)
commit f19df728cf8798152b175dd61467ea1633663660
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Feb 7 02:41:23 2011 +0100
Refactor ThunarThumbnailer and implement unqueue.
This commit also drops ThunarThumbnailer in ThunarIconFactory and adds
it to ThunarPropertiesDialog. There will be one ThunarThumbnailer for
each ThunarStandardView soon in order to bring back normal thumbnail
generation.
thunar/thunar-icon-factory.c | 55 ++
thunar/thunar-properties-dialog.c | 109 ++---
thunar/thunar-thumbnailer.c | 457 +
thunar/thunar-thumbnailer.h | 45 ++--
4 files changed, 223 insertions(+), 443 deletions(-)
diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
index 576329a..4f2ec42 100644
--- a/thunar/thunar-icon-factory.c
+++ b/thunar/thunar-icon-factory.c
@@ -1,25 +1,22 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2005-2006 Benedikt Meurer be...@xfce.org
- * Copyright (c) 2009-2010 Jannis Pohlmann jan...@xfce.org
+ * Copyright (c) 2009-2011 Jannis Pohlmann jan...@xfce.org
*
- * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * The basic idea for the icon factory implementation was borrowed from
- * Nautilus initially, but the implementation is very different from
- * what Nautilus does.
+ * 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.
*/
#ifdef HAVE_CONFIG_H
@@ -38,7 +35,6 @@
#include thunar/thunar-preferences.h
#include thunar/thunar-private.h
#include thunar/thunar-thumbnail-frame.h
-#include thunar/thunar-thumbnailer.h
@@ -106,8 +102,6 @@ struct _ThunarIconFactory
{
GObject __parent__;
- ThunarThumbnailer *thumbnailer;
-
ThunarPreferences *preferences;
GdkPixbuf *recently[MAX_RECENTLY]; /* ring buffer */
@@ -209,9 +203,6 @@ thunar_icon_factory_init (ThunarIconFactory *factory)
/* allocate the hash table for the icon cache */
factory-icon_cache = g_hash_table_new_full (thunar_icon_key_hash,
thunar_icon_key_equal, g_free, g_object_unref);
-
- /* create a new thumbnailer */
- factory-thumbnailer = thunar_thumbnailer_new ();
}
@@ -250,9 +241,6 @@ thunar_icon_factory_finalize (GObject *object)
/* clear the icon cache hash table */
g_hash_table_destroy (factory-icon_cache);
- /* release the thumbnailer */
- g_object_unref (G_OBJECT (factory-thumbnailer));
-
/* remove the changed emission hook from the GtkIconTheme class */
g_signal_remove_emission_hook (g_signal_lookup (changed,
GTK_TYPE_ICON_THEME), factory-changed_hook_id);
@@ -804,7 +792,6 @@ thunar_icon_factory_load_file_icon (ThunarIconFactory
*factory,
ThunarFileIconState icon_state,
ginticon_size)
{
- ThunarFileThumbState thumb_state;
GInputStream*stream;
GtkIconInfo *icon_info;
const gchar *thumbnail_path;
@@ -830,20 +817,6 @@ thunar_icon_factory_load_file_icon (ThunarIconFactory
*factory,
/* check if thumbnails are enabled and we can display a thumbnail for the
item */
if (G_LIKELY (factory-show_thumbnails thunar_file_is_regular (file)))
{
- /* this is how thumbnails for files are loaded: first, we check the
thumbnail
- * state. If that is unknown, we request a thumbnail to be generated in
the
- * background. At the same time we already try to load the thumbnail, in
case
- *
[Xfce4-commits] thunar:master Add thumbnail cache update support to the link job.
Updating branch refs/heads/master
to 9317f1b660ac0e3753c5a6cc6341a1b59d609381 (commit)
from ee3d81ed900dfd3e23b374504f34cc264abb3d2f (commit)
commit 9317f1b660ac0e3753c5a6cc6341a1b59d609381
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Feb 7 22:17:35 2011 +0100
Add thumbnail cache update support to the link job.
This does wonders when linking stuff from slow remote locations into
your local system.
thunar/thunar-io-jobs.c | 44 +-
thunar/thunar-thumbnail-cache.c |2 +-
2 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/thunar/thunar-io-jobs.c b/thunar/thunar-io-jobs.c
index 7eb46db..dc92df1 100644
--- a/thunar/thunar-io-jobs.c
+++ b/thunar/thunar-io-jobs.c
@@ -408,6 +408,11 @@ _thunar_io_jobs_unlink (ThunarJob *job,
/* we know the total list of files to process */
thunar_job_set_total_files (THUNAR_JOB (job), file_list);
+ /* take a reference on the thumbnail cache */
+ application = thunar_application_get ();
+ thumbnail_cache = thunar_application_get_thumbnail_cache (application);
+ g_object_unref (application);
+
/* remove all the files */
for (lp = file_list; lp != NULL !exo_job_is_cancelled (EXO_JOB (job)); lp
= lp-next)
{
@@ -421,11 +426,9 @@ again:
/* try to delete the file */
if (g_file_delete (lp-data, exo_job_get_cancellable (EXO_JOB (job)),
err))
{
- application = thunar_application_get ();
- thumbnail_cache = thunar_application_get_thumbnail_cache
(application);
+ /* notify the thumbnail cache that the corresponding thumbnail can
also
+ * be deleted now */
thunar_thumbnail_cache_delete_file (thumbnail_cache, lp-data);
- g_object_unref (thumbnail_cache);
- g_object_unref (application);
}
else
{
@@ -471,6 +474,9 @@ again:
}
}
+ /* release the thumbnail cache */
+ g_object_unref (thumbnail_cache);
+
/* release the file list */
thunar_g_file_list_free (file_list);
@@ -658,13 +664,15 @@ _thunar_io_jobs_link (ThunarJob *job,
GValueArray *param_values,
GError **error)
{
- GError *err = NULL;
- GFile *real_target_file;
- GList *new_files_list = NULL;
- GList *source_file_list;
- GList *sp;
- GList *target_file_list;
- GList *tp;
+ ThunarThumbnailCache *thumbnail_cache;
+ ThunarApplication*application;
+ GError *err = NULL;
+ GFile*real_target_file;
+ GList*new_files_list = NULL;
+ GList*source_file_list;
+ GList*sp;
+ GList*target_file_list;
+ GList*tp;
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), FALSE);
_thunar_return_val_if_fail (param_values != NULL, FALSE);
@@ -677,6 +685,11 @@ _thunar_io_jobs_link (ThunarJob *job,
/* we know the total list of paths to process */
thunar_job_set_total_files (THUNAR_JOB (job), source_file_list);
+ /* take a reference on the thumbnail cache */
+ application = thunar_application_get ();
+ thumbnail_cache = thunar_application_get_thumbnail_cache (application);
+ g_object_unref (application);
+
/* process all files */
for (sp = source_file_list, tp = target_file_list;
err == NULL sp != NULL tp != NULL;
@@ -697,6 +710,12 @@ _thunar_io_jobs_link (ThunarJob *job,
{
new_files_list = thunar_g_file_list_prepend (new_files_list,
real_target_file);
+
+ /* notify the thumbnail cache that we need to copy the original
+ * thumbnail for the symlink to have one too */
+ thunar_thumbnail_cache_copy_file (thumbnail_cache, sp-data,
+real_target_file);
+
}
/* release the real target file */
@@ -704,6 +723,9 @@ _thunar_io_jobs_link (ThunarJob *job,
}
}
+ /* release the thumbnail cache */
+ g_object_unref (thumbnail_cache);
+
if (err != NULL)
{
thunar_g_file_list_free (new_files_list);
diff --git a/thunar/thunar-thumbnail-cache.c b/thunar/thunar-thumbnail-cache.c
index fe62dc3..4725498 100644
--- a/thunar/thunar-thumbnail-cache.c
+++ b/thunar/thunar-thumbnail-cache.c
@@ -467,7 +467,7 @@ thunar_thumbnail_cache_move_file (ThunarThumbnailCache
*cache,
cache-move_queue_idle_id = 0;
}
- /* add the files to the move queues */
+ /* add the files to the move queue */
cache-move_source_queue = g_list_prepend (cache-move_source_queue,
g_object_ref (source_file));
cache-move_target_queue = g_list_prepend (cache-move_target_queue,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
[Xfce4-commits] thunar:master Add a ThunarThumbnailCache to ThunarApplication, implement Move().
Updating branch refs/heads/master to d2dd3f68af0afaf4035a3ffbc7340d257703a003 (commit) from 834e6455488ccfb505127ba175e5366e1c652691 (commit) commit d2dd3f68af0afaf4035a3ffbc7340d257703a003 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Feb 7 16:34:47 2011 +0100 Add a ThunarThumbnailCache to ThunarApplication, implement Move(). With this tumblerd can just copy the thumbnail and adjust its meta data when a file is renamed. We thereby avoid regenerating thumbnails for files that are simply renamed but whose contents don't change at all. We probably need some extra code to check whether the file type has now changed or become incompatible with tumbler. In that case we will have to drop the thumbnail. But how often does this really happen? thunar/Makefile.am | 12 ++ thunar/thunar-application.c| 43 -- thunar/thunar-application.h| 238 thunar/thunar-file.c | 19 ++- thunar/thunar-thumbnail-cache-dbus.xml | 27 thunar/thunar-thumbnail-cache.c| 213 thunar/thunar-thumbnail-cache.h| 49 +++ 7 files changed, 466 insertions(+), 135 deletions(-) diff --git a/thunar/Makefile.am b/thunar/Makefile.am index 70d6df5..547fe16 100644 --- a/thunar/Makefile.am +++ b/thunar/Makefile.am @@ -200,6 +200,8 @@ Thunar_SOURCES = \ thunar-throbber.h \ thunar-throbber-fallback.c \ thunar-throbber-fallback.h \ + thunar-thumbnail-cache.c\ + thunar-thumbnail-cache.h\ thunar-thumbnailer.c\ thunar-thumbnailer.h\ thunar-thumbnail-frame.c\ @@ -259,6 +261,7 @@ Thunar_DEPENDENCIES = \ if HAVE_DBUS thunar_built_sources += \ thunar-dbus-service-infos.h \ + thunar-thumbnail-cache-proxy.h \ thunar-thumbnailer-proxy.h thunar_dbus_sources = \ @@ -266,6 +269,7 @@ thunar_dbus_sources = \ thunar-dbus-client.h\ thunar-dbus-service.c \ thunar-dbus-service.h \ + thunar-thumbnail-cache-proxy.h \ thunar-thumbnailer-proxy.h Thunar_CFLAGS += \ @@ -343,6 +347,14 @@ thunar-thumbnailer-proxy.h: $(srcdir)/thunar-thumbnailer-dbus.xml Makefile sed -i -e 's/org_freedesktop_thumbnails_Thumbnailer1/thunar_thumbnailer_proxy/g' \ thunar-thumbnailer-proxy.h \ ) + +thunar-thumbnail-cache-proxy.h: $(srcdir)/thunar-thumbnail-cache-dbus.xml Makefile + $(AM_V_GEN) ( \ + dbus-binding-tool --mode=glib-client \ + $(srcdir)/thunar-thumbnail-cache-dbus.xml thunar-thumbnail-cache-proxy.h \ +sed -i -e 's/org_freedesktop_thumbnails_Cache1/thunar_thumbnail_cache_proxy/g' \ + thunar-thumbnail-cache-proxy.h \ + ) endif thunar-throbber-fallback.c: $(srcdir)/thunar-throbber-fallback.png Makefile diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c index 4490105..8a5744a 100644 --- a/thunar/thunar-application.c +++ b/thunar/thunar-application.c @@ -1,22 +1,23 @@ -/* $Id$ */ +/* vi:set et ai sw=2 sts=2 ts=2: */ /*- * Copyright (c) 2005-2007 Benedikt Meurer be...@xfce.org * Copyright (c) 2005 Jeff Franks jcfra...@xfce.org - * Copyright (c) 2009-2010 Jannis Pohlmann jan...@xfce.org + * Copyright (c) 2009-2011 Jannis Pohlmann jan...@xfce.org * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. + * 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 - *
[Xfce4-commits] thunar:master Use Move(), Copy() and Delete() cache methods in transfer jobs.
Updating branch refs/heads/master
to ee3d81ed900dfd3e23b374504f34cc264abb3d2f (commit)
from 4f6e985763adc4c6dfed5153aaa5ec973f498f82 (commit)
commit ee3d81ed900dfd3e23b374504f34cc264abb3d2f
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Feb 7 21:54:58 2011 +0100
Use Move(), Copy() and Delete() cache methods in transfer jobs.
This probably has to be improved (at least Copy() sometimes causes weird
icon view behavior when copying a lot of files to an open window).
Move transfer jobs work fine.
thunar/thunar-transfer-job.c | 126 --
1 files changed, 84 insertions(+), 42 deletions(-)
diff --git a/thunar/thunar-transfer-job.c b/thunar/thunar-transfer-job.c
index 364bd4e..801f98e 100644
--- a/thunar/thunar-transfer-job.c
+++ b/thunar/thunar-transfer-job.c
@@ -1,22 +1,22 @@
-/* vi:set sw=2 sts=2 ts=2 et ai: */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2005-2007 Benedikt Meurer be...@xfce.org
* Copyright (c) 2009-2011 Jannis Pohlmann jan...@xfce.org
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
+ * 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * 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.
*/
#ifdef HAVE_CONFIG_H
@@ -25,11 +25,13 @@
#include gio/gio.h
+#include thunar/thunar-application.h
#include thunar/thunar-gio-extensions.h
#include thunar/thunar-io-scan-directory.h
#include thunar/thunar-io-jobs-util.h
#include thunar/thunar-job.h
#include thunar/thunar-private.h
+#include thunar/thunar-thumbnail-cache.h
#include thunar/thunar-transfer-job.h
@@ -481,11 +483,13 @@ thunar_transfer_job_copy_node (ThunarTransferJob *job,
GList **target_file_list_return,
GError**error)
{
- ThunarJobResponse response;
- GFileInfo*info;
- GError *err = NULL;
- GFile*real_target_file = NULL;
- gchar*base_name;
+ ThunarThumbnailCache *thumbnail_cache;
+ ThunarApplication*application;
+ ThunarJobResponse response;
+ GFileInfo*info;
+ GError *err = NULL;
+ GFile*real_target_file = NULL;
+ gchar*base_name;
_thunar_return_if_fail (THUNAR_IS_TRANSFER_JOB (job));
_thunar_return_if_fail (node != NULL G_IS_FILE (node-source_file));
@@ -536,6 +540,14 @@ retry_copy:
/* node-source_file == real_target_file means to skip the file */
if (G_LIKELY (node-source_file != real_target_file))
{
+ /* notify the thumbnail cache of the copy operation */
+ application = thunar_application_get ();
+ thumbnail_cache = thunar_application_get_thumbnail_cache
(application);
+ thunar_thumbnail_cache_copy_file (thumbnail_cache,
node-source_file,
+real_target_file);
+ g_object_unref (thumbnail_cache);
+ g_object_unref (application);
+
/* check if we have children to copy */
if (node-children != NULL)
{
@@ -558,22 +570,42 @@ retry_copy:
/* add the real target file to the return list */
if (G_LIKELY (target_file_list_return != NULL))
-*target_file_list_return = thunar_g_file_list_prepend
(*target_file_list_return, real_target_file);
+{
+ *target_file_list_return =
+thunar_g_file_list_prepend (*target_file_list_return,
+real_target_file);
+}
[Xfce4-commits] thunar:master Add thunar_thumbnail_cache_cleanup_file(). Sync with thumbnailer spec.
Updating branch refs/heads/master
to 9beaffa4809e88a52bd84bb0d51180bfd47ed2a0 (commit)
from 5a20e93a0d2734e8cb200d29dcb0ca31560805d0 (commit)
commit 9beaffa4809e88a52bd84bb0d51180bfd47ed2a0
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Feb 13 14:32:58 2011 +0100
Add thunar_thumbnail_cache_cleanup_file(). Sync with thumbnailer spec.
Also increase the timeouts for Copy() and Delete() D-Bus method calls to
500ms to reduce the D-Bus traffic.
thunar/thunar-thumbnail-cache-dbus.xml |2 +-
thunar/thunar-thumbnail-cache.c| 132 +++-
thunar/thunar-thumbnail-cache.h| 26 ---
3 files changed, 145 insertions(+), 15 deletions(-)
diff --git a/thunar/thunar-thumbnail-cache-dbus.xml
b/thunar/thunar-thumbnail-cache-dbus.xml
index 0d4ca87..92ffa42 100644
--- a/thunar/thunar-thumbnail-cache-dbus.xml
+++ b/thunar/thunar-thumbnail-cache-dbus.xml
@@ -20,7 +20,7 @@
method name=Cleanup
annotation name=org.freedesktop.DBus.GLib.Async value=true/
- arg type=s name=uri_prefix direction=in /
+ arg type=as name=base_uris direction=in /
arg type=u name=since direction=in /
/method
/interface
diff --git a/thunar/thunar-thumbnail-cache.c b/thunar/thunar-thumbnail-cache.c
index 0fdf941..d1c482e 100644
--- a/thunar/thunar-thumbnail-cache.c
+++ b/thunar/thunar-thumbnail-cache.c
@@ -65,6 +65,9 @@ struct _ThunarThumbnailCache
GList *delete_queue;
guint delete_queue_idle_id;
+ GList *cleanup_queue;
+ guint cleanup_queue_idle_id;
+
GMutex *lock;
#endif
};
@@ -148,6 +151,12 @@ thunar_thumbnail_cache_finalize (GObject *object)
g_list_foreach (cache-delete_queue, (GFunc) g_object_unref, NULL);
g_list_free (cache-delete_queue);
+ /* drop the cleanup queue idle and all queued files */
+ if (cache-cleanup_queue_idle_id 0)
+g_source_remove (cache-cleanup_queue_idle_id);
+ g_list_foreach (cache-cleanup_queue, (GFunc) g_object_unref, NULL);
+ g_list_free (cache-cleanup_queue);
+
/* check if we have a valid cache proxy */
if (cache-cache_proxy != NULL)
{
@@ -249,6 +258,32 @@ thunar_thumbnail_cache_delete_async (ThunarThumbnailCache
*cache,
+static void
+thunar_thumbnail_cache_cleanup_async_reply (DBusGProxy *proxy,
+GError *error,
+gpointeruser_data)
+{
+ _thunar_return_if_fail (DBUS_IS_G_PROXY (proxy));
+}
+
+
+
+static void
+thunar_thumbnail_cache_cleanup_async (ThunarThumbnailCache *cache,
+ const gchar *const*base_uris)
+{
+ _thunar_return_if_fail (THUNAR_IS_THUMBNAIL_CACHE (cache));
+ _thunar_return_if_fail (base_uris != NULL);
+
+ /* request a thumbnail cache update asynchronously */
+ thunar_thumbnail_cache_proxy_cleanup_async (cache-cache_proxy,
+ (const gchar **)base_uris, 0,
+
thunar_thumbnail_cache_cleanup_async_reply,
+ NULL);
+}
+
+
+
static gboolean
thunar_thumbnail_cache_process_move_queue (ThunarThumbnailCache *cache)
{
@@ -432,6 +467,62 @@ thunar_thumbnail_cache_process_delete_queue
(ThunarThumbnailCache *cache)
return FALSE;
}
+
+
+
+static gboolean
+thunar_thumbnail_cache_process_cleanup_queue (ThunarThumbnailCache *cache)
+{
+ GList *lp;
+ gchar **uris;
+ guint n_uris;
+ guint n;
+
+ _thunar_return_val_if_fail (THUNAR_IS_THUMBNAIL_CACHE (cache), FALSE);
+
+ /* acquire a cache lock */
+ g_mutex_lock (cache-lock);
+
+ /* compute how many URIs there are */
+ n_uris = g_list_length (cache-cleanup_queue);
+
+ /* allocate a string array for the URIs */
+ uris = g_new0 (gchar *, n_uris + 1);
+
+ g_debug (cleanup:);
+
+ /* fill URI array with file URIs from the cleanup queue */
+ for (lp = g_list_last (cache-cleanup_queue), n = 0; lp != NULL; lp =
lp-prev, ++n)
+{
+ uris[n] = g_file_get_uri (lp-data);
+
+ g_debug ( %s, uris[n]);
+
+ /* release the file object */
+ g_object_unref (lp-data);
+}
+
+ /* NULL-terminate the URI array */
+ uris[n] = NULL;
+
+ /* asynchronously cleanup the thumbnails */
+ thunar_thumbnail_cache_cleanup_async (cache, (const gchar *const *)uris);
+
+ /* free the URI array */
+ g_free (uris);
+
+ /* release the cleanup queue list */
+ g_list_free (cache-cleanup_queue);
+ cache-cleanup_queue = NULL;
+
+ /* reset the cleanup queue idle ID */
+ cache-cleanup_queue_idle_id = 0;
+
+ /* release the cache lock */
+ g_mutex_unlock (cache-lock);
+
+ return FALSE;
+}
#endif /* HAVE_DBUS */
@@ -517,7 +608,7 @@ thunar_thumbnail_cache_copy_file (ThunarThumbnailCache
*cache,
/* process the copy queue in a 250ms timeout */
cache-copy_queue_idle_id =
-g_timeout_add (250, (GSourceFunc)
thunar_thumbnail_cache_process_copy_queue,
+
[Xfce4-commits] thunar:master Call thunar_thumbnail_cache_cleanup_file() when trashing a file/folder.
Updating branch refs/heads/master
to 3415bea8e7624012c4104791f0caf839b689636d (commit)
from 9beaffa4809e88a52bd84bb0d51180bfd47ed2a0 (commit)
commit 3415bea8e7624012c4104791f0caf839b689636d
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Feb 13 14:36:08 2011 +0100
Call thunar_thumbnail_cache_cleanup_file() when trashing a file/folder.
When trashing a directory we cannot call the Delete() method of the
thumbnailer service as that would not delete thumbnails of its
descendants. Using the base URI parameter of Cleanup() we can achieve
this however.
thunar/thunar-io-jobs.c | 21 ++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/thunar/thunar-io-jobs.c b/thunar/thunar-io-jobs.c
index dc92df1..859bdef 100644
--- a/thunar/thunar-io-jobs.c
+++ b/thunar/thunar-io-jobs.c
@@ -762,9 +762,11 @@ _thunar_io_jobs_trash (ThunarJob *job,
GValueArray *param_values,
GError **error)
{
- GError *err = NULL;
- GList *file_list;
- GList *lp;
+ ThunarThumbnailCache *thumbnail_cache;
+ ThunarApplication*application;
+ GError *err = NULL;
+ GList*file_list;
+ GList*lp;
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), FALSE);
_thunar_return_val_if_fail (param_values != NULL, FALSE);
@@ -776,12 +778,25 @@ _thunar_io_jobs_trash (ThunarJob *job,
if (exo_job_set_error_if_cancelled (EXO_JOB (job), error))
return FALSE;
+ /* take a reference on the thumbnail cache */
+ application = thunar_application_get ();
+ thumbnail_cache = thunar_application_get_thumbnail_cache (application);
+ g_object_unref (application);
+
for (lp = file_list; err == NULL lp != NULL; lp = lp-next)
{
_thunar_assert (G_IS_FILE (lp-data));
+
+ /* trash the file or folder */
g_file_trash (lp-data, exo_job_get_cancellable (EXO_JOB (job)), err);
+
+ /* update the thumbnail cache */
+ thunar_thumbnail_cache_cleanup_file (thumbnail_cache, lp-data);
}
+ /* release the thumbnail cache */
+ g_object_unref (thumbnail_cache);
+
if (err != NULL)
{
g_propagate_error (error, err);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Release 0.1.21!
Updating branch refs/heads/master to 41474f1bf32ca592544cc4e3741b0320a7143b58 (commit) from ee0e466351457f1cc2e9856ec66c2f2fa798e363 (commit) commit 41474f1bf32ca592544cc4e3741b0320a7143b58 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Feb 14 14:20:15 2011 +0100 Release 0.1.21! NEWS |4 ++-- configure.ac |2 +- po/POTFILES.in |2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 032a7e9..846cad4 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ -0.1.x -= +0.1.21 +== - Update to latest revision of the thumbnail management D-Bus specification where Cleanup() takes an array of base URIs instead of just one. diff --git a/configure.ac b/configure.ac index 0257326..0c9fac7 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ m4_define([tumbler_verinfo], [0:0:0]) m4_define([tumbler_version_api_major], [1]) m4_define([tumbler_version_major], [0]) m4_define([tumbler_version_minor], [1]) -m4_define([tumbler_version_micro], [20]) +m4_define([tumbler_version_micro], [21]) m4_define([tumbler_version], [tumbler_version_major().tumbler_version_minor().tumbler_version_micro()]) dnl diff --git a/po/POTFILES.in b/po/POTFILES.in index 22ff89f..8fb9a06 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,7 @@ tumblerd/tumbler-cache-service.c +tumblerd/tumbler-component.c tumblerd/tumbler-group-scheduler.c +tumblerd/tumbler-lifecycle-manager.c tumblerd/tumbler-lifo-scheduler.c tumblerd/tumbler-service.c tumblerd/tumbler-specialized-thumbnailer.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler|tumbler-0.1.21 Creating annotated tag tumbler-0.1.21
Updating annotated tag refs/tags/tumbler-0.1.21 as new annotated tag to 33f5a37fffc8dab2f56395db44e8b2fdff6e7884 (tag) succeeds tumbler-0.1.20 tagged by Jannis Pohlmann jan...@xfce.org on 2011-02-14 13:20 + Jannis Pohlmann (4): Make Cleanup() take an array of base URIs instead of just one. Get rid of the inherently broken GStrv type in function signatures. Quit tumbler after five minutes of inactivity. Release 0.1.21! ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] moka:master Make role-based permission control easier.
Updating branch refs/heads/master to 3142e2673ceffa823303b5f0a928916b2ac21140 (commit) from ebf973ee4ba096800cd8d861913e42e9578587cc (commit) commit 3142e2673ceffa823303b5f0a928916b2ac21140 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Feb 14 14:59:20 2011 +0100 Make role-based permission control easier. Also allow people with the 'board-member' role to send announcements from the release manager through the @xfce identi.ca account. lib/controllers/announcements.rb |6 +++--- lib/controllers/authentication.rb | 21 - lib/views/permission_denied.erb |8 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/lib/controllers/announcements.rb b/lib/controllers/announcements.rb index 435cdeb..be128e3 100755 --- a/lib/controllers/announcements.rb +++ b/lib/controllers/announcements.rb @@ -5,19 +5,19 @@ module Moka def self.registered(app) app.get '/announcements' do - authentication_required + authentication_required(roles = ['admin', 'board-member']) view :announcements end app.get '/announcements/identica' do - authentication_required + authentication_required(roles = ['admin', 'board-member']) redirect '/announcements' end app.post '/announcements/identica' do - authentication_required + authentication_required(roles = ['admin', 'board-member']) unless env['identica'] error_set(:identica, 'Publishing announcements on identi.ca is not supported at the moment.') diff --git a/lib/controllers/authentication.rb b/lib/controllers/authentication.rb index 6428b12..d24092f 100755 --- a/lib/controllers/authentication.rb +++ b/lib/controllers/authentication.rb @@ -55,29 +55,40 @@ module Moka env['warden'].authenticated? end -def authentication_required(context = nil, role = 'admin') +def authentication_required(context = nil, roles = ['admin']) redirect '/login' unless authentication_finished? if (context.is_a? Moka::Models::Project) +# abort processing the current page if the user is not +# a maintainer of the project and his/her user roles +# and the required roles have no elements in common unless context.maintainers.include?(authentication_user) - unless authentication_user.roles.include?(role) + if (authentication_user.roles roles).empty? halt(view(:permission_denied, binding)) end end elsif (context.is_a? Moka::Models::Collection) +# abort processing the current page if the user is not +# a maintainer of the collection and his/her user roles +# and the required roles have no elements in common unless context.maintainers.include?(authentication_user) - unless authentication_user.roles.include?(role) + if (authentication_user.roles roles).empty? halt(view(:permission_denied, binding)) end end elsif (context.is_a? Moka::Models::Maintainer) +# abort processing the current page if the user is not +# the same as the required maintainer and his/her user +# roles and the required roles have no elements in common unless authentication_user == context - unless authentication_user.roles.include?(role) + if (authentication_user.roles roles).empty? halt(view(:permission_denied, binding)) end end else -unless authentication_user.roles.include?(role) +# abort processing the current page if the user roles +# and the required roles have no elements in common +if (authentication_user.roles roles).empty? halt(view(:permission_denied, binding)) end end diff --git a/lib/views/permission_denied.erb b/lib/views/permission_denied.erb index 3deab1b..35ab48a 100755 --- a/lib/views/permission_denied.erb +++ b/lib/views/permission_denied.erb @@ -2,13 +2,13 @@ p class=errorYou're denied access to this page for the following reason:/p p class=error style=text-align:center;strong % if context.is_a? Moka::Models::Project % -You are not listed as a maintainer of %= context.name % and your role is not %= role % either. +You are not listed as a maintainer of %= context.name % and your roles include none of %= roles.to_s % either. % elsif context.is_a? Moka::Models::Collection % -You are not listed as a maintainer of %= context.display_name % and your role is not %= role % either. +You are not listed as a maintainer of %= context.display_name % and your roles include none of %= roles.to_s % either. % elsif context.is_a?
[Xfce4-commits] thunar:master Release 1.3.0!
Updating branch refs/heads/master to 7234d2fc32ca961252b9544ad57382ebef19c5e7 (commit) from 6ebca95f7cd2b2de82057994c7b8239f7cc3b5fb (commit) commit 7234d2fc32ca961252b9544ad57382ebef19c5e7 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Feb 14 15:01:35 2011 +0100 Release 1.3.0! NEWS| 11 ++- configure.in.in |4 ++-- po/POTFILES.in |1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 2d91ec7..8bf5499 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -1.3.x +1.3.0 = - Paste files in correct order (bug #6504). - Fix truncated strings when loading and storing emblems (bug #7171). @@ -10,6 +10,15 @@ - Only change the Name field when renaming desktop files (bug #7155). - Force desktop file reload after changing the Name field. - Fix memory leak caused by not destroying the rename job. +- Allow installation of helper scripts in a custom location using the + --with-helper-path-prefix=PATH configure option. +- Improve thumbnailing by avoid sending thumbnail requests while the + user is scrolling in a directory. +- Cancel thumbnail requests when leaving a directory. +- Avoid regenerating thumbnails when files are copied, moved, linked + or trashed. +- Update the thumbnail cache when files are deleted permanently. +- Translation updates: Galician, Polish, Portuguese, Romanian, Serbian. 1.2.0 = diff --git a/configure.in.in b/configure.in.in index b97a5ac..d02e656 100644 --- a/configure.in.in +++ b/configure.in.in @@ -24,11 +24,11 @@ dnl *** m4_define([thunarx_verinfo], [0:0:0]) m4_define([thunarx_version_api], [2]) m4_define([thunar_version_major], [1]) -m4_define([thunar_version_minor], [2]) +m4_define([thunar_version_minor], [3]) m4_define([thunar_version_micro], [0]) m4_define([thunar_version_nano], []) m4_define([thunar_version_build], [@REVISION@]) -m4_define([thunar_version_tag], [git]) +m4_define([thunar_version_tag], []) m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(), [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [git], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])]) dnl *** diff --git a/po/POTFILES.in b/po/POTFILES.in index 3c79db9..63e17af 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -79,6 +79,7 @@ thunar/thunar-stock.c thunar/thunar-templates-action.c thunar/thunar-text-renderer.c thunar/thunar-throbber.c +thunar/thunar-thumbnail-cache.c thunar/thunar-thumbnailer.c thunar/thunar-transfer-job.c thunar/thunar-trash-action.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar|thunar-1.3.0 Creating annotated tag thunar-1.3.0
Updating annotated tag refs/tags/thunar-1.3.0
as new annotated tag
to 2918cbc8346b7b3db0b0f8e979f3ef0710128641 (tag)
succeeds thunar-1.2.0
tagged by Jannis Pohlmann jan...@xfce.org
on 2011-02-14 14:01 +
Guido Berhoerster (1):
Allow installation of the helpers in a custom location.
Jannis Pohlmann (27):
Post-release version bump.
Paste files in the correct order (bug #6504).
Fix truncated strings when loading and storing emblems (bug #7171).
Only erase top-level items from trash (bug #7147).
Don't interpret file display names as format strings (bug #7128).
Ship stock_folder-{copy,move}.png with Thunar itself (bug #6851).
Fix segfault when calling strcasecmp with NULL parameters (bug #7206).
Only change the Name field when renaming desktop files (bug #7155).
Force desktop file reload after changing the Name field.
Fix memory leak caused by not destroying the rename job.
Update NEWS.
Refactor ThunarThumbnailer and implement unqueue.
Use a timeout/idle to request thumbnails in ThunarStandardView.
Add a ThunarThumbnailCache to ThunarApplication, implement Move().
Make sure to reset the thumbnail timeout/idle handler ID.
Add thunar_thumbnail_cache_delete_file(). Use queues for processing.
Add thunar_thumbnail_cache_copy_file().
Call thunar_thumbnail_cache_delete_file() in the unlink job.
Use Move(), Copy() and Delete() cache methods in transfer jobs.
Add thumbnail cache update support to the link job.
Improve the thumbnail cache support in transfer jobs a tiny bit.
Make the thumbnailing in ThunarStandardView a bit more responsive.
Fix build without D-Bus.
Add thunar_thumbnail_cache_cleanup_file(). Sync with thumbnailer spec.
Call thunar_thumbnail_cache_cleanup_file() when trashing a file/folder.
Merge branch 'jannis/thumbnailer-improvements'
Release 1.3.0!
Leandro Regueiro (2):
l10n: Updated Galician (gl) translation to 100%
l10n: Updated Galician (gl) translation to 98%
Mișu Moldovan (1):
l10n: Updated Romanian (ro) translation to 100%
Piotr Sokół (2):
l10n: Updated Polish (pl) translation to 97%
l10n: Updated Polish (pl) translation to 99%
Sergio Marques (3):
l10n: Updated Portuguese (pt) translation to 100%
l10n: Updated Portuguese (pt) translation to 100%
l10n: Updated Portuguese (pt) translation to 100%
mpopovic (1):
l10n: Added Serbian Translation
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:xfce-4.8 l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/xfce-4.8 to bcad7dd7b9bdd29e07095dd0bdf9acf041beebee (commit) from b1516bbd96919f9293d4a3519d48461eb1e0 (commit) commit bcad7dd7b9bdd29e07095dd0bdf9acf041beebee Author: Masato Hashimoto hash...@xfce.org Date: Mon Feb 14 15:47:38 2011 +0100 l10n: Updated Japanese (ja) translation to 100% New status: 345 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 282 -- 1 files changed, 108 insertions(+), 174 deletions(-) diff --git a/po/ja.po b/po/ja.po index 781ca25..c1d539c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,8 +9,8 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-22 23:11+0900\n -PO-Revision-Date: 2011-01-22 23:11+0900\n +POT-Creation-Date: 2011-02-14 23:44+0900\n +PO-Revision-Date: 2011-02-14 23:47+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese xfce-users...@ml.fdiary.net\n Language: ja\n @@ -19,10 +19,8 @@ msgstr Content-Transfer-Encoding: 8bit\n #: ../panel-desktop-handler.desktop.in.h:1 -msgid -Add a new launcher to the panel based on the information of this desktop file -msgstr -このデスクトップファイルの情報を基にパネルに新しいランチャを追加します。 +msgid Add a new launcher to the panel based on the information of this desktop file +msgstr このデスクトップファイルの情報を基にパネルに新しいランチャを追加します。 #: ../panel-desktop-handler.desktop.in.h:2 msgid Create Launcher on the panel @@ -33,7 +31,8 @@ msgid Customize the panel msgstr パネルをカスタマイズします #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: +#: ../panel/panel-preferences-dialog.glade.h:24 +#: ../panel/panel-window.c:2247 #: ../migrate/main.c:84 msgid Panel msgstr パネル @@ -43,12 +42,8 @@ msgid _Read Online msgstr オンラインで読む(_R) #: ../common/panel-utils.c:156 -msgid -You can read the user manual online. This manual may however not exactly -match your panel version. -msgstr -ユーザマニュアルをオンラインで閲覧できます。ただし、あなたがお使いのパネルの -バージョンとは一致しないかもしれません。 +msgid You can read the user manual online. This manual may however not exactly match your panel version. +msgstr ユーザマニュアルをオンラインで閲覧できます。ただし、あなたがお使いのパネルのバージョンとは一致しないかもしれません。 #: ../common/panel-utils.c:158 msgid The user manual is not installed on your computer @@ -81,17 +76,20 @@ msgid Pane_l msgstr パネル(_L) #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 +#: ../panel/panel-window.c:2259 msgid Add _New Items... msgstr 新しいアイテムの追加(_N)... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 +#: ../panel/panel-window.c:2270 msgid Panel Pr_eferences... msgstr パネルの設定(_E)... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 +#: ../panel/panel-window.c:2286 msgid Log _Out msgstr ログアウト(_O) @@ -101,7 +99,8 @@ msgid Show the 'Panel Preferences' dialog msgstr 'パネルの設定' ダイアログを表示する # CLI --help: --preferences=PANEL-NUMBER -#: ../panel/main.c:78 ../panel/main.c:79 +#: ../panel/main.c:78 +#: ../panel/main.c:79 msgid PANEL-NUMBER msgstr PANEL-NUMBER @@ -200,53 +199,43 @@ msgid Failed to send D-Bus message msgstr D-Bus メッセージの送信に失敗しました #: ../panel/main.c:405 -msgid -Do you want to start the panel? If you do, make sure you save the session on -logout, so the panel is automatically started the next time you login. -msgstr -パネルを起動しますか? 起動した場合、ログアウト時にセッションを保存すれば次回 -ログイン時にパネルは自動起動されます。 +msgid Do you want to start the panel? If you do, make sure you save the session on logout, so the panel is automatically started the next time you login. +msgstr パネルを起動しますか? 起動した場合、ログアウト時にセッションを保存すれば次回ログイン時にパネルは自動起動されます。 -#: ../panel/main.c:408 ../panel/main.c:422 +#: ../panel/main.c:408 +#: ../panel/main.c:422 #, c-format msgid No running instance of %s was found msgstr 動作中の %s インスタンスが見つかりませんでした -#: ../panel/panel-application.c:196 +#: ../panel/panel-application.c:195 msgid Failed to launch the migration application msgstr 移行アプリケーションの起動に失敗しました -#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 -msgid -You have started X without session manager. Clicking Quit will close the X -server. -msgstr -セッションマネージャなしで X を起動した場合、「終了」をクリックすると X サー -バをクローズします。 +#: ../panel/panel-application.c:1464 +#: ../plugins/actions/actions.c:421 +msgid You have started X without session manager. Clicking Quit will close the X server. +msgstr セッションマネージャなしで X を起動した場合、「終了」をクリックすると X サーバをクローズします。 -#: ../panel/panel-application.c:1447 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1465 +#: ../plugins/actions/actions.c:422 msgid Are you sure you want to quit the panel? msgstr パネルを終了してもよろしいですか? -#:
[Xfce4-commits] xfce4-power-manager:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to b358d4966b6108d71d8c79677e74e691287924b1 (commit) from 747b3956d8f83a1c144a6f8de60f701bc33a274e (commit) commit b358d4966b6108d71d8c79677e74e691287924b1 Author: Masato Hashimoto hash...@xfce.org Date: Mon Feb 14 16:14:29 2011 +0100 l10n: Updated Japanese (ja) translation to 100% New status: 196 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 299 +++--- 1 files changed, 169 insertions(+), 130 deletions(-) diff --git a/po/ja.po b/po/ja.po index cc2a16e..8cd28e9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,8 +8,8 @@ msgid msgstr Project-Id-Version: xfce4-power-manager 0.6.0svn\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-10-05 23:02+0900\n -PO-Revision-Date: 2010-10-05 23:02+0900\n +POT-Creation-Date: 2011-02-15 00:13+0900\n +PO-Revision-Date: 2011-02-15 00:14+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese xfce-users...@ml.fdiary.net\n Language: ja\n @@ -47,10 +47,14 @@ msgid Consider the computer on low power at: msgstr コンピュータが低電力状態にあるとみなす充電率: #. Hibernate menu option -#: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:789 -#: ../settings/xfpm-settings.c:857 ../settings/xfpm-settings.c:995 -#: ../settings/xfpm-settings.c:1160 ../settings/xfpm-settings.c:1215 -#: ../settings/xfpm-settings.c:1265 ../src/xfpm-power.c:443 +#: ../data/interfaces/xfpm-settings.ui.h:8 +#: ../settings/xfpm-settings.c:789 +#: ../settings/xfpm-settings.c:857 +#: ../settings/xfpm-settings.c:995 +#: ../settings/xfpm-settings.c:1160 +#: ../settings/xfpm-settings.c:1215 +#: ../settings/xfpm-settings.c:1265 +#: ../src/xfpm-power.c:443 #: ../src/xfpm-power.c:704 msgid Hibernate msgstr ハイバネート @@ -59,7 +63,8 @@ msgstr ハイバネート msgid Lock screen when going for suspend/hibernate msgstr サスペンド/ハイバネートへ遷移中に画面をロックする -#: ../data/interfaces/xfpm-settings.ui.h:10 ../src/xfpm-power-common.c:132 +#: ../data/interfaces/xfpm-settings.ui.h:10 +#: ../src/xfpm-power-common.c:132 msgid Monitor msgstr モニタ @@ -67,9 +72,12 @@ msgstr モニタ msgid Monitor power management control msgstr モニタ電源管理制御 -#: ../data/interfaces/xfpm-settings.ui.h:12 ../settings/xfpm-settings.c:778 -#: ../settings/xfpm-settings.c:846 ../settings/xfpm-settings.c:984 -#: ../settings/xfpm-settings.c:1149 ../settings/xfpm-settings.c:1204 +#: ../data/interfaces/xfpm-settings.ui.h:12 +#: ../settings/xfpm-settings.c:778 +#: ../settings/xfpm-settings.c:846 +#: ../settings/xfpm-settings.c:984 +#: ../settings/xfpm-settings.c:1149 +#: ../settings/xfpm-settings.c:1204 #: ../settings/xfpm-settings.c:1254 msgid Nothing msgstr 何もしない @@ -84,8 +92,7 @@ msgstr 性能より省電力を優先する #: ../data/interfaces/xfpm-settings.ui.h:15 msgid Put display to sleep when computer is inactive for: -msgstr -コンピュータを操作していない状態でディスプレイをスリープするまでの時間: +msgstr コンピュータを操作していない状態でディスプレイをスリープするまでの時間: #: ../data/interfaces/xfpm-settings.ui.h:16 msgid Put the computer to sleep when inactive for: @@ -116,18 +123,21 @@ msgid Standby msgstr スタンバイ #. Suspend menu option -#: ../data/interfaces/xfpm-settings.ui.h:23 ../settings/xfpm-settings.c:783 -#: ../settings/xfpm-settings.c:851 ../settings/xfpm-settings.c:989 -#: ../settings/xfpm-settings.c:1154 ../settings/xfpm-settings.c:1209 -#: ../settings/xfpm-settings.c:1259 ../src/xfpm-power.c:458 +#: ../data/interfaces/xfpm-settings.ui.h:23 +#: ../settings/xfpm-settings.c:783 +#: ../settings/xfpm-settings.c:851 +#: ../settings/xfpm-settings.c:989 +#: ../settings/xfpm-settings.c:1154 +#: ../settings/xfpm-settings.c:1209 +#: ../settings/xfpm-settings.c:1259 +#: ../src/xfpm-power.c:458 #: ../src/xfpm-power.c:717 msgid Suspend msgstr サスペンド #: ../data/interfaces/xfpm-settings.ui.h:24 msgid Switch off display when computer is inactive for: -msgstr -コンピュータを操作していない状態でディスプレイの電源をオフにするまでの時間: +msgstr コンピュータを操作していない状態でディスプレイの電源をオフにするまでの時間: #: ../data/interfaces/xfpm-settings.ui.h:25 msgid System tray icon: @@ -154,13 +164,13 @@ msgid When sleep button is pressed: msgstr スリープボタンが押されたとき: #: ../data/interfaces/xfpm-settings.ui.h:31 -#: ../settings/xfpm-settings-main.c:121 ../src/xfpm-power.c:520 -#: ../src/xfpm-power.c:691 ../src/xfpm-main.c:415 -#: ../src/xfce4-power-manager.desktop.in.h:2 +#: ../settings/xfpm-settings-main.c:121 +#: ../src/xfpm-main.c:410 msgid Xfce Power Manager msgstr Xfce 電源管理 -#: ../settings/xfpm-settings.c:539 ../settings/xfpm-settings.c:554 +#: ../settings/xfpm-settings.c:539 +#: ../settings/xfpm-settings.c:554 #: ../settings/xfpm-settings.c:581 msgid Never msgstr しない @@ -169,24 +179,30 @@ msgstr しない msgid One minute msgstr 1 分 -#: ../settings/xfpm-settings.c:544 ../settings/xfpm-settings.c:556 +#: ../settings/xfpm-settings.c:544 +#: ../settings/xfpm-settings.c:556 msgid Minutes msgstr 分 -#: ../settings/xfpm-settings.c:558 ../settings/xfpm-settings.c:565
[Xfce4-commits] xfmpc:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 90cddecda09d79490a7f0c33f136cc27a4dd17cd (commit) from e663a21a5d2f458d6b7de3b1df6f2921eb00ad73 (commit) commit 90cddecda09d79490a7f0c33f136cc27a4dd17cd Author: Masato Hashimoto hash...@xfce.org Date: Mon Feb 14 16:15:42 2011 +0100 l10n: Updated Japanese (ja) translation to 100% New status: 58 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 14 +- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5d2d176..6927281 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2,7 +2,7 @@ # Copyright (C) 2008 the xfmpc's copyright holder # This file is distributed under the same license as the xfmpc package. # Nobuhiro Iwamatsu iwama...@nigauri.org, 2008. -# +# msgid msgstr Project-Id-Version: xfmpc 0.0.1\n @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2011-02-08 15:30+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: JAPANESE xfce-i...@xfce.org\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n X-Poedit-Language: Japanese\n X-Poedit-Country: JAPAN\n @@ -40,7 +40,7 @@ msgstr 一曲のみ #: ../src/extended-interface.c:325 msgid Consume -msgstr 使い捨て +msgstr 使いきり #: ../src/extended-interface.c:433 ../xfmpc.desktop.in.h:2 msgid MPD client written in GTK+ for Xfce @@ -120,12 +120,8 @@ msgid Use _default system settings msgstr デフォルトのシステム設定を使用する(_D) #: ../src/preferences-dialog.c:367 -msgid -If checked, Xfmpc will try to read the environment variables MPD_HOST and -MPD_PORT otherwise it will use localhost -msgstr -このオプションを有効にすると、Xfmpc は環境変数 MPD_HOST および MPD_PORT を読 -み込もうとし、なければ localhost を使用します +msgid If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost +msgstr このオプションを有効にすると、Xfmpc は環境変数 MPD_HOST および MPD_PORT を読み込もうとし、なければ localhost を使用します #: ../src/preferences-dialog.c:377 msgid Hostname: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Remove unused icon, add mention of gen-color-table.pl coming from gtk/gdk-pixbuf
Updating branch refs/heads/master
to 4f4065d259fb830b7a7804efb0f5549cf8afdb07 (commit)
from 1c42d2ec9f7fc562444989f619c6eeba80ac7629 (commit)
commit 4f4065d259fb830b7a7804efb0f5549cf8afdb07
Author: Olivier Fourdan four...@xfce.org
Date: Mon Feb 14 16:37:55 2011 +0100
Remove unused icon, add mention of gen-color-table.pl coming from
gtk/gdk-pixbuf
AUTHORS |3 +
src/Makefile.am |7 -
src/inline-tabwin-icon.h | 457 --
src/tabwin-icon.png | Bin 1011 - 0 bytes
src/tabwin.c |1 -
5 files changed, 3 insertions(+), 465 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 0ae8d9d..b2906eb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,3 +32,6 @@ Metacity: Havoc Pennington h...@redhat.com
Sawfish: John Harper j...@unfactored.org
xcompmgr: Copyright � 2003 Keith Packard
+gen-color-table.pl comes from gtk/gdk-pixbuf/gen-color-table.pl and has been
+copied as is without any modification so original copyright/license remain on
+this file.
diff --git a/src/Makefile.am b/src/Makefile.am
index 10280a9..c1e2789 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,6 @@ xfwm4_SOURCES =
\
inline-stock-rolldown.h \
inline-stock-rollup.h \
inline-stock-unmaximize.h \
- inline-tabwin-icon.h\
keyboard.c \
keyboard.h \
main.c \
@@ -113,7 +112,6 @@ xfwm4_LDADD =
\
EXTRA_DIST = \
inline-default-icon.h default_icon.png default_icon.svg \
- inline-tabwin-icon.h tabwin-icon.png\
inline-stock-maximize.h stock_maximize.png \
inline-stock-unmaximize.h stock_unmaximize.png \
inline-stock-minimize.h stock_minimize.png \
@@ -123,7 +121,6 @@ EXTRA_DIST =
\
noinst_DATA = \
inline-default-icon.h default_icon.png default_icon.svg \
- inline-tabwin-icon.h tabwin-icon.png\
inline-stock-maximize.h stock_maximize.png \
inline-stock-unmaximize.h stock_unmaximize.png \
inline-stock-minimize.h stock_minimize.png \
@@ -133,10 +130,6 @@ noinst_DATA =
\
build.h:
$(AM_V_GEN) echo #define BUILD_ID \`date +%H%M-%y%m%d`\ build.h
-inline-tabwin-icon.h: $(srcdir)/tabwin-icon.png
- $(AM_V_GEN) gdk-pixbuf-csource --raw --build-list \
- tabwin_icon_data $(srcdir)/tabwin-icon.png inline-tabwin-icon.h
-
inline-default-icon.h: $(srcdir)/default_icon.png
$(AM_V_GEN) gdk-pixbuf-csource --raw --build-list \
default_icon_data $(srcdir)/default_icon.png inline-default-icon.h
diff --git a/src/inline-tabwin-icon.h b/src/inline-tabwin-icon.h
deleted file mode 100644
index 220f5ca..000
--- a/src/inline-tabwin-icon.h
+++ /dev/null
@@ -1,457 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump */
-
-#ifdef __SUNPRO_C
-#pragma align 4 (tabwin_icon_data)
-#endif
-#ifdef __GNUC__
-static const guint8 tabwin_icon_data[] __attribute__ ((__aligned__ (4))) =
-#else
-static const guint8 tabwin_icon_data[] =
-#endif
-{
- /* Pixbuf magic (0x47646b50) */
- GdkP
- /* length: header (24) + pixel_data (9216) */
- \0\0$\30
- /* pixdata_type (0x1010002) */
- \1\1\0\2
- /* rowstride (192) */
- \0\0\0\300
- /* width (48) */
- \0\0\00
- /* height (48) */
- \0\0\00
- /* pixel_data: */
- \377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
- \0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
- \0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
- \0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
- \0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
- \0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
- \0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
- \0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
- \0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
- \0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377
-
[Xfce4-commits] xfce4-session:master Add missing license information (bug #7240).
Updating branch refs/heads/master
to 71565e883e00f6dc5a6f2263a31c8e620a662f80 (commit)
from 5d15e2da8b7ef161a58673d05377e34e100062b2 (commit)
commit 71565e883e00f6dc5a6f2263a31c8e620a662f80
Author: Jérôme Guelfucci jero...@xfce.org
Date: Mon Feb 14 17:17:32 2011 +0100
Add missing license information (bug #7240).
AUTHORS |2 ++
engines/balou/gnome-uri.c | 21 -
engines/balou/gnome-uri.h | 20 +++-
3 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 72dea60..0fc5616 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,3 +6,5 @@ Brian Tarricone kel...@xfce.org
Jani Monoses j...@ubuntu.com
Parts of the code were copied from gnome-session and ksmserver.
+engines/mice/{preview,slide}.png were created by François Leclanché
+engines/simple/{preview,fallback}.png were created by Bennedikt Meurer
diff --git a/engines/balou/gnome-uri.c b/engines/balou/gnome-uri.c
index 7f669ed..29748b0 100644
--- a/engines/balou/gnome-uri.c
+++ b/engines/balou/gnome-uri.c
@@ -1,4 +1,23 @@
-/* $Id$ */
+/*
+ * Copyright (C) 1998 Miguel de Icaza
+ * Copyright (C) 1997 Paolo Molaro
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
#ifdef HAVE_CONFIG_H
#include config.h
diff --git a/engines/balou/gnome-uri.h b/engines/balou/gnome-uri.h
index 888915e..94ef2a8 100644
--- a/engines/balou/gnome-uri.h
+++ b/engines/balou/gnome-uri.h
@@ -1,4 +1,22 @@
-/* $Id$ */
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
#ifndef __GNOME_URI_H__
#define __GNOME_URI_H__
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:xfce-4.8 Don't fallback to system icon in the logout dialog (bug #7196).
Updating branch refs/heads/xfce-4.8 to 0dc712a14c3ba814606868653b7430b3c7b84b5e (commit) from 30d17cd5eb7443b6bc75842cec2af7bf6d502f57 (commit) commit 0dc712a14c3ba814606868653b7430b3c7b84b5e Author: Lionel Le Folgoc mrpo...@gmail.com Date: Mon Jan 31 19:23:26 2011 +0100 Don't fallback to system icon in the logout dialog (bug #7196). GTK_ICON_LOOKUP_GENERIC_FALLBACK caused gtk+ to look for system if system-* was not found and system exists in most icon themes so the xfsm-* fallback icons were never used. xfce4-session/shutdown.c | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c index fb2bd04..fa4115e 100644 --- a/xfce4-session/shutdown.c +++ b/xfce4-session/shutdown.c @@ -405,7 +405,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea icon = gtk_icon_theme_load_icon (icon_theme, system-log-out, 32, - GTK_ICON_LOOKUP_GENERIC_FALLBACK, + 0, NULL); if (!icon) icon = gtk_icon_theme_load_icon (icon_theme, @@ -439,7 +439,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea icon = gtk_icon_theme_load_icon (icon_theme, system-reboot, 32, - GTK_ICON_LOOKUP_GENERIC_FALLBACK, + 0, NULL); if (!icon) @@ -481,7 +481,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea icon = gtk_icon_theme_load_icon (icon_theme, system-shutdown, 32, - GTK_ICON_LOOKUP_GENERIC_FALLBACK, + 0, NULL); if (!icon) @@ -543,7 +543,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea icon = gtk_icon_theme_load_icon (icon_theme, system-suspend, 32, - GTK_ICON_LOOKUP_GENERIC_FALLBACK, + 0, NULL); if (!icon) @@ -581,7 +581,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea icon = gtk_icon_theme_load_icon (icon_theme, system-hibernate, 32, - GTK_ICON_LOOKUP_GENERIC_FALLBACK, + 0, NULL); if (!icon) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:xfce-4.8 Add missing license information (bug #7240).
Updating branch refs/heads/xfce-4.8
to de82e2ff1e3da754f6e90d5378e96749904f22a4 (commit)
from 959a69ba29f8b0fa50719161006be604dd93f606 (commit)
commit de82e2ff1e3da754f6e90d5378e96749904f22a4
Author: Jérôme Guelfucci jero...@xfce.org
Date: Mon Feb 14 17:17:32 2011 +0100
Add missing license information (bug #7240).
AUTHORS |2 ++
engines/balou/gnome-uri.c | 21 -
engines/balou/gnome-uri.h | 20 +++-
3 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 72dea60..0fc5616 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,3 +6,5 @@ Brian Tarricone kel...@xfce.org
Jani Monoses j...@ubuntu.com
Parts of the code were copied from gnome-session and ksmserver.
+engines/mice/{preview,slide}.png were created by François Leclanché
+engines/simple/{preview,fallback}.png were created by Bennedikt Meurer
diff --git a/engines/balou/gnome-uri.c b/engines/balou/gnome-uri.c
index 7f669ed..29748b0 100644
--- a/engines/balou/gnome-uri.c
+++ b/engines/balou/gnome-uri.c
@@ -1,4 +1,23 @@
-/* $Id$ */
+/*
+ * Copyright (C) 1998 Miguel de Icaza
+ * Copyright (C) 1997 Paolo Molaro
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
#ifdef HAVE_CONFIG_H
#include config.h
diff --git a/engines/balou/gnome-uri.h b/engines/balou/gnome-uri.h
index 888915e..94ef2a8 100644
--- a/engines/balou/gnome-uri.h
+++ b/engines/balou/gnome-uri.h
@@ -1,4 +1,22 @@
-/* $Id$ */
+/*
+ * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
#ifndef __GNOME_URI_H__
#define __GNOME_URI_H__
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:xfce-4.8 Fix --fast CLI option when used with another option (bug #7197).
Updating branch refs/heads/xfce-4.8
to 959a69ba29f8b0fa50719161006be604dd93f606 (commit)
from e7809b1bbaee7b88404843667cd611c583854331 (commit)
commit 959a69ba29f8b0fa50719161006be604dd93f606
Author: Krzysiek krzysiek.b...@gmail.com
Date: Wed Feb 2 17:33:21 2011 +0100
Fix --fast CLI option when used with another option (bug #7197).
xfce4-session-logout/main.c |9 +
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c
index 5ae3314..705fad5 100644
--- a/xfce4-session-logout/main.c
+++ b/xfce4-session-logout/main.c
@@ -154,10 +154,6 @@ main (int argc, char **argv)
{
shutdown_type = XFSM_SHUTDOWN_HIBERNATE;
}
- else if (opt_fast)
-{
- allow_save = FALSE;
-}
else if (opt_version)
{
printf (%s (Xfce %s)\n\n
@@ -170,6 +166,11 @@ main (int argc, char **argv)
return EXIT_SUCCESS;
}
+ if (opt_fast)
+{
+ allow_save = FALSE;
+}
+
dbus_error_init (derror);
dbus_conn = dbus_bus_get (DBUS_BUS_SESSION, derror);
if (G_UNLIKELY (dbus_conn == NULL))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:xfce-4.8 Fix error pop up when clicking session menu item (bug #7123).
Updating branch refs/heads/xfce-4.8 to e7809b1bbaee7b88404843667cd611c583854331 (commit) from 0dc712a14c3ba814606868653b7430b3c7b84b5e (commit) commit e7809b1bbaee7b88404843667cd611c583854331 Author: Lionel Le Folgoc mrpo...@gmail.com Date: Wed Feb 2 17:28:01 2011 +0100 Fix error pop up when clicking session menu item (bug #7123). panel-plugin/xfsm-logout-plugin.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c index fcb1680..b8e25ab 100644 --- a/panel-plugin/xfsm-logout-plugin.c +++ b/panel-plugin/xfsm-logout-plugin.c @@ -174,7 +174,7 @@ xfsm_logout_plugin_do_dbus_call(XfsmLogoutPlugin *logout_plugin, ret = dbus_g_proxy_call(proxy, Shutdown, error, G_TYPE_UINT, type, G_TYPE_BOOLEAN, logout_plugin-allow_save, -G_TYPE_INVALID); +G_TYPE_INVALID, G_TYPE_INVALID); g_object_unref(G_OBJECT(proxy)); return ret; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session|xfce4-session-4.8.1 Creating annotated tag xfce4-session-4.8.1
Updating annotated tag refs/tags/xfce4-session-4.8.1 as new annotated tag to e18b5a7999f44a3cdb4cdf1e3ac67f143fd30c9a (tag) succeeds xfce4-session-4.8.0 tagged by Jérôme Guelfucci jero...@xfce.org on 2011-02-14 17:40 + Aleksandr Ponomarenko (1): l10n: Updated Russian (ru) translation to 100% Daniel Nylander (1): l10n: Updated Swedish (sv) translation to 30% Jérôme Guelfucci (3): Update FSF address. Add missing license information (bug #7240). Release 4.8.1! Krzysiek (1): Fix --fast CLI option when used with another option (bug #7197). Lionel Le Folgoc (2): Don't fallback to system icon in the logout dialog (bug #7196). Fix error pop up when clicking session menu item (bug #7123). Mike Massonnet (2): l10n: Updated French (fr) translation to 100% l10n: Updated French (fr) translation to 100% Nick Schermer (1): Post release tag bump. Özgür Kuru (1): l10n: Updated Turkish (tr) translation to 97% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-power-manager:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to e4ca7175d2e4cbd220bef232e38efa82156a90cb (commit) from b358d4966b6108d71d8c79677e74e691287924b1 (commit) commit e4ca7175d2e4cbd220bef232e38efa82156a90cb Author: Cristian Marchi cri.pe...@gmail.com Date: Mon Feb 14 20:38:51 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 196 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 34 -- 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/po/it.po b/po/it.po index 45c4ded..3838eee 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-power-manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-15 11:03+\n +POT-Creation-Date: 2011-02-14 17:03+\n PO-Revision-Date: 2010-12-23 21:06+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n @@ -160,9 +160,7 @@ msgid When sleep button is pressed: msgstr Alla pressione del pulsante addormenta: #: ../data/interfaces/xfpm-settings.ui.h:31 -#: ../settings/xfpm-settings-main.c:121 ../src/xfpm-power.c:520 -#: ../src/xfpm-power.c:691 ../src/xfpm-main.c:410 -#: ../src/xfce4-power-manager.desktop.in.h:2 +#: ../settings/xfpm-settings-main.c:121 ../src/xfpm-main.c:410 msgid Xfce Power Manager msgstr Gestore di energia di Xfce @@ -325,16 +323,15 @@ msgid Xfce4 Power Manager is not running, do you want to launch it now? msgstr Il gestore di energia di Xfce4 non è in esecuzione; avviarlo ora? #: ../settings/xfce4-power-manager-settings.desktop.in.h:1 +#: ../src/xfpm-power.c:300 ../src/xfpm-power.c:520 ../src/xfpm-power.c:655 +#: ../src/xfpm-power.c:691 ../src/xfpm-power.c:843 ../src/xfpm-power.c:857 +#: ../src/xfpm-battery.c:229 ../src/xfce4-power-manager.desktop.in.h:1 msgid Power Manager msgstr Gestore di energia #: ../settings/xfce4-power-manager-settings.desktop.in.h:2 -msgid Settings for the Xfce 4 Power Manager -msgstr Impostazioni per il gestore di energia di Xfce4 - -#: ../settings/xfce4-power-manager-settings.desktop.in.h:3 -msgid Xfce 4 Power Manager -msgstr Gestore di energia di Xfce4 +msgid Settings for the Xfce Power Manager +msgstr Impostazioni per il gestore di energia di Xfce #: ../common/xfpm-common.c:155 msgid translator-credits @@ -343,11 +340,6 @@ msgstr Gianluca Foddis gianluca.fod...@gmail.com\n Cristian Marchi cri.pe...@gmail.com, 2009 -#: ../src/xfpm-power.c:300 ../src/xfpm-power.c:655 ../src/xfpm-power.c:843 -#: ../src/xfpm-power.c:857 ../src/xfpm-battery.c:229 -msgid Xfce power manager -msgstr Gestore di energia di Xfce - #: ../src/xfpm-power.c:323 msgid An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to hibernate the system? msgstr Un'applicazione sta inibendo l'addormentamento automatico; continuando si potrebbe danneggiare lo stato dell'applicazione. Ibernare davvero il sistema? @@ -361,8 +353,8 @@ msgid All running instances of the power manager will exit msgstr Tutte le istanze in esecuzione del gestore di energia verranno chiuse #: ../src/xfpm-power.c:424 -msgid Quit Xfce power manager? -msgstr Uscire dal gestore di energia di Xfce? +msgid Quit the power manager? +msgstr Uscire dal gestore di energia? #. Power information #: ../src/xfpm-power.c:494 ../src/xfpm-power-info.c:818 @@ -964,7 +956,7 @@ msgstr Comando msgid Details msgstr Dettagli -#: ../src/xfce4-power-manager.desktop.in.h:1 +#: ../src/xfce4-power-manager.desktop.in.h:2 msgid Power management for the Xfce desktop msgstr Gestione dell'energia per l'ambiente Xfce @@ -982,6 +974,12 @@ msgstr Nessun dispositivo trovato msgid Brightness plugin msgstr Plugin della luminosità +#~ msgid Xfce 4 Power Manager +#~ msgstr Gestore di energia di Xfce4 + +#~ msgid Xfce power manager +#~ msgstr Gestore di energia di Xfce + #~ msgid With HAL support\n #~ msgstr Con supporto ad HAL\n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 4e34221575694c6d4acacc4a4252e178e89c09c2 (commit) from 41474f1bf32ca592544cc4e3741b0320a7143b58 (commit) commit 4e34221575694c6d4acacc4a4252e178e89c09c2 Author: Cristian Marchi cri.pe...@gmail.com Date: Mon Feb 14 20:40:59 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 48 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 81 ++ 1 files changed, 34 insertions(+), 47 deletions(-) diff --git a/po/it.po b/po/it.po index 3fa03cd..cee6a5f 100644 --- a/po/it.po +++ b/po/it.po @@ -2,22 +2,21 @@ # Copyright (C) YEAR THE tumbler'S COPYRIGHT HOLDER # This file is distributed under the same license as the tumbler package. # Cristian Marchi cri.pe...@gmail.com, 2010. -# +# msgid msgstr Project-Id-Version: tumbler\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 14:48+0100\n +POT-Creation-Date: 2011-02-14 17:02+\n PO-Revision-Date: 2010-06-26 08:57+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n -Language-Team: Italian Translation Team xfce-it-translators@googlegroups. -com\n -Language: \n +Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n -#: ../tumblerd/tumbler-cache-service.c:383 +#: ../tumblerd/tumbler-cache-service.c:416 #, c-format msgid Another thumbnail cache service is already running msgstr Un altro servizio di cache delle miniature è già in esecuzione @@ -28,89 +27,86 @@ msgstr Un altro servizio di cache delle miniature è già in esecuzione msgid No thumbnailer available for \%s\ msgstr Nessun creatore di miniature disponibile per \%s\ -#: ../tumblerd/tumbler-service.c:751 +#: ../tumblerd/tumbler-lifecycle-manager.c:207 +msgid The thumbnailer service is shutting down +msgstr Il servizio delle miniature si sta spegnendo + +#: ../tumblerd/tumbler-service.c:760 #, c-format msgid Another generic thumbnailer is already running msgstr Un altro creatore di miniature generico è già in esecuzione -#: ../tumblerd/tumbler-service.c:867 +#: ../tumblerd/tumbler-service.c:878 msgid Unsupported thumbnail flavor requested msgstr Richiesta di tipo di miniatura non valida #: ../tumblerd/tumbler-specialized-thumbnailer.c:461 msgid Failed to call the specialized thumbnailer: timeout -msgstr -Chiamata del creatore di miniature specializzato non riuscita: tempo scaduto +msgstr Chiamata del creatore di miniature specializzato non riuscita: tempo scaduto #: ../tumblerd/tumbler-specialized-thumbnailer.c:470 #, c-format msgid Failed to call the specialized thumbnailer: %s msgstr Chiamata del creatore di miniature specializzato non riuscita: %s -#: ../tumblerd/tumbler-manager.c:467 ../tumblerd/tumbler-manager.c:873 +#: ../tumblerd/tumbler-manager.c:468 ../tumblerd/tumbler-manager.c:874 #, c-format msgid Failed to load the file \%s\: %s msgstr Caricamento del file \%s\ non riuscito: %s -#: ../tumblerd/tumbler-manager.c:485 ../tumblerd/tumbler-manager.c:499 -#: ../tumblerd/tumbler-manager.c:513 +#: ../tumblerd/tumbler-manager.c:486 ../tumblerd/tumbler-manager.c:500 +#: ../tumblerd/tumbler-manager.c:514 #, c-format msgid Malformed section \%s\ in file \%s\: %s msgstr Sezione malformata \%s\ nel file «%s»: %s -#: ../tumblerd/tumbler-manager.c:526 +#: ../tumblerd/tumbler-manager.c:527 #, c-format -msgid -Malformed section \%s\ in file \%s\: Mismatch between section name and -UriScheme/MimeType -msgstr -Sezione malformata \%s\ nel file «%s»: mancata corrispondenza tra il nome -della sezione e UriScheme/MimeType +msgid Malformed section \%s\ in file \%s\: Mismatch between section name and UriScheme/MimeType +msgstr Sezione malformata \%s\ nel file «%s»: mancata corrispondenza tra il nome della sezione e UriScheme/MimeType -#: ../tumblerd/tumbler-manager.c:886 ../tumblerd/tumbler-manager.c:900 -#: ../tumblerd/tumbler-manager.c:914 +#: ../tumblerd/tumbler-manager.c:887 ../tumblerd/tumbler-manager.c:901 +#: ../tumblerd/tumbler-manager.c:915 #, c-format msgid Malformed file \%s\: %s msgstr File «%s» formattato non correttamente: %s -#: ../tumblerd/tumbler-manager.c:940 +#: ../tumblerd/tumbler-manager.c:941 #, c-format msgid Failed to determine last modified time of \%s\ msgstr Impossibile determinare la data dell'ultima modifica di \%s\ -#: ../tumblerd/tumbler-manager.c:1849 +#: ../tumblerd/tumbler-manager.c:1854 #, c-format msgid Another thumbnailer manager is already running msgstr Un altro gestore di miniature è già in esecuzione #. set the application name. Translators: Don't translate Tumbler. -#: ../tumblerd/main.c:63 +#: ../tumblerd/main.c:78 msgid Tumbler Thumbnailing Service msgstr Servizio di miniaturizzazione Tumbler -#: ../tumblerd/main.c:78 +#:
[Xfce4-commits] xfce4-panel:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to e1aa36e3cabb3e22d1727d4c335a9115b6bf56b9 (commit) from 167880f69199e38756b2260dc5f8c5c46bb5f7c0 (commit) commit e1aa36e3cabb3e22d1727d4c335a9115b6bf56b9 Author: Cristian Marchi cri.pe...@gmail.com Date: Mon Feb 14 21:05:12 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 345 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 291 + 1 files changed, 100 insertions(+), 191 deletions(-) diff --git a/po/it.po b/po/it.po index 693cf6e..5bb263b 100644 --- a/po/it.po +++ b/po/it.po @@ -4,27 +4,23 @@ # Alex Dupre a...@freebsd.org, 2004. # Luca Marrocco buil...@libero.it, 2005. # Cristian Marchi cri.pa...@gmail.com, 2009. -# +# msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:01+0100\n +POT-Creation-Date: 2011-02-14 17:10+\n PO-Revision-Date: 2010-07-03 11:07+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n -Language-Team: Italian Translation Team xfce-it-translators@googlegroups. -com\n -Language: \n +Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../panel-desktop-handler.desktop.in.h:1 -msgid -Add a new launcher to the panel based on the information of this desktop file -msgstr -Aggiunge un nuovo avviatore sul pannello sulla base delle informazioni -contenute in questo file desktop +msgid Add a new launcher to the panel based on the information of this desktop file +msgstr Aggiunge un nuovo avviatore sul pannello sulla base delle informazioni contenute in questo file desktop # GLOSSARIO # failed to = impossibile... @@ -48,7 +44,7 @@ msgid Customize the panel msgstr Personalizzazione del pannello #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2261 #: ../migrate/main.c:84 msgid Panel msgstr Pannello @@ -58,12 +54,8 @@ msgid _Read Online msgstr _Leggi online #: ../common/panel-utils.c:156 -msgid -You can read the user manual online. This manual may however not exactly -match your panel version. -msgstr -È possibile leggere il manuale utente online. Questo manuale potrebbe -comunque non corrispondere alla propria versione del pannello. +msgid You can read the user manual online. This manual may however not exactly match your panel version. +msgstr È possibile leggere il manuale utente online. Questo manuale potrebbe comunque non corrispondere alla propria versione del pannello. #: ../common/panel-utils.c:158 msgid The user manual is not installed on your computer @@ -96,17 +88,17 @@ msgid Pane_l msgstr _Pannello #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2273 msgid Add _New Items... msgstr A_ggiungi nuovi elementi... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2284 msgid Panel Pr_eferences... msgstr _Preferenze del pannello... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2300 msgid Log _Out msgstr _Esci @@ -206,53 +198,39 @@ msgid Failed to send D-Bus message msgstr Impossibile inviare il messaggio D-Bus #: ../panel/main.c:405 -msgid -Do you want to start the panel? If you do, make sure you save the session on -logout, so the panel is automatically started the next time you login. -msgstr -Avviare il pannello? se sì, salvare la sessione all'uscita, in modo che il -pannello venga avviato automaticamente al prossimo riavvio della sessione. +msgid Do you want to start the panel? If you do, make sure you save the session on logout, so the panel is automatically started the next time you login. +msgstr Avviare il pannello? se sì, salvare la sessione all'uscita, in modo che il pannello venga avviato automaticamente al prossimo riavvio della sessione. #: ../panel/main.c:408 ../panel/main.c:422 #, c-format msgid No running instance of %s was found msgstr Non è stata trovata alcuna istanza di %s in esecuzione -#: ../panel/panel-application.c:196 +#: ../panel/panel-application.c:195 msgid Failed to launch the migration application msgstr Avvio dell'applicazione di migrazione non riuscito -#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 -msgid -You have started X without session manager. Clicking Quit will close the X -server. -msgstr -X è stato avviato senza gestore di sessione.
[Xfce4-commits] xfce4-session:master l10n: Updated Italian (it) translation to 98%
Updating branch refs/heads/master to 1e069769a687699f5431930648892b870767bfc0 (commit) from 9fbbe882453161d92af67efee140e7c6c9ee2ca3 (commit) commit 1e069769a687699f5431930648892b870767bfc0 Author: Cristian Marchi cri.pe...@gmail.com Date: Mon Feb 14 21:06:56 2011 +0100 l10n: Updated Italian (it) translation to 98% New status: 97 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/it.po |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/doc/manual/po/it.po b/doc/manual/po/it.po index da140ca..42f1cc0 100644 --- a/doc/manual/po/it.po +++ b/doc/manual/po/it.po @@ -426,8 +426,9 @@ msgid Whether or not the user is allowed to customize the security settings. Th msgstr Se all'utente è permesso personalizzare le impostazioni di sicurezza. Questa è una delle impostazioni più emphasisIMPORTANTI/emphasis dato che impedisce agli utenti (effettivamente filenamelibICE/filename) di collegarsi a una porta TCP. #: xfce4-session.xml446(term) +#, fuzzy msgid Shutdown -msgstr Spegnimento +msgstr Shutdown #: xfce4-session.xml448(para) msgid Whether or not the user is allowed to shutdown (reboot or poweroff) the system. If a user lacks this capability the reboot and poweroff options in the shutdown dialog will be greyed out. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 56d1b4f4db7b9e0a2f129bd1247a53e1b2e1a516 (commit) from 1e069769a687699f5431930648892b870767bfc0 (commit) commit 56d1b4f4db7b9e0a2f129bd1247a53e1b2e1a516 Author: Cristian Marchi cri.pe...@gmail.com Date: Mon Feb 14 21:07:15 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 98 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/it.po |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/doc/manual/po/it.po b/doc/manual/po/it.po index 42f1cc0..509d0b1 100644 --- a/doc/manual/po/it.po +++ b/doc/manual/po/it.po @@ -426,7 +426,6 @@ msgid Whether or not the user is allowed to customize the security settings. Th msgstr Se all'utente è permesso personalizzare le impostazioni di sicurezza. Questa è una delle impostazioni più emphasisIMPORTANTI/emphasis dato che impedisce agli utenti (effettivamente filenamelibICE/filename) di collegarsi a una porta TCP. #: xfce4-session.xml446(term) -#, fuzzy msgid Shutdown msgstr Shutdown ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:xfce-4.8 l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/xfce-4.8 to 2558a5dcf0141665f9cf30710eadd54580abb1ca (commit) from b07d93898c59086196580f36e9c2859734f69b9d (commit) commit 2558a5dcf0141665f9cf30710eadd54580abb1ca Author: Cristian Marchi cri.pe...@gmail.com Date: Mon Feb 14 21:08:08 2011 +0100 l10n: Updated Italian (it) translation to 100% New status: 98 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/it.po | 208 ++- 1 files changed, 105 insertions(+), 103 deletions(-) diff --git a/doc/manual/po/it.po b/doc/manual/po/it.po index 10de3ae..15e33b1 100644 --- a/doc/manual/po/it.po +++ b/doc/manual/po/it.po @@ -14,209 +14,212 @@ msgstr X-Poedit-Language: Italian\n X-Poedit-Country: ITALY\n -#. When image changes, this message will be marked fuzzy or untranslated for you. +#. When image changes, this message will be marked fuzzy or untranslated for +#. you. #. It doesn't matter what you translate it to: it's not used at all. -#: ./xfce4-session.xml:107(None) +#: xfce4-session.xml107(None) msgid @@image: 'images/xfsm-general.png'; md5=f99eebd11a391ab3ecd0c038c0683b13 msgstr @@image: 'images/xfsm-general.png'; md5=f99eebd11a391ab3ecd0c038c0683b13 -#. When image changes, this message will be marked fuzzy or untranslated for you. +#. When image changes, this message will be marked fuzzy or untranslated for +#. you. #. It doesn't matter what you translate it to: it's not used at all. -#: ./xfce4-session.xml:155(None) +#: xfce4-session.xml155(None) msgid @@image: 'images/xfsm-advanced.png'; md5=ce9a552111026488b3ae76233eaa69d4 msgstr @@image: 'images/xfsm-advanced.png'; md5=ce9a552111026488b3ae76233eaa69d4 -#. When image changes, this message will be marked fuzzy or untranslated for you. +#. When image changes, this message will be marked fuzzy or untranslated for +#. you. #. It doesn't matter what you translate it to: it's not used at all. -#: ./xfce4-session.xml:218(None) +#: xfce4-session.xml218(None) msgid @@image: 'images/xfsm-splash.png'; md5=126a4b2c7239f53cfa475468eac8cd99 msgstr @@image: 'images/xfsm-splash.png'; md5=126a4b2c7239f53cfa475468eac8cd99 -#: ./xfce4-session.xml:14(title) +#: xfce4-session.xml14(title) msgid Xfce 4 Session Manager msgstr Gestore di sessione di Xfce 4 -#: ./xfce4-session.xml:17(year) +#: xfce4-session.xml17(year) msgid 2003 msgstr 2003 -#: ./xfce4-session.xml:18(year) +#: xfce4-session.xml18(year) msgid 2004 msgstr 2004 -#: ./xfce4-session.xml:19(year) +#: xfce4-session.xml19(year) msgid 2005 msgstr 2005 -#: ./xfce4-session.xml:20(holder) +#: xfce4-session.xml20(holder) msgid Benedikt Meurer msgstr Benedikt Meurer -#: ./xfce4-session.xml:33(para) +#: xfce4-session.xml33(para) msgid Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. The complete license text is available from the ulink type=\http\ url=\http://www.gnu.org/\;Free Software Foundation/ulink. msgstr È garantito il diritto di copiare, distribuire e/o modificare questo documento nel rispetto dei termini della licenza GNU Free Documentation License, versione 1.1 o qualsiasi versione successiva pubblicata dalla Free Software Foundation; senza Invariant Section senza testi di Front-Cover e senza testi di Back-Cover. Il testo della licenza completa è reso disponibile dalla ulink type=\http\ url=\http://www.gnu.org/\;Free Software Foundation/ulink. -#: ./xfce4-session.xml:45(firstname) +#: xfce4-session.xml45(firstname) msgid Benedikt msgstr Benedikt -#: ./xfce4-session.xml:46(surname) +#: xfce4-session.xml46(surname) msgid Meurer msgstr Meurer -#: ./xfce4-session.xml:48(email) +#: xfce4-session.xml48(email) msgid be...@xfce.org msgstr be...@xfce.org -#: ./xfce4-session.xml:49(orgname) +#: xfce4-session.xml49(orgname) msgid os-cillation msgstr os-cillation -#: ./xfce4-session.xml:50(orgdiv) +#: xfce4-session.xml50(orgdiv) msgid System development msgstr Sviluppatore di sistema -#: ./xfce4-session.xml:51(jobtitle) +#: xfce4-session.xml51(jobtitle) msgid Software developer msgstr Sviluppatore di programmi -#: ./xfce4-session.xml:69(releaseinfo) +#: xfce4-session.xml69(releaseinfo) msgid This manual describes the application@PACKAGE_NAME@/application package, version @PACKAGE_VERSION@. msgstr Questo manuale descrive application@PACKAGE_NAME@/application versione @PACKAGE_VERSION@. -#: ./xfce4-session.xml:78(title) +#: xfce4-session.xml78(title) msgid Introduction msgstr Introduzione -#: ./xfce4-session.xml:80(para) +#: xfce4-session.xml80(para) msgid application@PACKAGE_NAME@/application is a session manager for Xfce 4. Its task is to save the state of your
[Xfce4-commits] postler:master Use g_content_type_get_icon for attachment icons
Updating branch refs/heads/master
to 40bec2e857e111c28a92baae61d5a25e52fe60b1 (commit)
from f5c394902a44b6b950c53732d796b436f6ccd17c (commit)
commit 40bec2e857e111c28a92baae61d5a25e52fe60b1
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Feb 14 23:59:17 2011 +0100
Use g_content_type_get_icon for attachment icons
postler/postler-attachments.vala | 21 +
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/postler/postler-attachments.vala b/postler/postler-attachments.vala
index d1a6555..97cefcb 100644
--- a/postler/postler-attachments.vala
+++ b/postler/postler-attachments.vala
@@ -116,24 +116,6 @@ public class Postler.Attachments : Gtk.IconView {
} while (model.iter_next (ref iter));
}
-string icon_name_for_mime_type (string mime_type) {
-var icon_theme = Gtk.IconTheme.get_for_screen (get_screen ());
-var parts = mime_type.split (/, 2);
-string icon_name = parts[0] + - + parts[1];
-if (icon_theme.has_icon (icon_name))
-return icon_name;
-icon_name = gnome-mime- + parts[0] + - + parts[1];
-if (icon_theme.has_icon (icon_name))
-return icon_name;
-icon_name = parts[0] + -x-generic;
-if (icon_theme.has_icon (icon_name))
-return icon_name;
-icon_name = gnome-mime- + parts[0] + -x-generic;
-if (icon_theme.has_icon (icon_name))
-return icon_name;
-return application-x-executable;
-}
-
void render_pixbuf (Gtk.CellLayout layout, Gtk.CellRenderer cell,
Gtk.TreeModel model, Gtk.TreeIter iter) {
@@ -144,8 +126,7 @@ public class Postler.Attachments : Gtk.IconView {
MessagePart part;
model.get (iter, 0, out part);
-string icon_name = icon_name_for_mime_type (part.mime_type);
-cell.set (icon-name, icon_name,
+cell.set (gicon, g_content_type_get_icon (part.mime_type),
stock-size, attachment_icon_size);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Reset message parts when clearing content
Updating branch refs/heads/master
to 90b6353f02dae024fc3cf7ef52c9ca364dce2488 (commit)
from 40bec2e857e111c28a92baae61d5a25e52fe60b1 (commit)
commit 90b6353f02dae024fc3cf7ef52c9ca364dce2488
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Feb 15 00:00:43 2011 +0100
Reset message parts when clearing content
postler/postler-content.vala |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 980844d..0f3ff11 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -306,6 +306,8 @@ public class Postler.Content : WebKit.WebView {
last_location = null;
reply_to = null;
reply_to_all = null;
+message_parts = null;
+notify_property (message-parts);
load_string (, text/plain, UTF-8, about:blank);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Add Report a Problem... to the app menu
Updating branch refs/heads/master
to 8c2f4a028b86744348d877e68d444aefc6cb1dbb (commit)
from 9dc4ddf16b8487223e38a3091748ca409651b165 (commit)
commit 8c2f4a028b86744348d877e68d444aefc6cb1dbb
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Feb 15 00:20:38 2011 +0100
Add Report a Problem... to the app menu
Fixes: https://bugs.launchpad.net/postler/+bug/718943
postler/postler-app.vala|2 ++
postler/postler-bureau.vala |7 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/postler/postler-app.vala b/postler/postler-app.vala
index 9d3b878..5d09869 100644
--- a/postler/postler-app.vala
+++ b/postler/postler-app.vala
@@ -44,6 +44,7 @@ namespace Postler {
const string STOCK_OUTBOX = mail-outbox;
const string STOCK_SENT_MAIL = mail-sent;
const string STOCK_USER_TRASH = user-trash;
+const string STOCK_REPORT_BUG = lpi-bug;
}
public class Postler.App : Unique.App {
@@ -101,6 +102,7 @@ public class Postler.App : Unique.App {
{ STOCK_IMAGE, null, 0, 0, gnome-mime-image },
{ STOCK_INBOX, null, 0, 0, stock_inbox },
{ STOCK_OUTBOX, null, 0, 0, stock_outbox },
+{ STOCK_REPORT_BUG, null, 0, 0, bug-buddy },
{ STOCK_SENT_MAIL, null, 0, 0, stock_sent-mail },
{ STOCK_USER_TRASH }
};
diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala
index 2e4658d..dc0be24 100644
--- a/postler/postler-bureau.vala
+++ b/postler/postler-bureau.vala
@@ -80,6 +80,7 @@ public class Postler.Bureau : Gtk.Window {
separator/
menuitem action=Fullscreen/
menuitem action=AccountNew/
+menuitem action=ReportBug/
menuitem action=About/
/popup
toolbar name=search_options
@@ -312,6 +313,10 @@ public class Postler.Bureau : Gtk.Window {
return true;
}
+void action_report_bug () {
+Postler.App.show_uri (get_screen (),
https://bugs.launchpad.net/postler/+filebug;);
+}
+
void action_view_source () {
Postler.App.spawn_module (source, content.last_location);
}
@@ -400,6 +405,8 @@ public class Postler.Bureau : Gtk.Window {
N_(View the source of the message), action_view_source },
{ AccountNew, STOCK_ACCOUNT_NEW, null, ,
N_(Setup a new account), action_account_new },
+{ ReportBug, STOCK_REPORT_BUG, N_(Report a Problem...), ,
+ N_(Report a Problem...), action_report_bug },
{ Help, null, N_(_Help) },
{ About, Gtk.STOCK_ABOUT, null, ,
N_(Show information about the program), action_about }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Decrease minimum height of the message view
Updating branch refs/heads/master
to 9dc4ddf16b8487223e38a3091748ca409651b165 (commit)
from 90b6353f02dae024fc3cf7ef52c9ca364dce2488 (commit)
commit 9dc4ddf16b8487223e38a3091748ca409651b165
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Feb 15 00:02:42 2011 +0100
Decrease minimum height of the message view
postler/postler-bureau.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala
index b5094c2..2e4658d 100644
--- a/postler/postler-bureau.vala
+++ b/postler/postler-bureau.vala
@@ -648,7 +648,7 @@ public class Postler.Bureau : Gtk.Window {
client.received.connect (client_received);
messages = new Postler.Messages (accounts);
-messages.set_size_request (250, 250);
+messages.set_size_request (250, 200);
actions.get_action (MessageFlag).sensitive = false;
actions.get_action (MessageArchive).sensitive = false;
actions.get_action (MessageJunk).sensitive = false;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Fallback to file icon if no MIME icon is found
Updating branch refs/heads/master
to b55ab3afa96379649d3a9a52ccdea51b9f14cf9f (commit)
from 5fd3c3b334692175f843f29526735301213f73be (commit)
commit b55ab3afa96379649d3a9a52ccdea51b9f14cf9f
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Feb 15 00:51:51 2011 +0100
Fallback to file icon if no MIME icon is found
midori/midori-view.c | 10 +-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 34dee92..57efc83 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2832,6 +2832,7 @@ webkit_web_view_mime_type_decision_cb (GtkWidget*
web_view,
gchar* description;
#if GTK_CHECK_VERSION (2, 14, 0)
GIcon* icon;
+GtkIconInfo* icon_info;
GtkWidget* image;
#endif
gchar* title;
@@ -2881,7 +2882,14 @@ webkit_web_view_mime_type_decision_cb (GtkWidget*
web_view,
description = g_content_type_get_description (content_type);
#if GTK_CHECK_VERSION (2, 14, 0)
icon = g_content_type_get_icon (content_type);
-image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
+icon_info = gtk_icon_theme_lookup_by_gicon (icon);
+if (icon_info != NULL)
+{
+image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
+gtk_icon_info_free (icon_info);
+}
+else
+image = gtk_image_new_from_stock (GTK_STOCK_FILE,
GTK_ICON_SIZE_DIALOG);
g_object_unref (icon);
gtk_widget_show (image);
gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
