[Xfce4-commits] orage:master l10n: Updated Uyghur (ug) translation to None%
Updating branch refs/heads/master to 4fe7b1cb28ed0a1b65827714730793cab69f73ad (commit) from 054b6365438553d94cc0cdae3e023778bf592148 (commit) commit 4fe7b1cb28ed0a1b65827714730793cab69f73ad Author: Gheyret Kenji ghey...@yahoo.com Date: Fri Sep 28 09:35:47 2012 +0200 l10n: Updated Uyghur (ug) translation to None% New status: 0 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ug.po | 50 +- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/po/ug.po b/po/ug.po index a33f263..b8090fd 100644 --- a/po/ug.po +++ b/po/ug.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Gheyret Kenji ghey...@gmail.com, YEAR. -# +# msgid msgstr Project-Id-Version: orage\n @@ -29,7 +29,7 @@ msgstr دۇنيا ۋاقتى(GlobalTime) كۆزنىكىنى كۆتۈرۈش مە msgid %s\n click to modify clock -msgstr %s\n +msgstr چېكىپ سائەتنى توغرىلاڭ #: ../globaltime/globaltime.c:386 @@ -40,7 +40,7 @@ msgstr يەرلىك ۋاقىت msgid button 1 to change preferences \n button 2 to adjust time of clocks -msgstr توپچە 1 تەڭشەكنى ئۆزگەرتىدۇ \n +msgstr توپچە 2 ۋاقىتنى توغرىلايدۇ #: ../globaltime/globaltime.c:480 @@ -483,7 +483,7 @@ msgid \t%V = week number\t\t%Z = timezone in use\n \t%H = hours \t\t\t\t%M = minute\n \t%X = local time\t\t\t%x = local date -msgstr بۇ پروگرامما ۋاقىتقا strftime نى ئىشلىتىدۇ.\n +msgstr ئۆزىڭىز ياخشى كۆرىدىغان ۋاقىت فورماتى ئۈچۈن بىرەر ئىناۋەتلىك كود ئىشلىتىڭ.\n بەزى كۆپ ئىشلىتىدىغان كودلار:\n \t%A = ھەپتە\t\t\t%B = ئاي\n @@ -505,7 +505,7 @@ msgstr Orage سائەت تەڭشەكلىرى #. * %B : full month name #. * %Y : four digit year #. * %V : ISO week number -#. +#. #: ../panel-plugin/xfce4-orageclock-plugin.c:627 msgid %A %d %B %Y/%V msgstr %Y/%B/%d %A %V @@ -660,7 +660,7 @@ msgstr ھادىسە msgid Event that will happen sometime. For example:\n Meeting or birthday or TV show. -msgstr بەزىدە ئالاھىدە ئىش تۇز بېرىدۇ.مەسىلەن:\n +msgstr يىغىن ياكى تۇغۇلغان كۈن ياكى تېلېۋىزىيە ئويۇنى دېگەندەك. #: ../src/appointment.c:2639 ../src/event-list.c:1185 @@ -671,7 +671,7 @@ msgstr قىلىدىغان ئىشلار: msgid Something that you should do sometime. For example:\n Wash your car or test new version of Orage. -msgstr بەزىدە قىلىدىغان ئىشلار. مەسىلەن:\n +msgstr ماشىنىنى يۇيىدىغان ياكى تەكشۈرىدىغان ياكى بولمىسا Orage نىڭ يېڭى نەشرىنى سىنايدىغان دېگەندەك. #: ../src/appointment.c:2645 ../src/event-list.c:1198 @@ -682,7 +682,7 @@ msgstr ژۇرنال msgid Make a note that something happened. For example:\n Remark that your mother called or first snow came. -msgstr يۈز بەرگەن ئىشلارنى خاتىرىگە يېزىپ قويۇش. مەسىلەن:\n +msgstr ئانىڭىزنىڭ تېلېفون ئۇرغانلىرى ياكى تۇنجى قار ياققان ۋاقىت دېگەندەك. #. title @@ -802,7 +802,7 @@ msgid 1) before Event start\n 2) before Todo end\n 3) after Todo start -msgstr گۈدۈكنى چالىدىغان ۋاقىت:\n +msgstr 1) ئالاھىدە ئىشتىن بۇرۇن\n 2) قىلىدىغان ئىشلار تاماملانغاندا\n 3) قىلىدىغان ئىشلار باشلانغاندىن كېيىن @@ -994,7 +994,7 @@ msgid Use this if you need complex times like:\n Every Saturday and Sunday or \n First Tuesday every month -msgstr تۆۋەندىكىدەك مۇرەككەپ تەڭشەك ئۈچۈن بۇنى ئىشلىتىڭ:\n +msgstr ھەر شەنبە ياكى يەكشەنبە ياكى \n ھەر ئاينىڭ تۇنجى دۈشەنبە كۈنى دېگەندەكلەر ئۈچۈن @@ -1177,7 +1177,7 @@ msgstr چېكىپ قۇرنى تاللىغىلى بولىدۇ ئاندىن كې msgid You will permanently remove all\n selected appointments. -msgstr تاللانغان بارلىق دېيىشمىلەر \n +msgstr مەڭگۈلۈككە ئۆچۈرۈلىدۇ #: ../src/event-list.c:1130 @@ -1358,7 +1358,7 @@ msgstr ھۆججەتتىن ئوقۇ: msgid Separate filenames with comma(,).\n NOTE: comma is not valid character in filenames for Orage. -msgstr ھۆججەت نامى پەش ئارقىلىق ئايرىلسۇن(,).\n +msgstr دىققەت: Orage دا پەشنى ھۆججەت نامىدا ئىشلەتكىلى بولمايدۇ. #: ../src/interface.c:1008 @@ -1533,49 +1533,49 @@ msgstr GTK+-%d.%d.%d. نى ئىشلىتىش.\n #: ../src/main.c:276 #, c-format msgid \tUsing DBUS for import.\n -msgstr +msgstr \tئىمپورت قىلىشتا DBUS ئىشلىتىدۇ.\n #: ../src/main.c:278 #, c-format msgid \tNot using DBUS. Import works only partially.\n -msgstr +msgstr \tبۇنىڭدا DBUS ئىشلەتمەيدۇ، ئىمپورت قىلىش تولۇق ئىشلىمەيدۇ.\n #: ../src/main.c:281 #, c-format msgid \tUsing libnotify.\n -msgstr +msgstr \tبۇنىڭدا libnotify ئىشلىتىدۇ.\n #: ../src/main.c:283 #, c-format msgid \tNot using libnotify.\n -msgstr +msgstr \tبۇنىڭدا libnotify ئىشلەتمەيدۇ.\n #: ../src/main.c:286 #, c-format msgid \tUsing automatic archiving.\n -msgstr +msgstr \tبۇنىڭدا ئاپتوماتىك ئارخىپلاش ئىشلىتىدۇ.\n #: ../src/main.c:288 #, c-format msgid \tNot using archiving.\n -msgstr +msgstr \tبۇنىڭدا ئارخىپلاش ئىشلەتمەيدۇ.\n #: ../src/main.c:291 #, c-format msgid \tUsing operating system package libical.\n -msgstr +msgstr \tمەشغۇلات سىستېمىسىنىڭ libical بوغچىسىنى ئىشلىتىدۇ.\n #:
[Xfce4-commits] xfce4-settings:ochosi/rectangle Creating branch ochosi/rectangle
Updating branch refs/heads/ochosi/rectangle as new branch to b44272768b4dba280f629b91ea1cfa30ad0a10f6 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/ochosi/rectangle for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:ochosi/rectangle Initial implementation of a rectangle on the selected display (FIXME: Rectangle doesn't get cleared away yet)
Updating branch refs/heads/ochosi/rectangle
to 20742234d2df925466bbf68496d18cbfa1810b21 (commit)
from b44272768b4dba280f629b91ea1cfa30ad0a10f6 (commit)
commit 20742234d2df925466bbf68496d18cbfa1810b21
Author: ochosi simon.steinbe...@elfenbeinturm.at
Date: Fri Sep 28 12:56:51 2012 +0200
Initial implementation of a rectangle on the selected display
(FIXME: Rectangle doesn't get cleared away yet)
dialogs/display-settings/main.c | 39 +++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 21d1f74..f614252 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1148,6 +1148,17 @@ display_settings_treeview_selection_changed
(GtkTreeSelection *selection,
gboolean has_selection;
gint active_id;
GObject *mirror_displays, *position_combo, *display_combo;
+XfceRRMode *current_mode;
+GdkWindow *root;
+ GdkGCValues gc_values;
+ GdkGC *gc;
+ GdkGCValuesMask values_mask =
+GDK_GC_FUNCTION | GDK_GC_FILL | GDK_GC_CLIP_MASK |
+GDK_GC_SUBWINDOW | GDK_GC_CLIP_X_ORIGIN | GDK_GC_CLIP_Y_ORIGIN |
+GDK_GC_EXPOSURES | GDK_GC_LINE_WIDTH | GDK_GC_LINE_STYLE |
+GDK_GC_CAP_STYLE | GDK_GC_JOIN_STYLE;
+GdkColor gc_black = {0, 0, 0, 0};
+GdkColor gc_red = {0, 65535, 0, 0};
/* Get the selection */
has_selection = gtk_tree_selection_get_selected (selection, model, iter);
@@ -1178,7 +1189,35 @@ display_settings_treeview_selection_changed
(GtkTreeSelection *selection,
gtk_widget_set_sensitive( GTK_WIDGET(position_combo), FALSE );
gtk_widget_set_sensitive( GTK_WIDGET(display_combo), FALSE );
}
+
+ /* Get the resolution of the currently selected output */
+ current_mode = xfce_randr_find_mode_by_id (xfce_randr,
active_id, XFCE_RANDR_MODE (xfce_randr));
+
+/* Get root window */
+root = gdk_get_default_root_window ();
+
+ /*Set up graphics context for a XOR rectangle */
+gc_values.function = GDK_XOR;
+ gc_values.line_width = 12;
+ gc_values.line_style = GDK_LINE_SOLID;
+ gc_values.fill = GDK_SOLID;
+ gc_values.cap_style = GDK_CAP_BUTT;
+ gc_values.join_style = GDK_JOIN_MITER;
+ gc_values.graphics_exposures = FALSE;
+ gc_values.clip_x_origin = 0;
+ gc_values.clip_y_origin = 0;
+ gc_values.clip_mask = None;
+ gc_values.subwindow_mode = GDK_INCLUDE_INFERIORS;
+
+ gc = gdk_gc_new_with_values (root, gc_values, values_mask);
+ gdk_gc_set_rgb_fg_color (gc, gc_red);
+ gdk_gc_set_rgb_bg_color (gc, gc_black);
+ /* Draw the rectangle on the currently selected screen */
+ gdk_draw_rectangle (root,gc,FALSE,XFCE_RANDR_POS_X
(xfce_randr),XFCE_RANDR_POS_Y
(xfce_randr),current_mode-width,current_mode-height);
+/* Remove the previous rectangle FIXME */
+ //gdk_draw_rectangle (root,gc,FALSE,XFCE_RANDR_POS_X
(xfce_randr),XFCE_RANDR_POS_Y
(xfce_randr),current_mode-width,current_mode-height);
}
+
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to cb4119a20abb4c1eb70ef595c953d3ed557cca40 (commit) from 71ec7fe8a29f84ba7937bdc91cfd64f560d6cfde (commit) commit cb4119a20abb4c1eb70ef595c953d3ed557cca40 Author: Pjotr vertaalt pjotrverta...@gmail.com Date: Fri Sep 28 15:41:17 2012 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 691 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 76 ++--- 1 files changed, 42 insertions(+), 34 deletions(-) diff --git a/po/nl.po b/po/nl.po index b0cf03f..0f63a75 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: thunar\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-09-26 21:00+\n +POT-Creation-Date: 2012-09-28 10:27+\n PO-Revision-Date: 2011-09-08 15:47+0100\n Last-Translator: Pjotr\n Language-Team: Dutch (Flemish)\n @@ -451,7 +451,7 @@ msgid Failed to remove \%s\. msgstr Kon '%s' niet verwijderen. #. tell the user that we cannot paste -#: ../thunar/thunar-clipboard-manager.c:352 +#: ../thunar/thunar-clipboard-manager.c:354 msgid There is nothing on the clipboard to paste msgstr Er is niets op het klembord om te plakken @@ -525,7 +525,7 @@ msgstr Kolomm_en automatisch openvouwen indien nodig #: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:682 #: ../thunar/thunar-list-model.c:710 #: ../thunar/thunar-permissions-chooser.c:227 ../thunar/thunar-util.c:271 -#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:458 +#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:503 #: ../plugins/thunar-apr/thunar-apr-image-page.c:285 #: ../plugins/thunar-apr/thunar-apr-image-page.c:286 #: ../plugins/thunar-uca/thunar-uca-editor.c:605 @@ -801,34 +801,34 @@ msgstr Bestand msgid File Name msgstr Bestandnaam -#: ../thunar/thunar-file.c:880 ../thunar/thunar-shortcuts-view.c:279 +#: ../thunar/thunar-file.c:868 ../thunar/thunar-shortcuts-view.c:279 #: ../thunar/thunar-window.c:312 msgid File System msgstr Bestandssysteem -#: ../thunar/thunar-file.c:959 +#: ../thunar/thunar-file.c:941 #, c-format msgid The root folder has no parent msgstr De hoofdmap heeft geen bovenliggende map -#: ../thunar/thunar-file.c:1022 ../thunar/thunar-file.c:1293 +#: ../thunar/thunar-file.c:1004 ../thunar/thunar-file.c:1279 #, c-format msgid Failed to parse the desktop file: %s msgstr Kon het bureaubladbestand niet lezen: %s # Unknown word Exec -#: ../thunar/thunar-file.c:1060 +#: ../thunar/thunar-file.c:1044 #, c-format msgid No Exec field specified msgstr Geen Exec-veld gespecificeerd # Unknown word Exec -#: ../thunar/thunar-file.c:1081 +#: ../thunar/thunar-file.c:1065 #, c-format msgid No URL field specified msgstr Geen URL-veld gespecificeerd -#: ../thunar/thunar-file.c:1087 +#: ../thunar/thunar-file.c:1071 #, c-format msgid Invalid desktop file msgstr Ongeldig bureaubladbestand @@ -2180,7 +2180,7 @@ msgstr msgid Du_plicate msgstr Du_pliceren -#: ../thunar/thunar-standard-view.c:384 ../thunar/thunar-standard-view.c:3749 +#: ../thunar/thunar-standard-view.c:384 ../thunar/thunar-standard-view.c:3752 msgid Ma_ke Link msgid_plural Ma_ke Links msgstr[0] Koppeling m_aken @@ -2231,12 +2231,12 @@ msgstr _Patroon: msgid Failed to create a link for the URL \%s\ msgstr Kon geen koppeling voor de URL '%s' maken -#: ../thunar/thunar-standard-view.c:3147 +#: ../thunar/thunar-standard-view.c:3150 #, c-format msgid Failed to open directory \%s\ msgstr Kon map '%s' niet openen -#: ../thunar/thunar-standard-view.c:3709 +#: ../thunar/thunar-standard-view.c:3712 msgid Prepare the selected file to be moved with a Paste command msgid_plural Prepare the selected files to be moved with a Paste command msgstr[0] @@ -2246,7 +2246,7 @@ msgstr[1] Bereid de geselecteerde bestanden voor om met een plakopdracht verplaatst te worden -#: ../thunar/thunar-standard-view.c:3717 +#: ../thunar/thunar-standard-view.c:3720 msgid Prepare the selected file to be copied with a Paste command msgid_plural Prepare the selected files to be copied with a Paste command msgstr[0] @@ -2256,31 +2256,31 @@ msgstr[1] Bereid de geselecteerde bestanden voor om met een plakopdracht gekopieerd te worden -#: ../thunar/thunar-standard-view.c:3728 +#: ../thunar/thunar-standard-view.c:3731 msgid Delete the selected file msgid_plural Delete the selected files msgstr[0] Verwijder het geselecteerde bestand msgstr[1] Verwijder de geselecteerde bestanden -#: ../thunar/thunar-standard-view.c:3742 +#: ../thunar/thunar-standard-view.c:3745 msgid Duplicate the selected file msgid_plural Duplicate each selected file msgstr[0] Het geselecteerde bestand dupliceren msgstr[1] De geselecteerde bestanden dupliceren -#: ../thunar/thunar-standard-view.c:3751 +#: ../thunar/thunar-standard-view.c:3754 msgid Create a symbolic link for the selected file
[Xfce4-commits] libxfce4ui:master Update translators, week 39.
Updating branch refs/heads/master
to f22802b87fd8d4a6ffaead71f565547a52a2fa1b (commit)
from 4f3084cea2901cda3d333f5a8ca2019e866e5c32 (commit)
commit f22802b87fd8d4a6ffaead71f565547a52a2fa1b
Author: Transifex nore...@xfce.org
Date: Fri Sep 28 17:36:46 2012 +0200
Update translators, week 39.
xfce4-about/translators.h | 62 ++--
1 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h
index 6261043..43e9ab5 100644
--- a/xfce4-about/translators.h
+++ b/xfce4-about/translators.h
@@ -24,7 +24,7 @@
#include gtk/gtk.h
#include libxfce4util/libxfce4util.h
-#define TRANSLATORS_H_STAMP 2012-04-29 00:21:02
+#define TRANSLATORS_H_STAMP 2012-09-28 17:36:46
#define ATSIGN @
#define DOTSIGN .
@@ -47,6 +47,7 @@ TranslatorTeam;
static const TranslatorInfo xfce_translators_am[] =
{
{ Tegegne Tefera, tefera ATSIGN mekuria DOTSIGN com, TRUE },
+ { BelayTekalign, BelayTekalign ATSIGN gmail DOTSIGN com, FALSE },
{ Fantaw Tesema, fantaw ATSIGN gmail DOTSIGN com, FALSE },
{ NULL, NULL }
};
@@ -56,8 +57,10 @@ static const TranslatorInfo xfce_translators_ar[] =
{ كريم أولاد الشلحة, herr DOTSIGN linux88 ATSIGN gmail DOTSIGN
com, TRUE },
{ abdilra7eem, abdilra7eem ATSIGN yahoo DOTSIGN com, FALSE },
{ Amine, , FALSE },
+ { khire aldin kajjan, Cransh DOTSIGN t2 ATSIGN hotmail DOTSIGN
com, FALSE },
{ Hasen il Judy, hasan DOTSIGN aljudy ATSIGN gmail DOTSIGN com,
FALSE },
{ محمد الحرقان, malham1 ATSIGN gmail DOTSIGN com, FALSE },
+ { Noureddin Khatat, noureddin ATSIGN barid DOTSIGN com, FALSE },
{ os_, syriatalks ATSIGN hotmail DOTSIGN com, FALSE },
{ Yassine Bouhadi, yassine DOTSIGN skiloo ATSIGN gmail DOTSIGN
com, FALSE },
{ ybanafa, ybanafa ATSIGN alasersystems DOTSIGN com, FALSE },
@@ -73,7 +76,10 @@ static const TranslatorInfo xfce_translators_ast[] =
static const TranslatorInfo xfce_translators_be[] =
{
- { Andrei Zakharevich, andrej ATSIGN zahar DOTSIGN ws, TRUE },
+ { Andrej Zakharevich, andrej ATSIGN zahar DOTSIGN ws, TRUE },
+ { Arthur Schebetau, archisoft6 ATSIGN gmail DOTSIGN com, FALSE },
+ { belarus, useq ATSIGN list DOTSIGN ru, FALSE },
+ { Mikalai Udodau, crom-a ATSIGN tut DOTSIGN by, FALSE },
{ NULL, NULL }
};
@@ -82,6 +88,7 @@ static const TranslatorInfo xfce_translators_bg[] =
{ Valentin Tunev, hdbuster ATSIGN gmail DOTSIGN com, TRUE },
{ Kiril Kirilov, cybercop_montana ATSIGN abv DOTSIGN bg, FALSE },
{ Milen Milev, fanfolet ATSIGN gmail DOTSIGN com, FALSE },
+ { sahwar, ve4ernik ATSIGN gmail DOTSIGN com, FALSE },
{ NULL, NULL }
};
@@ -123,8 +130,8 @@ static const TranslatorInfo xfce_translators_cs[] =
static const TranslatorInfo xfce_translators_da[] =
{
{ Per Kongstad, p_kongstad ATSIGN op DOTSIGN pl, TRUE },
+ { Kris Thomsen, mail ATSIGN kristhomsen DOTSIGN dk, FALSE },
{ Morten Juhl-Johansen Zölde-Fejér, mjjzf ATSIGN syntaktisk DOTSIGN
dk, FALSE },
- { Erik Schmidt, erischmi ATSIGN gmail DOTSIGN com, FALSE },
{ NULL, NULL }
};
@@ -166,7 +173,7 @@ static const TranslatorInfo xfce_translators_el[] =
{ gapan, vlahavas ATSIGN gmail DOTSIGN com, FALSE },
{ Efstathios Iosifidis, iefstathios ATSIGN gmail DOTSIGN com, FALSE
},
{ Jani Kotsionis, ikotsionis ATSIGN gmail DOTSIGN com, FALSE },
- { jemadux, , FALSE },
+ { Klearchos-Angelos Gkountras, kleagkou ATSIGN gmail DOTSIGN com,
FALSE },
{ Mario Andonoudiou, supermodmusic ATSIGN gmail DOTSIGN com, FALSE },
{ Georgios Stefanakis, nonviotale ATSIGN gmail DOTSIGN com, FALSE },
{ Spiros Georgaras, sng ATSIGN hellug DOTSIGN gr, FALSE },
@@ -183,6 +190,7 @@ static const TranslatorInfo xfce_translators_en_GB[] =
static const TranslatorInfo xfce_translators_eo[] =
{
{ Michael Moroni, michael DOTSIGN moroni ATSIGN mailoo DOTSIGN
org, TRUE },
+ { Dominique Pellé, dominique DOTSIGN pelle ATSIGN gmail DOTSIGN
com, FALSE },
{ Jakob Pedersen, jakobp78 ATSIGN gmail DOTSIGN com, FALSE },
{ Pierre Vittet, pierre-vittet ATSIGN pvittet DOTSIGN com, FALSE },
{ Urmas D, davian818 ATSIGN gmail DOTSIGN com, FALSE },
@@ -192,8 +200,15 @@ static const TranslatorInfo xfce_translators_eo[] =
static const TranslatorInfo xfce_translators_es[] =
{
{ Andres Sanchez, afsanchez93 ATSIGN gmail DOTSIGN com, TRUE },
+ { Daniel Durante, danieldurante ATSIGN ymail DOTSIGN com, TRUE },
+ { Adolfo Jayme Barrientos, fitoschido ATSIGN gmail DOTSIGN com,
FALSE },
+ { lbazan, bazanluis20 ATSIGN gmail DOTSIGN com, FALSE },
+ { ma7as, colonizare ATSIGN gmail DOTSIGN com, FALSE },
{ Octavio Bernal Quiroz, octavio DOTSIGN bernal DOTSIGN q ATSIGN
gmail DOTSIGN com, FALSE },
{ Sergio García, oigres200 ATSIGN gmail DOTSIGN com, FALSE },
+ { prflr88, prflr88 ATSIGN gmail DOTSIGN com, FALSE },
+ { Santiago Gil, santix91 ATSIGN gmail DOTSIGN com, FALSE },
+ { sebikul, , FALSE },
{ NULL, NULL }
};
@@ -216,6 +231,7 @@ static const
[Xfce4-commits] www:master Update translators, week 39.
Updating branch refs/heads/master to 9b44b9ae23f1f20fad7c7b8ea44f1e2cd21fb25a (commit) from fbdcd209a340cbaf225a205a6e9d0d89bf7e5908 (commit) commit 9b44b9ae23f1f20fad7c7b8ea44f1e2cd21fb25a Author: Transifex nore...@xfce.org Date: Fri Sep 28 17:36:47 2012 +0200 Update translators, week 39. lib/translators.php | 62 +++--- 1 files changed, 53 insertions(+), 9 deletions(-) diff --git a/lib/translators.php b/lib/translators.php index 44f298e..8f2d1f3 100644 --- a/lib/translators.php +++ b/lib/translators.php @@ -4,19 +4,22 @@ * DO NOT EDIT IT MANUALLY! */ -$translators_stamp = 2012-04-29 00:21:21; +$translators_stamp = 2012-09-28 17:36:47; $translators = array ( 'Amharic [am]' = array ( 'Tegegne Tefera' = 'tefera'.ATSIGN.'mekuria'.DOTSIGN.'com', +'BelayTekalign' = 'BelayTekalign'.ATSIGN.'gmail'.DOTSIGN.'com', 'Fantaw Tesema' = 'fantaw'.ATSIGN.'gmail'.DOTSIGN.'com', ), 'Arabic [ar]' = array ( 'كريم أولاد الشلحة' = 'herr'.DOTSIGN.'linux88'.ATSIGN.'gmail'.DOTSIGN.'com', 'abdilra7eem' = 'abdilra7eem'.ATSIGN.'yahoo'.DOTSIGN.'com', 'Amine' = '', +'khire aldin kajjan' = 'Cransh'.DOTSIGN.'t2'.ATSIGN.'hotmail'.DOTSIGN.'com', 'Hasen il Judy' = 'hasan'.DOTSIGN.'aljudy'.ATSIGN.'gmail'.DOTSIGN.'com', 'محمد الحرقان' = 'malham1'.ATSIGN.'gmail'.DOTSIGN.'com', +'Noureddin Khatat' = 'noureddin'.ATSIGN.'barid'.DOTSIGN.'com', 'os_' = 'syriatalks'.ATSIGN.'hotmail'.DOTSIGN.'com', 'Yassine Bouhadi' = 'yassine'.DOTSIGN.'skiloo'.ATSIGN.'gmail'.DOTSIGN.'com', 'ybanafa' = 'ybanafa'.ATSIGN.'alasersystems'.DOTSIGN.'com', @@ -26,12 +29,16 @@ $translators = array ( 'Iñigo Varela' = 'malditoastur'.ATSIGN.'gmail'.DOTSIGN.'com', ), 'Belarusian [be]' = array ( -'Andrei Zakharevich' = 'andrej'.ATSIGN.'zahar'.DOTSIGN.'ws', +'Andrej Zakharevich' = 'andrej'.ATSIGN.'zahar'.DOTSIGN.'ws', +'Arthur Schebetau' = 'archisoft6'.ATSIGN.'gmail'.DOTSIGN.'com', +'belarus' = 'useq'.ATSIGN.'list'.DOTSIGN.'ru', +'Mikalai Udodau' = 'crom-a'.ATSIGN.'tut'.DOTSIGN.'by', ), 'Bulgarian [bg]' = array ( 'Valentin Tunev' = 'hdbuster'.ATSIGN.'gmail'.DOTSIGN.'com', 'Kiril Kirilov' = 'cybercop_montana'.ATSIGN.'abv'.DOTSIGN.'bg', 'Milen Milev' = 'fanfolet'.ATSIGN.'gmail'.DOTSIGN.'com', +'sahwar' = 've4ernik'.ATSIGN.'gmail'.DOTSIGN.'com', ), 'Bengali [bn]' = array ( 'Jamil Ahmed' = 'itsjamil'.ATSIGN.'gmail'.DOTSIGN.'com', @@ -58,8 +65,8 @@ $translators = array ( ), 'Danish [da]' = array ( 'Per Kongstad' = 'p_kongstad'.ATSIGN.'op'.DOTSIGN.'pl', +'Kris Thomsen' = 'mail'.ATSIGN.'kristhomsen'.DOTSIGN.'dk', 'Morten Juhl-Johansen Zölde-Fejér' = 'mjjzf'.ATSIGN.'syntaktisk'.DOTSIGN.'dk', -'Erik Schmidt' = 'erischmi'.ATSIGN.'gmail'.DOTSIGN.'com', ), 'German [de]' = array ( 'Christoph Wickert' = 'christoph'.DOTSIGN.'wickert'.ATSIGN.'googlemail'.DOTSIGN.'com', @@ -95,7 +102,7 @@ $translators = array ( 'gapan' = 'vlahavas'.ATSIGN.'gmail'.DOTSIGN.'com', 'Efstathios Iosifidis' = 'iefstathios'.ATSIGN.'gmail'.DOTSIGN.'com', 'Jani Kotsionis' = 'ikotsionis'.ATSIGN.'gmail'.DOTSIGN.'com', -'jemadux' = '', +'Klearchos-Angelos Gkountras' = 'kleagkou'.ATSIGN.'gmail'.DOTSIGN.'com', 'Mario Andonoudiou' = 'supermodmusic'.ATSIGN.'gmail'.DOTSIGN.'com', 'Georgios Stefanakis' = 'nonviotale'.ATSIGN.'gmail'.DOTSIGN.'com', 'Spiros Georgaras' = 'sng'.ATSIGN.'hellug'.DOTSIGN.'gr', @@ -106,14 +113,22 @@ $translators = array ( ), 'Esperanto [eo]' = array ( 'Michael Moroni' = 'michael'.DOTSIGN.'moroni'.ATSIGN.'mailoo'.DOTSIGN.'org', +'Dominique Pellé' = 'dominique'.DOTSIGN.'pelle'.ATSIGN.'gmail'.DOTSIGN.'com', 'Jakob Pedersen' = 'jakobp78'.ATSIGN.'gmail'.DOTSIGN.'com', 'Pierre Vittet' = 'pierre-vittet'.ATSIGN.'pvittet'.DOTSIGN.'com', 'Urmas D' = 'davian818'.ATSIGN.'gmail'.DOTSIGN.'com', ), 'Spanish (Castilian) [es]' = array ( 'Andres Sanchez' = 'afsanchez93'.ATSIGN.'gmail'.DOTSIGN.'com', +'Daniel Durante' = 'danieldurante'.ATSIGN.'ymail'.DOTSIGN.'com', +'Adolfo Jayme Barrientos' = 'fitoschido'.ATSIGN.'gmail'.DOTSIGN.'com', +'lbazan' = 'bazanluis20'.ATSIGN.'gmail'.DOTSIGN.'com', +'ma7as' = 'colonizare'.ATSIGN.'gmail'.DOTSIGN.'com', 'Octavio Bernal Quiroz' = 'octavio'.DOTSIGN.'bernal'.DOTSIGN.'q'.ATSIGN.'gmail'.DOTSIGN.'com', 'Sergio García' = 'oigres200'.ATSIGN.'gmail'.DOTSIGN.'com', +'prflr88' = 'prflr88'.ATSIGN.'gmail'.DOTSIGN.'com', +'Santiago Gil' = 'santix91'.ATSIGN.'gmail'.DOTSIGN.'com', +'sebikul' = '', ), 'Spanish (Argentinian) [es_AR]' = array ( 'Diego Augusto Molina' = 'diegoaugustomolina'.ATSIGN.'gmail'.DOTSIGN.'com', @@ -127,14 +142,17 @@ $translators = array ( ), 'Basque [eu]' = array ( 'Piarres Beobide' = 'pi'.ATSIGN.'beobide'.DOTSIGN.'net', +'Asier Iturralde Sarasola' =
[Xfce4-commits] xfce4-mixer|xfce4-mixer-4.9.0 Creating annotated tag xfce4-mixer-4.9.0
Updating annotated tag refs/tags/xfce4-mixer-4.9.0 as new annotated tag to 97339e61c5975dc6b6b2ee9f1a6680ef666103d9 (tag) succeeds xfce4-mixer-4.8.0-88-g484886f tagged by Guido Berhoerster guido+x...@berhoerster.name on 2012-09-28 17:55 +0200 Guido Berhoerster (1): Release 4.9.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-places-plugin:master Clean-up after removing xfce4-popup-places.c
Updating branch refs/heads/master
to 256c05459ee2e96746ea94751e9c9f71b81f5c16 (commit)
from 48bd2394edc8d6cc4b56b0b4aa5780e985038040 (commit)
commit 256c05459ee2e96746ea94751e9c9f71b81f5c16
Author: Andrzej ndrwr...@gmail.com
Date: Fri Sep 28 17:08:53 2012 +0100
Clean-up after removing xfce4-popup-places.c
panel-plugin/view.c | 52 ---
po/POTFILES.in |3 +-
2 files changed, 1 insertions(+), 54 deletions(-)
diff --git a/panel-plugin/view.c b/panel-plugin/view.c
index 1b394f8..86bcb4c 100644
--- a/panel-plugin/view.c
+++ b/panel-plugin/view.c
@@ -65,7 +65,6 @@
#include model_system.h
#include model_volumes.h
#include model_user.h
-#include xfce4-popup-places.h
#include button.h
#ifdef HAVE_LIBNOTIFY
@@ -893,54 +892,6 @@ pview_remote_event(XfcePanelPlugin *panel_plugin,
return FALSE;
}
-static gboolean
-pview_popup_command_message_received(GtkWidget *widget,
- GdkEventClient *ev,
- PlacesView *view)
-{
-if (G_LIKELY (ev-data_format == 8 *(ev-data.b) != '\0'
- !g_ascii_strcasecmp (PLACES_MSG_MENU, ev-data.b))){
-DBG (Message received: '%s', ev-data.b);
-
-pview_open_menu (view);
-return TRUE;
-}
-
-DBG(Bad message received);
-return FALSE;
-}
-
-static gboolean
-pview_popup_command_set_selection(PlacesView *view)
-{
-GdkScreen *gscreen;
-gchar selection_name[256];
-Atomselection_atom;
-Window id;
-
-id = GDK_WINDOW_XID (GTK_WIDGET (view-plugin)-window);
-
-gscreen = gtk_widget_get_screen (GTK_WIDGET(view-plugin));
-
-g_snprintf (selection_name, 256,
-XFCE_PLACES_SELECTION%d,
-gdk_screen_get_number (gscreen));
-
-selection_atom = XInternAtom (GDK_DISPLAY (), selection_name, FALSE);
-
-if (XGetSelectionOwner (GDK_DISPLAY (), selection_atom))
-return FALSE;
-
-XSetSelectionOwner (GDK_DISPLAY (), selection_atom, id, GDK_CURRENT_TIME);
-
-g_signal_connect (GTK_WIDGET(view-plugin),
- client-event,
- G_CALLBACK (pview_popup_command_message_received),
- view);
-
-return TRUE;
-}
-
/** Initialization Finalization **/
PlacesView*
places_view_init(XfcePanelPlugin *plugin)
@@ -996,9 +947,6 @@ places_view_init(XfcePanelPlugin *plugin)
g_signal_connect(G_OBJECT(view-plugin), remote-event,
G_CALLBACK(pview_remote_event), view);
-/* set selection for xfce4-popup-places */
-pview_popup_command_set_selection(view);
-
DBG(done);
return view;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 34c349f..5628241 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,5 +19,4 @@ panel-plugin/button.c
panel-plugin/button.h
panel-plugin/support.c
panel-plugin/support.h
-panel-plugin/xfce4-popup-places.c
-panel-plugin/xfce4-popup-places.h
+panel-plugin/xfce4-popup-places.sh
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-places-plugin:master Panel plugin HIG fix
Updating branch refs/heads/master to 40b0ce2f85eda00dde60ffcb254469fa2f9edb2a (commit) from 4f0aac9504c28ddfd188a2741eb38d7560a8ab24 (commit) commit 40b0ce2f85eda00dde60ffcb254469fa2f9edb2a Author: Andrzej ndrwr...@gmail.com Date: Fri Sep 28 15:59:46 2012 +0100 Panel plugin HIG fix panel-plugin/button.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/button.c b/panel-plugin/button.c index dd7cc0b..4bab198 100644 --- a/panel-plugin/button.c +++ b/panel-plugin/button.c @@ -58,7 +58,7 @@ #include button.h -#define BOX_SPACING 1 +#define BOX_SPACING 2 #ifdef LIBXFCE4PANEL_CHECK_VERSION #if LIBXFCE4PANEL_CHECK_VERSION (4,9,0) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-places-plugin:master Button layout improvements + 4.8 compat.
Updating branch refs/heads/master
to 496c2e42bcf2c1f4afb52c1c34427f1775a5f265 (commit)
from 40b0ce2f85eda00dde60ffcb254469fa2f9edb2a (commit)
commit 496c2e42bcf2c1f4afb52c1c34427f1775a5f265
Author: Andrzej ndrwr...@gmail.com
Date: Fri Sep 28 16:11:32 2012 +0100
Button layout improvements + 4.8 compat.
Clean-up, fixed label ellipsising, compatibility w/ panel 4.8.
panel-plugin/button.c | 139 ++--
1 files changed, 64 insertions(+), 75 deletions(-)
diff --git a/panel-plugin/button.c b/panel-plugin/button.c
index 4bab198..50824eb 100644
--- a/panel-plugin/button.c
+++ b/panel-plugin/button.c
@@ -336,13 +336,10 @@ places_button_destroy_image(PlacesButton *self)
}
}
static void
-places_button_resize_image(PlacesButton *self, gint new_size, gint *width,
gint *height)
+places_button_resize_image(PlacesButton *self, gint new_size)
{
GdkPixbuf *icon;
-*width = 0;
-*height = 0;
-
if (self-pixbuf_factory == NULL) {
places_button_destroy_image(self);
return;
@@ -356,17 +353,15 @@ places_button_resize_image(PlacesButton *self, gint
new_size, gint *width, gint
return;
}
-*width = gdk_pixbuf_get_width(icon);
-*height = gdk_pixbuf_get_height(icon);
-
if (self-image == NULL) {
self-image = g_object_ref(gtk_image_new_from_pixbuf(icon));
-gtk_box_pack_start(GTK_BOX(self-box), self-image, TRUE, TRUE, 0);
-gtk_widget_show(self-image);
+gtk_box_pack_start(GTK_BOX(self-box), self-image, FALSE, FALSE,
0);
}
else
gtk_image_set_from_pixbuf(GTK_IMAGE(self-image), icon);
+gtk_misc_set_alignment (GTK_MISC (self-image), 0.5, 0.5);
+gtk_widget_show(self-image);
g_object_unref(G_OBJECT(icon));
}
@@ -381,12 +376,21 @@ places_button_destroy_label(PlacesButton *self)
}
static void
-places_button_resize_label(PlacesButton *self, gint *width, gint *height)
+places_button_resize_label(PlacesButton *self,
+ gboolean show)
{
-GtkRequisition req;
+ gboolean vertical = FALSE;
+ gboolean deskbar = FALSE;
-*width = 0;
-*height = 0;
+#ifdef HAS_PANEL_49
+ if (xfce_panel_plugin_get_mode(self-plugin) ==
XFCE_PANEL_PLUGIN_MODE_DESKBAR)
+deskbar = TRUE;
+ else if (xfce_panel_plugin_get_mode(self-plugin) ==
XFCE_PANEL_PLUGIN_MODE_VERTICAL)
+vertical = TRUE;
+#else
+ if (xfce_panel_plugin_get_orientation(self-plugin) ==
GTK_ORIENTATION_VERTICAL)
+vertical = TRUE;
+#endif
if (self-label_text == NULL) {
places_button_destroy_label(self);
@@ -396,16 +400,26 @@ places_button_resize_label(PlacesButton *self, gint
*width, gint *height)
if (self-label == NULL) {
self-label = g_object_ref(gtk_label_new(self-label_text));
gtk_box_pack_end(GTK_BOX(self-box), self-label, TRUE, TRUE, 0);
-gtk_widget_show(self-label);
}
else
gtk_label_set_text(GTK_LABEL(self-label), self-label_text);
+if (deskbar)
+ gtk_label_set_ellipsize (GTK_LABEL (self-label), PANGO_ELLIPSIZE_END);
+else
+ gtk_label_set_ellipsize (GTK_LABEL (self-label), PANGO_ELLIPSIZE_NONE);
-gtk_widget_size_request(self-label, req);
-*width = req.width;
-*height = req.height;
-
+if (vertical)
+ {
+gtk_label_set_angle (GTK_LABEL (self-label), -90);
+gtk_misc_set_alignment (GTK_MISC (self-label), 0.5, 0.0);
+ }
+else
+ {
+gtk_label_set_angle (GTK_LABEL (self-label), 0);
+gtk_misc_set_alignment (GTK_MISC (self-label), 0.0, 0.5);
+ }
+gtk_widget_show(self-label);
}
@@ -414,15 +428,11 @@ places_button_resize(PlacesButton *self)
{
gboolean show_image, show_label;
gint new_size, image_size;
-gint image_width, image_height;
-gint label_width, label_height;
-gint nrows;
gint border_thickness;
GtkStyle *style;
-#ifdef HAS_PANEL_49
-XfcePanelPluginMode mode;
-GtkRequisition req;
-#endif
+gboolean vertical = FALSE;
+gboolean deskbar = FALSE;
+gint nrows = 1;
if (self-plugin == NULL)
return;
@@ -430,70 +440,49 @@ places_button_resize(PlacesButton *self)
new_size = xfce_panel_plugin_get_size(self-plugin);
self-plugin_size = new_size;
DBG(Panel size: %d, new_size);
-
+
show_image = self-pixbuf_factory != NULL;
show_label = self-label_text != NULL;
-/* image */
#ifdef HAS_PANEL_49
-mode = xfce_panel_plugin_get_mode(self-plugin);
-nrows = xfce_panel_plugin_get_nrows(self-plugin);
+ if (xfce_panel_plugin_get_mode(self-plugin) ==
XFCE_PANEL_PLUGIN_MODE_DESKBAR)
+deskbar = TRUE;
+ else if (xfce_panel_plugin_get_mode(self-plugin) ==
XFCE_PANEL_PLUGIN_MODE_VERTICAL)
+vertical = TRUE;
+ nrows = xfce_panel_plugin_get_nrows(self-plugin);
+#else
+ if (xfce_panel_plugin_get_orientation(self-plugin) ==
[Xfce4-commits] xfce4-places-plugin:master Updates for 1.5.0
Updating branch refs/heads/master to 7c89343ede139854dff99da2c5c5721bc3e12460 (commit) from 496c2e42bcf2c1f4afb52c1c34427f1775a5f265 (commit) commit 7c89343ede139854dff99da2c5c5721bc3e12460 Author: Andrzej ndrwr...@gmail.com Date: Fri Sep 28 16:41:29 2012 +0100 Updates for 1.5.0 AUTHORS |2 ++ NEWS| 11 +++ configure.in.in |2 +- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index acf4b13..467407c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,3 @@ Diego Ongaro (ongar...@gmail.com) +Andrzej (ndrwr...@gmail.com) +Christoph Wickert (cwick...@fedoraproject.org) diff --git a/NEWS b/NEWS index 5016ea8..663c5aa 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +2012-09-28 + +xfce4-places-plugin v1.5.0 released + + * Updated translations (he, pl) + * Using XDG icon names (thanks Christoph) + * More button layout improvements + fixed regressions with panel 4.8 + * Fixed permanent locking of panel autohiding (bugs #7039, #9209) + * Added a remote menu popup script (e.g. for a keyboard accelerator) + * Move configuration from a config file to xfconf + 2012-08-28 xfce4-places-plugin v1.4.0 released diff --git a/configure.in.in b/configure.in.in index ea1fb3d..ad0a947 100644 --- a/configure.in.in +++ b/configure.in.in @@ -1,7 +1,7 @@ dnl xfce4-places-plugin dnl version info -m4_define([places_version], [1.4.0]) +m4_define([places_version], [1.5.0]) dnl initialize autoconf AC_COPYRIGHT([Copyright (c) 2007-2009 Diego Ongaro ongar...@gmail.com]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-places-plugin|1.5.0 Creating annotated tag 1.5.0
Updating annotated tag refs/tags/1.5.0 as new annotated tag to d9e0adfd33782aca3af1d86fe3cac0f34d6f502e (tag) succeeds 1.4.0-17-g496c2e4 tagged by Andrzej ndrwr...@gmail.com on 2012-09-28 18:12 +0200 Andrzej (1): Updates for 1.5.0 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Remove keys if field is empty in properties page.
Updating branch refs/heads/master
to 7cb0de9b35f1bb0bbc5dc3104a25bcd79cb8b374 (commit)
from cb4119a20abb4c1eb70ef595c953d3ed557cca40 (commit)
commit 7cb0de9b35f1bb0bbc5dc3104a25bcd79cb8b374
Author: Nick Schermer n...@xfce.org
Date: Fri Sep 28 18:22:52 2012 +0200
Remove keys if field is empty in properties page.
Some apps don't support for example an empty Path= so
remove the key from the file if the value is nul.
plugins/thunar-apr/thunar-apr-desktop-page.c | 63 +++--
1 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.c
b/plugins/thunar-apr/thunar-apr-desktop-page.c
index 116f751..b525b90 100644
--- a/plugins/thunar-apr/thunar-apr-desktop-page.c
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.c
@@ -602,6 +602,27 @@ thunar_apr_desktop_page_save (ThunarAprDesktopPage
*desktop_page,
static void
+thunar_apr_desktop_page_set_string (GKeyFile*key_file,
+const gchar *key,
+const gchar *value)
+{
+ if (value != NULL *value != '\0')
+{
+ g_key_file_set_string (key_file,
+ G_KEY_FILE_DESKTOP_GROUP,
+ key, value);
+}
+ else
+{
+ g_key_file_remove_key (key_file,
+ G_KEY_FILE_DESKTOP_GROUP,
+ key, NULL);
+}
+}
+
+
+
+static void
thunar_apr_desktop_page_save_widget (ThunarAprDesktopPage *desktop_page,
GtkWidget*widget,
GKeyFile *key_file)
@@ -621,7 +642,7 @@ thunar_apr_desktop_page_save_widget (ThunarAprDesktopPage
*desktop_page,
key = g_strdup_printf (G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME [%s],
*locale);
if (g_key_file_has_key (key_file, G_KEY_FILE_DESKTOP_GROUP, key,
NULL))
{
- g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP, key,
desktop_page-description_text);
+ thunar_apr_desktop_page_set_string (key_file, key,
desktop_page-description_text);
g_free (key);
break;
}
@@ -631,10 +652,9 @@ thunar_apr_desktop_page_save_widget (ThunarAprDesktopPage
*desktop_page,
/* fallback to unlocalized description */
if (G_UNLIKELY (*locale == NULL))
{
- g_key_file_set_string (key_file,
- G_KEY_FILE_DESKTOP_GROUP,
- G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME,
- desktop_page-description_text);
+ thunar_apr_desktop_page_set_string (key_file,
+
G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME,
+ desktop_page-description_text);
}
}
else if (widget == desktop_page-command_entry)
@@ -644,10 +664,9 @@ thunar_apr_desktop_page_save_widget (ThunarAprDesktopPage
*desktop_page,
desktop_page-command_text = gtk_editable_get_chars (GTK_EDITABLE
(widget), 0, -1);
/* save the unlocalized command */
- g_key_file_set_string (key_file,
- G_KEY_FILE_DESKTOP_GROUP,
- G_KEY_FILE_DESKTOP_KEY_EXEC,
- desktop_page-command_text);
+ thunar_apr_desktop_page_set_string (key_file,
+ G_KEY_FILE_DESKTOP_KEY_EXEC,
+ desktop_page-command_text);
}
else if (widget == desktop_page-path_entry)
{
@@ -656,10 +675,9 @@ thunar_apr_desktop_page_save_widget (ThunarAprDesktopPage
*desktop_page,
desktop_page-path_text = gtk_editable_get_chars (GTK_EDITABLE (widget),
0, -1);
/* save the unlocalized command */
- g_key_file_set_string (key_file,
- G_KEY_FILE_DESKTOP_GROUP,
- G_KEY_FILE_DESKTOP_KEY_PATH,
- desktop_page-path_text);
+ thunar_apr_desktop_page_set_string (key_file,
+ G_KEY_FILE_DESKTOP_KEY_PATH,
+ desktop_page-path_text);
}
else if (widget == desktop_page-url_entry)
{
@@ -668,10 +686,9 @@ thunar_apr_desktop_page_save_widget (ThunarAprDesktopPage
*desktop_page,
desktop_page-url_text = gtk_editable_get_chars (GTK_EDITABLE (widget),
0, -1);
/* save the unlocalized url */
- g_key_file_set_string (key_file,
- G_KEY_FILE_DESKTOP_GROUP,
- G_KEY_FILE_DESKTOP_KEY_URL,
- desktop_page-url_text);
+ thunar_apr_desktop_page_set_string (key_file,
+ G_KEY_FILE_DESKTOP_KEY_URL,
+ desktop_page-url_text);
}
[Xfce4-commits] thunar:master Add hidden option to show full path in window title (bug #6412).
Updating branch refs/heads/master to 3ee371cfd06dcf78d7766e10cb462b1bcc422f46 (commit) from 7cb0de9b35f1bb0bbc5dc3104a25bcd79cb8b374 (commit) commit 3ee371cfd06dcf78d7766e10cb462b1bcc422f46 Author: Nick Schermer n...@xfce.org Date: Fri Sep 28 19:01:26 2012 +0200 Add hidden option to show full path in window title (bug #6412). Set MiscFullPathInTitle=TRUE in the thunarrc to enable the option. thunar/thunar-preferences.c | 15 +++ thunar/thunar-window.c | 13 - 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-preferences.c b/thunar/thunar-preferences.c index 84d1f9b..7e6acc6 100644 --- a/thunar/thunar-preferences.c +++ b/thunar/thunar-preferences.c @@ -72,6 +72,7 @@ enum PROP_MISC_CASE_SENSITIVE, PROP_MISC_DATE_STYLE, PROP_MISC_FOLDERS_FIRST, + PROP_MISC_FULL_PATH_IN_TITLE, PROP_MISC_HORIZONTAL_WHEEL_NAVIGATES, PROP_MISC_RECURSIVE_PERMISSIONS, PROP_MISC_REMEMBER_GEOMETRY, @@ -470,6 +471,20 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass) EXO_PARAM_READWRITE)); /** + * ThunarPreferences:misc-full-path-in-title: + * + * Show the full directory path in the window title, instead of + * only the directory name. + **/ + g_object_class_install_property (gobject_class, + PROP_MISC_FULL_PATH_IN_TITLE, + g_param_spec_boolean (misc-full-path-in-title, + MiscFullPathInTitle, + misc-full-path-in-title, + FALSE, + EXO_PARAM_READWRITE)); + + /** * ThunarPreferences:misc-horizontal-wheel-navigates: * * Whether the horizontal mouse wheel is used to navigate diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c index 0b83674..0ab4b05 100644 --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -2402,6 +2402,9 @@ thunar_window_current_directory_changed (ThunarFile *current_directory, GtkAction*action; gchar*icon_name; gchar*title; + gboolean show_full_path; + gchar*parse_name = NULL; + const gchar *name; _thunar_return_if_fail (THUNAR_IS_WINDOW (window)); _thunar_return_if_fail (THUNAR_IS_FILE (current_directory)); @@ -2412,10 +2415,18 @@ thunar_window_current_directory_changed (ThunarFile *current_directory, gtk_action_set_sensitive (action, (thunar_file_get_item_count (current_directory) 0)); gtk_action_set_visible (action, (thunar_file_is_root (current_directory) thunar_file_is_trashed (current_directory))); + /* get name of directory or full path */ + g_object_get (G_OBJECT (window-preferences), misc-full-path-in-title, show_full_path, NULL); + if (G_UNLIKELY (show_full_path)) +name = parse_name = g_file_get_parse_name (thunar_file_get_file (current_directory)); + else +name = thunar_file_get_display_name (current_directory); + /* set window title */ - title = g_strdup_printf (%s - %s, thunar_file_get_display_name (current_directory), _(File Manager)); + title = g_strdup_printf (%s - %s, name, _(File Manager)); gtk_window_set_title (GTK_WINDOW (window), title); g_free (title); + g_free (parse_name); /* set window icon */ icon_theme = gtk_icon_theme_get_default (); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Allow override Backspace as open-parent action (bug #5922).
Updating branch refs/heads/master
to b1599bc6b8fd64588468d88387e1ea20bcbe889d (commit)
from 3ee371cfd06dcf78d7766e10cb462b1bcc422f46 (commit)
commit b1599bc6b8fd64588468d88387e1ea20bcbe889d
Author: Nick Schermer n...@xfce.org
Date: Fri Sep 28 19:33:30 2012 +0200
Allow override Backspace as open-parent action (bug #5922).
If you don't want Backspace event result in a back action, but
in a parent-folder action. You can set Backspace as an accelerator
for the open-parent action, without conflicts.
thunar/thunar-window.c | 26 +-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 0ab4b05..5908713 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -1036,10 +1036,34 @@ thunar_window_set_property (GObject*object,
static gboolean
thunar_window_back (ThunarWindow *window)
{
- GtkAction *action;
+ GtkAction *action;
+ GdkEvent*event;
+ const gchar *accel_path;
+ GtkAccelKey key;
_thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
+ /* check source event */
+ event = gtk_get_current_event ();
+ if (event != NULL
+ event-type == GDK_KEY_PRESS)
+{
+ action = thunar_gtk_ui_manager_get_action_by_name (window-ui_manager,
open-parent);
+ if (G_LIKELY (action != NULL))
+{
+ /* check if the current event (back) is different then the
open-parent
+ * accelerator. this way a user can override the default backspace
action
+ * of back in open-parent, without backspace resulting in a back
action
+ * if open-parent is insensitive in the menu */
+ accel_path = gtk_action_get_accel_path (action);
+ if (accel_path != NULL
+ gtk_accel_map_lookup_entry (accel_path, key)
+ key.accel_key == ((GdkEventKey *) event)-keyval
+ key.accel_mods == 0)
+return FALSE;
+}
+}
+
/* activate the back action */
action = thunar_gtk_ui_manager_get_action_by_name (window-ui_manager,
back);
if (G_LIKELY (action != NULL))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Leave writable folders unset in private/ app mode
Updating branch refs/heads/master
to 6776bb960a04415e5d7e37e3e193d8e46e8d0d06 (commit)
from 7b8bd49ae4ca6c13f1144f3946ec555157fc5d0b (commit)
commit 6776bb960a04415e5d7e37e3e193d8e46e8d0d06
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Sep 28 19:00:49 2012 +0200
Leave writable folders unset in private/ app mode
katze/midori-paths.vala |5 -
tests/browser.c |2 +-
tests/extensions.c |3 +--
tests/speeddial.vala|2 +-
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index 16efc73..d60f242 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -72,11 +72,6 @@ namespace Midori {
exec_path, profile, tmp);
}
else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
-/* Use mock folders in development builds */
-if (. in MIDORI_VERSION_SUFFIX)
-config_dir = cache_dir = user_data_dir = config_base;
-else
-config_dir = cache_dir = user_data_dir = /;
readonly_dir = config_base ?? Path.build_path
(Path.DIR_SEPARATOR_S,
Environment.get_user_config_dir (), PACKAGE_NAME);
tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S,
diff --git a/tests/browser.c b/tests/browser.c
index cee7917..59dc076 100644
--- a/tests/browser.c
+++ b/tests/browser.c
@@ -143,7 +143,7 @@ main (intargc,
{
g_test_init (argc, argv, NULL);
midori_app_setup (argc, argv, NULL, NULL);
-midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL);
+midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
g_object_set_data (G_OBJECT (webkit_get_default_session ()),
midori-session-initialized, (void*)1);
diff --git a/tests/extensions.c b/tests/extensions.c
index 75251f0..97f85af 100644
--- a/tests/extensions.c
+++ b/tests/extensions.c
@@ -195,7 +195,7 @@ main (intargc,
{
g_test_init (argc, argv, NULL);
midori_app_setup (argc, argv, NULL, NULL);
-midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL);
+midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
soup_session_add_feature_by_type (webkit_get_default_session (),
SOUP_TYPE_COOKIE_JAR);
@@ -204,7 +204,6 @@ main (intargc,
if (g_module_supported ())
{
-const gchar* filename;
GDir* extension_dir = g_dir_open (EXTENSION_PATH, 0, NULL);
g_assert (extension_dir != NULL);
diff --git a/tests/speeddial.vala b/tests/speeddial.vala
index 513f0b5..813ccc0 100644
--- a/tests/speeddial.vala
+++ b/tests/speeddial.vala
@@ -84,7 +84,7 @@ void main (string[] args) {
string temporary_cache = DirUtils.make_tmp (cacheXX);
Environment.set_variable (XDG_CACHE_HOME, temporary_cache, true);
Test.init (ref args);
-Midori.Paths.init (Midori.RuntimeMode.PRIVATE, null);
+Midori.Paths.init (Midori.RuntimeMode.NORMAL, null);
Test.add_func (/speeddial/load, speeddial_load);
Test.run ();
DirUtils.remove (temporary_cache);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master No temporary file for locally viewing source
Updating branch refs/heads/master
to 47df922547169395f60ef72676df3a1b91e45f2d (commit)
from 6776bb960a04415e5d7e37e3e193d8e46e8d0d06 (commit)
commit 47df922547169395f60ef72676df3a1b91e45f2d
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Sep 28 19:06:25 2012 +0200
No temporary file for locally viewing source
midori/main.c |7 +++
midori/midori-browser.c |4 +---
midori/midori-view.c|3 +++
tests/browser.c | 11 +++
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 1f4a13a..a23f274 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1468,10 +1468,9 @@ midori_prepare_uri (const gchar *uri)
else if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)
!g_path_is_absolute (uri))
{
-gchar* current_dir = g_get_current_dir ();
-uri_ready = g_strconcat (file://, current_dir,
- G_DIR_SEPARATOR_S, uri, NULL);
-g_free (current_dir);
+GFile* file = g_file_new_for_commandline_arg (uri);
+uri_ready = g_file_get_uri (file);
+g_object_unref (file);
return uri_ready;
}
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index aacacd5..26791da 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3457,9 +3457,7 @@ _action_source_view_activate (GtkAction* action,
gchar* text_editor;
gchar* filename = NULL;
-if (!(view = midori_browser_get_current_tab (browser)))
-return;
-
+view = midori_browser_get_current_tab (browser);
filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL);
g_object_get (browser-settings, text-editor, text_editor, NULL);
if (!(text_editor *text_editor))
diff --git a/midori/midori-view.c b/midori/midori-view.c
index f3eddb2..cb392f0 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -5174,6 +5174,9 @@ midori_view_save_source (MidoriView* view,
if (uri == NULL)
uri = midori_view_get_display_uri (view);
+if (g_str_has_prefix (uri, file:///))
+return g_strdup (uri);
+
if (!outfile)
{
gchar* extension = midori_download_get_extension_for_uri (uri, NULL);
diff --git a/tests/browser.c b/tests/browser.c
index 59dc076..e4db491 100644
--- a/tests/browser.c
+++ b/tests/browser.c
@@ -32,6 +32,8 @@ browser_create (void)
gint n;
gchar* temporary_downloads;
GtkWidget* view;
+GFile* file;
+gchar* uri;
g_test_log_set_fatal_handler (skip_gtk_bugs, NULL);
@@ -48,6 +50,15 @@ browser_create (void)
midori_settings_set_download_folder (MIDORI_SETTINGS (settings),
temporary_downloads);
midori_browser_save_uri (browser, MIDORI_VIEW (view), NULL);
+/* View source for local file: should NOT use temporary file */
+file = g_file_new_for_commandline_arg (./data/error.html);
+uri = g_file_get_uri (file);
+g_object_unref (file);
+n = midori_browser_add_uri (browser, uri);
+midori_browser_set_current_page (browser, n);
+g_assert_cmpstr (uri, ==, midori_browser_get_current_uri (browser));
+g_free (uri);
+
gtk_widget_destroy (GTK_WIDGET (browser));
g_object_unref (settings);
g_object_unref (app);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Rename Paths.get_config_dir/filename _for_reading/writing
Updating branch refs/heads/master
to a363a6dcc05113d874e8dd1a4062b9df51d3873f (commit)
from 47df922547169395f60ef72676df3a1b91e45f2d (commit)
commit a363a6dcc05113d874e8dd1a4062b9df51d3873f
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Sep 28 19:23:07 2012 +0200
Rename Paths.get_config_dir/filename _for_reading/writing
And document the expected behavior.
katze/midori-paths.vala | 16 +++---
midori/main.c | 48 ++--
midori/midori-app.c |2 +-
midori/midori-bookmarks.c |4 +-
midori/midori-extension.c |2 +-
midori/midori-view.c |2 +-
midori/sokoke.c |2 +-
7 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index d60f242..0792559 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -41,12 +41,14 @@ namespace Midori {
static string? user_data_dir = null;
static string? tmp_dir = null;
-public static string get_readonly_config_dir () {
+public static string get_config_dir_for_reading () {
assert (mode != RuntimeMode.UNDEFINED);
return readonly_dir ?? config_dir;
}
-public static string get_readonly_config_filename (string filename) {
+/* returns the path to a user configuration file whose contents should
not be modified.
+to get the path to save settings, use get_config_filename() */
+public static string get_config_filename_for_reading (string filename)
{
assert (mode != RuntimeMode.UNDEFINED);
return Path.build_path (Path.DIR_SEPARATOR_S,
readonly_dir ?? config_dir, filename);
@@ -92,12 +94,15 @@ namespace Midori {
}
}
-public static unowned string get_config_dir () {
+public static unowned string get_config_dir_for_writing () {
assert (config_dir != null);
return config_dir;
}
-public static string get_config_filename (string filename) {
+/* returns the path to a user configuration file to which it is
permitted to write.
+this is also necessary for files whose state is synchronized to disk
by a manager,
+e.g. cookies. */
+public static string get_config_filename_for_writing (string filename)
{
assert (mode != RuntimeMode.UNDEFINED);
assert (config_dir != null);
return Path.build_path (Path.DIR_SEPARATOR_S, config_dir,
filename);
@@ -198,6 +203,8 @@ namespace Midori {
#endif
}
+/* returns the path to a file containing read-only data installed with
the application
+if @res is true, looks in the midori resource folder specifically */
public static string get_data_filename (string filename, bool res) {
assert (command_line != null);
string res1 = res ? PACKAGE_NAME : ;
@@ -220,6 +227,7 @@ namespace Midori {
#endif
}
+/* returns the path to a file containing system default configuration
*/
public static string get_preset_filename (string? folder, string
filename) {
assert (config_dir != null);
diff --git a/midori/main.c b/midori/main.c
index a23f274..0b1897f 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -56,7 +56,7 @@ static MidoriWebSettings*
settings_and_accels_new (gchar*** extensions)
{
MidoriWebSettings* settings = midori_web_settings_new ();
-gchar* config_file = midori_paths_get_readonly_config_filename (config);
+gchar* config_file = midori_paths_get_config_filename_for_reading
(config);
GKeyFile* key_file = g_key_file_new ();
GError* error = NULL;
GObjectClass* class;
@@ -149,7 +149,7 @@ settings_and_accels_new (gchar*** extensions)
g_key_file_free (key_file);
/* Load accelerators */
-katze_assign (config_file, midori_paths_get_config_filename (accels));
+katze_assign (config_file, midori_paths_get_config_filename_for_reading
(accels));
if (g_access (config_file, F_OK) != 0)
katze_assign (config_file, midori_paths_get_preset_filename (NULL,
accels));
gtk_accel_map_load (config_file);
@@ -331,7 +331,7 @@ search_engines_new_from_file (const gchar* filename,
static KatzeArray*
search_engines_new_from_folder (GString* error_messages)
{
-gchar* config_file = midori_paths_get_config_filename (search);
+gchar* config_file = midori_paths_get_config_filename_for_reading
(search);
GError* error = NULL;
KatzeArray* search_engines;
@@ -477,7 +477,7 @@ midori_history_initialize (KatzeArray* array,
COMMIT;,
NULL, NULL, errmsg);
-bookmarks_filename = midori_paths_get_config_filename (bookmarks_v2.db);
+bookmarks_filename = midori_paths_get_config_filename_for_writing
(bookmarks_v2.db);
sql =
[Xfce4-commits] thunar:master Allow editing desktop that are empty.
Updating branch refs/heads/master
to 1c0e847306b687ae6ca7de7ac6d374d24e0a37b9 (commit)
from b1599bc6b8fd64588468d88387e1ea20bcbe889d (commit)
commit 1c0e847306b687ae6ca7de7ac6d374d24e0a37b9
Author: Nick Schermer n...@xfce.org
Date: Fri Sep 28 20:38:33 2012 +0200
Allow editing desktop that are empty.
plugins/thunar-apr/thunar-apr-desktop-page.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.c
b/plugins/thunar-apr/thunar-apr-desktop-page.c
index b525b90..d90ab37 100644
--- a/plugins/thunar-apr/thunar-apr-desktop-page.c
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.c
@@ -557,7 +557,7 @@ thunar_apr_desktop_page_save (ThunarAprDesktopPage
*desktop_page,
/* determine the content of the key file */
data = g_key_file_to_data (key_file, data_length, error);
- if (G_LIKELY (data != NULL))
+ if (G_LIKELY (data_length 0))
{
/* try to save the key file content to disk */
fp = fopen (filename, w);
@@ -571,10 +571,10 @@ thunar_apr_desktop_page_save (ThunarAprDesktopPage
*desktop_page,
{
error = g_error_new_literal (G_FILE_ERROR,
g_file_error_from_errno (errno), g_strerror (errno));
}
-
- /* cleanup */
- g_free (data);
}
+
+ /* cleanup */
+ g_free (data);
}
/* check if we succeed */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Set desktop type in empty desktop files.
Updating branch refs/heads/master
to 28cf90311c3f8b66211838867f1a256d863d4bec (commit)
from 1c0e847306b687ae6ca7de7ac6d374d24e0a37b9 (commit)
commit 28cf90311c3f8b66211838867f1a256d863d4bec
Author: Nick Schermer n...@xfce.org
Date: Fri Sep 28 20:49:27 2012 +0200
Set desktop type in empty desktop files.
plugins/thunar-apr/thunar-apr-desktop-page.c | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.c
b/plugins/thunar-apr/thunar-apr-desktop-page.c
index d90ab37..069cd4b 100644
--- a/plugins/thunar-apr/thunar-apr-desktop-page.c
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.c
@@ -555,6 +555,16 @@ thunar_apr_desktop_page_save (ThunarAprDesktopPage
*desktop_page,
/* save the widget changes to the key file */
thunar_apr_desktop_page_save_widget (desktop_page, widget, key_file);
+ /* give empty desktop files a type */
+ if (!g_key_file_has_key (key_file, G_KEY_FILE_DESKTOP_GROUP,
+ G_KEY_FILE_DESKTOP_KEY_TYPE, NULL))
+{
+ g_key_file_set_string (key_file,
+ G_KEY_FILE_DESKTOP_GROUP,
+ G_KEY_FILE_DESKTOP_KEY_TYPE,
+ Application);
+}
+
/* determine the content of the key file */
data = g_key_file_to_data (key_file, data_length, error);
if (G_LIKELY (data_length 0))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Unset DBUS variables once registered (bug #8800).
Updating branch refs/heads/master
to ae5f4024ea255d762627babcbdff967d722bbb6a (commit)
from 28cf90311c3f8b66211838867f1a256d863d4bec (commit)
commit ae5f4024ea255d762627babcbdff967d722bbb6a
Author: Nick Schermer n...@xfce.org
Date: Fri Sep 28 20:49:48 2012 +0200
Unset DBUS variables once registered (bug #8800).
Remove the DBUS_STARTER_ADDRESS and DBUS_STARTER_BUS_TYPE
environment variables when the dbus service is registered
and started from the service file (by thunar-settings for
exampple).
Else these variables will also be in the child environ causing
problems in some applications that are execute by thunar.
thunar/thunar-dbus-service.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/thunar/thunar-dbus-service.c b/thunar/thunar-dbus-service.c
index 6b31a06..33b9709 100644
--- a/thunar/thunar-dbus-service.c
+++ b/thunar/thunar-dbus-service.c
@@ -272,6 +272,10 @@ thunar_dbus_service_init (ThunarDBusService *dbus_service)
/* request the org.xfce.FileManager name for Thunar */
dbus_bus_request_name (dbus_g_connection_get_connection
(dbus_service-connection), org.xfce.FileManager,
DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
+
+ /* once we registered, unset dbus variables (bug #8800) */
+ g_unsetenv (DBUS_STARTER_ADDRESS);
+ g_unsetenv (DBUS_STARTER_BUS_TYPE);
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Only collect image data if the mime-type is image/* (bug #2913).
Updating branch refs/heads/master
to d9129c8d59aecd3923e49db23266b271b50776b8 (commit)
from ae5f4024ea255d762627babcbdff967d722bbb6a (commit)
commit d9129c8d59aecd3923e49db23266b271b50776b8
Author: Nick Schermer n...@xfce.org
Date: Fri Sep 28 21:09:46 2012 +0200
Only collect image data if the mime-type is image/* (bug #2913).
Bit of a rough check, but it should be save. Invalid or empy svg files
are not detected as image/svg+xml.
Another advantage is that not all files are loaded to check if
it is an image, only files that look like images.
thunar/thunar-list-model.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c
index 940bd99..f76f648 100644
--- a/thunar/thunar-list-model.c
+++ b/thunar/thunar-list-model.c
@@ -2388,6 +2388,7 @@ thunar_list_model_get_statusbar_text (ThunarListModel
*store,
/* check if we can determine the dimension of this file (only for
image files) */
absolute_path = g_file_get_path (thunar_file_get_file (file));
if (absolute_path != NULL
+ g_str_has_prefix (thunar_file_get_content_type (file),
image/) /* bug #2913 */
gdk_pixbuf_get_file_info (absolute_path, width, height) !=
NULL)
{
/* append the image dimensions to the statusbar text */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Don't include query in suggested filenames
Updating branch refs/heads/master
to c8d277436485d67d1b6829ac438d15ceafdf1dbc (commit)
from a363a6dcc05113d874e8dd1a4062b9df51d3873f (commit)
commit c8d277436485d67d1b6829ac438d15ceafdf1dbc
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Sep 28 19:07:54 2012 +0200
Don't include query in suggested filenames
midori/midori-download.vala | 11 ++-
tests/download.vala | 22 +-
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/midori/midori-download.vala b/midori/midori-download.vala
index cc8c539..72f52f1 100644
--- a/midori/midori-download.vala
+++ b/midori/midori-download.vala
@@ -225,10 +225,9 @@ namespace Midori {
}
public string get_filename_suggestion_for_uri (string mime_type,
string uri) {
-/* Try to provide a good default filename, UTF-8 encoded */
-string filename = clean_filename (Soup.URI.decode (uri));
-/* Take the rest of the URI if needed */
-if (filename.has_suffix (/) || uri.index_of_char ('.') == -1)
+return_if_fail (Midori.URI.is_location (uri));
+string filename = File.new_for_uri (uri).get_basename ();
+if (uri.index_of_char ('.') == -1)
return Path.build_filename (filename, fallback_extension
(null, mime_type));
return filename;
}
@@ -244,8 +243,10 @@ namespace Midori {
int period = uri.last_index_of_char ('.', last_slash);
if (period == -1)
return null;
+/* Exclude the query: ?query=foobar */
+int query = uri.last_index_of_char ('?', period);
/* The extension, or . if it ended with a period */
-string extension = uri.substring (period, -1);
+string extension = uri.substring (period, query - period);
if (basename != null)
basename = uri.substring (0, period);
return extension;
diff --git a/tests/download.vala b/tests/download.vala
index c5e0f98..746cba2 100644
--- a/tests/download.vala
+++ b/tests/download.vala
@@ -11,19 +11,30 @@
struct TestCase {
public string data;
-public string? expected;
+public string mime_type;
+public string? expected_filename;
+public string? expected_extension;
}
const TestCase[] filenames = {
-{ /tmp/midori-user/tumblr123.jpg, .jpg },
-{ https://green.cat/8019B6/a.b/500.jpg;, .jpg },
-{ http://example.com/file.png;, .png }
+{ file:///tmp/midori-user/tumblr123.jpg, image/jpg, tumblr123.jpg,
.jpg },
+{ https://green.cat/8019B6/a.b/500.jpg;, image/jpg, 500.jpg, .jpg },
+{ http://example.com/file.png;, image/png, file.png, .png },
+{ http://svn.sf.net/doc/doxy_to_dev.xsl.m4?rev=253;,
application/xslt+xml, doxy_to_dev.xsl.m4, .m4 }
};
+static void download_suggestion () {
+foreach (var filename in filenames) {
+string? result = Midori.Download.get_filename_suggestion_for_uri (
+filename.mime_type, filename.data);
+Katze.assert_str_equal (filename.data, result,
filename.expected_filename);
+}
+}
+
static void download_extension () {
foreach (var filename in filenames) {
string? result = Midori.Download.get_extension_for_uri (filename.data);
-Katze.assert_str_equal (filename.data, result, filename.expected);
+Katze.assert_str_equal (filename.data, result,
filename.expected_extension);
}
}
@@ -51,6 +62,7 @@ static void download_unique () {
void main (string[] args) {
Test.init (ref args);
+Test.add_func (/download/suggestion, download_suggestion);
Test.add_func (/download/extension, download_extension);
Test.add_func (/download/unique, download_unique);
Test.run ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
