[Xfce4-commits] thunar:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 8b99888a739492fd21426b525bd1fa174ee830e4 (commit) from 41c2831bb36dee3837dea31a788054b509a2d613 (commit) commit 8b99888a739492fd21426b525bd1fa174ee830e4 Author: Pjotr vertaalt pjotrverta...@gmail.com Date: Tue Sep 18 11:02:02 2012 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 688 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 129 - 1 files changed, 59 insertions(+), 70 deletions(-) diff --git a/po/nl.po b/po/nl.po index 897df21..24a417e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the thunar package. # Vincent Tunru imn...@gmail.com, 2006-2007. # Pjotr, 2011. -# +# msgid msgstr Project-Id-Version: thunar\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-09-16 22:33+0200\n +POT-Creation-Date: 2012-09-18 04:21+\n PO-Revision-Date: 2011-09-08 15:47+0100\n Last-Translator: Pjotr\n Language-Team: Dutch (Flemish)\n -Language: nl (Dutch)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: nl (Dutch)\n Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../thunar/main.c:62 @@ -697,9 +697,8 @@ msgstr ReplaceDialogPart1|Wilt u de bestaande map vervangen msgid ReplaceDialogPart1|Do you want to replace the existing file msgstr ReplaceDialogPart1|Wilt u het bestaande bestand vervangen -#. #. Fourth box (size, volume, free space) -#. +#. #: ../thunar/thunar-dialogs.c:587 ../thunar/thunar-dialogs.c:618 #: ../thunar/thunar-properties-dialog.c:463 msgid Size: @@ -780,9 +779,8 @@ msgstr Naam msgid Owner msgstr Eigenaar -#. #. Permissions chooser -#. +#. #: ../thunar/thunar-enum-types.c:121 ../thunar/thunar-properties-dialog.c:535 msgid Permissions msgstr Rechten @@ -1174,10 +1172,12 @@ msgstr '%s' koppelbaar msgid \%s\ (%s) %s msgstr '%s' (%s) %s -#. TRANSLATORS: Try to come up with a short translation of Original Path (which is the path -#. * where the trashed file/folder was located before it was moved to the trash), otherwise the +#. TRANSLATORS: Try to come up with a short translation of Original Path +#. (which is the path +#. * where the trashed file/folder was located before it was moved to the +#. trash), otherwise the #. * properties dialog width will be messed up. -#. +#. #: ../thunar/thunar-list-model.c:2381 ../thunar/thunar-properties-dialog.c:371 msgid Original Path: msgstr Oorspronkelijk pad: @@ -1408,9 +1408,8 @@ msgstr wijzigen. #: ../thunar/thunar-permissions-chooser.c:908 -#, fuzzy msgid Mixed file owners -msgstr Onbekende bestandeigenaar +msgstr Gemengde bestandeigenaren #: ../thunar/thunar-permissions-chooser.c:908 msgid Unknown file owner @@ -1437,7 +1436,7 @@ msgstr Lezen en schrijven #: ../thunar/thunar-permissions-chooser.c:993 msgid Varying (no change) -msgstr +msgstr Variërend (geen verandering) #: ../thunar/thunar-permissions-chooser.c:1124 msgid Correct folder permissions automatically? @@ -1461,9 +1460,8 @@ msgstr msgid File Manager Preferences msgstr Voorkeuren voor bestandbeheerder -#. #. Display -#. +#. #: ../thunar/thunar-preferences-dialog.c:208 msgid Display msgstr Weergave @@ -1537,9 +1535,8 @@ msgstr Datum msgid _Format: msgstr _Opmaak: -#. #. Side Pane -#. +#. #: ../thunar/thunar-preferences-dialog.c:319 msgid Side Pane msgstr Zijbalk @@ -1621,9 +1618,8 @@ msgstr boomstructuur- balk, voor alle mappen waarvoor emblemen zijn ingesteld in het dialoogvenster voor mapeigenschappen. -#. #. Behavior -#. +#. #: ../thunar/thunar-preferences-dialog.c:413 msgid Behavior msgstr Gedrag @@ -1674,9 +1670,8 @@ msgstr Lang msgid _Double click to activate items msgstr _Dubbelklikken om elementen te starten -#. #. Advanced -#. +#. #: ../thunar/thunar-preferences-dialog.c:513 msgid Advanced msgstr Geavanceerd @@ -1725,7 +1720,8 @@ msgstr stations\n en media (bijvoorbeeld hoe met camera's moet worden omgegaan). -#. tell the user that we failed to come up with the thunar-volman configuration dialog +#. tell the user that we failed to come up with the thunar-volman +#. configuration dialog #: ../thunar/thunar-preferences-dialog.c:640 msgid Failed to display the volume management settings msgstr Kon de instellingen voor mediumbeheer niet weergeven. @@ -1776,13 +1772,11 @@ msgid Name: msgstr Naam: #: ../thunar/thunar-properties-dialog.c:291 -#, fuzzy msgid Names: -msgstr Naam: +msgstr Namen: -#. #. Second box (kind, open with, link target) -#. +#. #: ../thunar/thunar-properties-dialog.c:318 msgid Kind: msgstr Soort: @@ -1796,13 +1790,11 @@ msgid Link Target: msgstr Doel van koppeling: #: ../thunar/thunar-properties-dialog.c:385 -#, fuzzy msgid Location: -msgstr _Locatie: +msgstr Locatie: -#. #. Third box (deleted,
[Xfce4-commits] midori:master Consistently use readonly_config_filename for loading
Updating branch refs/heads/master
to d88b9776f2d3c1c1bf2aaf40c307082cb2597145 (commit)
from 13b735e382eea200b9df4022ea8a6f96595e994f (commit)
commit d88b9776f2d3c1c1bf2aaf40c307082cb2597145
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Sep 18 00:13:15 2012 +0200
Consistently use readonly_config_filename for loading
katze/midori-hsts.vala|2 +-
katze/midori-paths.vala | 51 ++-
midori/main.c | 98 -
midori/midori-extension.c |2 +-
4 files changed, 76 insertions(+), 77 deletions(-)
diff --git a/katze/midori-hsts.vala b/katze/midori-hsts.vala
index 76a800b..a878a6e 100644
--- a/katze/midori-hsts.vala
+++ b/katze/midori-hsts.vala
@@ -45,7 +45,7 @@ namespace Midori {
public HSTS (owned string filename) {
whitelist = new HashTablestring, Directive (str_hash, str_equal);
-read_cache (File.new_for_path (Paths.get_config_filename (null,
hsts)));
+read_cache (File.new_for_path (Paths.get_preset_filename (null,
hsts)));
file = File.new_for_path (filename);
read_cache (file);
if (strcmp (Environment.get_variable (MIDORI_DEBUG), hsts) ==
0)
diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index db1e4d1..16efc73 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -19,6 +19,7 @@ extern const string LIBDIR;
extern const string MDATADIR;
extern const string PACKAGE_NAME;
extern const string SYSCONFDIR;
+extern const string MIDORI_VERSION_SUFFIX;
namespace Midori {
public enum RuntimeMode {
@@ -35,18 +36,25 @@ namespace Midori {
static RuntimeMode mode = RuntimeMode.UNDEFINED;
static string? config_dir = null;
+static string? readonly_dir = null;
static string? cache_dir = null;
static string? user_data_dir = null;
static string? tmp_dir = null;
-public static string get_readonly_config_dir (RuntimeMode new_mode) {
-assert (mode == RuntimeMode.UNDEFINED);
-if (new_mode == RuntimeMode.PORTABLE) {
-return Path.build_path (Path.DIR_SEPARATOR_S,
-exec_path, profile, config);
-}
+public static string get_readonly_config_dir () {
+assert (mode != RuntimeMode.UNDEFINED);
+return readonly_dir ?? config_dir;
+}
+
+public static string get_readonly_config_filename (string filename) {
+assert (mode != RuntimeMode.UNDEFINED);
return Path.build_path (Path.DIR_SEPARATOR_S,
-Environment.get_user_config_dir (), PACKAGE_NAME);
+readonly_dir ?? config_dir, filename);
+}
+
+public bool is_readonly () {
+assert (mode != RuntimeMode.UNDEFINED);
+return readonly_dir != null;
}
public static void init (RuntimeMode new_mode, string? config_base) {
@@ -64,18 +72,19 @@ namespace Midori {
exec_path, profile, tmp);
}
else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
-config_dir = private-or-app://;
-cache_dir = private-or-app://;
-user_data_dir = private-or-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,
Environment.get_tmp_dir (), midori- +
Environment.get_user_name ());
}
else {
-if (config_base != null)
-config_dir = config_base;
-else
-config_dir = Path.build_path (Path.DIR_SEPARATOR_S,
-Environment.get_user_config_dir (), PACKAGE_NAME);
+config_dir = config_base ?? Path.build_path
(Path.DIR_SEPARATOR_S,
+Environment.get_user_config_dir (), PACKAGE_NAME);
cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
Environment.get_user_cache_dir (), PACKAGE_NAME);
user_data_dir = Environment.get_user_data_dir ();
@@ -88,15 +97,17 @@ namespace Midori {
}
}
-public bool is_readonly () {
-return mode == RuntimeMode.APP || mode == RuntimeMode.PRIVATE;
-}
-
public static unowned string get_config_dir () {
assert (config_dir != null);
return config_dir;
}
+public static string get_config_filename (string
[Xfce4-commits] midori:master sokoke_js_script_eval should not crash when js_message is NULL
Updating branch refs/heads/master
to 00bd3f08185f815c4d1419e5a6f6d86928f7fd40 (commit)
from d88b9776f2d3c1c1bf2aaf40c307082cb2597145 (commit)
commit 00bd3f08185f815c4d1419e5a6f6d86928f7fd40
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Mon Sep 17 17:04:31 2012 +0200
sokoke_js_script_eval should not crash when js_message is NULL
midori/sokoke.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 6784168..5ef53d4 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -85,6 +85,8 @@ sokoke_js_script_eval (JSContextRef js_context,
{
JSStringRef js_message = JSValueToStringCopy (js_context,
js_exception, NULL);
+g_return_val_if_fail (js_message != NULL, NULL);
+
value = sokoke_js_string_utf8 (js_message);
if (exception)
*exception = value;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Adblock: search a couple more lines for update metadata
Updating branch refs/heads/master
to 55c11850bbc19da1b7cce402e8860175de7f6b2d (commit)
from 00bd3f08185f815c4d1419e5a6f6d86928f7fd40 (commit)
commit 55c11850bbc19da1b7cce402e8860175de7f6b2d
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Mon Sep 17 17:02:48 2012 +0200
Adblock: search a couple more lines for update metadata
extensions/adblock.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/extensions/adblock.c b/extensions/adblock.c
index f150432..62f8fc7 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -1572,7 +1572,7 @@ adblock_file_is_up_to_date (gchar* path)
gboolean found_meta = FALSE;
gint fs_days_elapsed, days_elapsed = 0, least_days;
-for (i = 0; i = 10; i++)
+for (i = 0; i = 15; i++)
{
fgets (line, 2000, file);
if (strncmp (! Expires, line, 9) == 0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Copy Image s/Address// always copy both URL and data
Updating branch refs/heads/master
to 2e3882db4b97138250121c3c3fe42c4f9388b05c (commit)
from 55c11850bbc19da1b7cce402e8860175de7f6b2d (commit)
commit 2e3882db4b97138250121c3c3fe42c4f9388b05c
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Sep 18 00:35:19 2012 +0200
Copy Image s/Address// always copy both URL and data
midori/midori-view.c | 73 +
midori/sokoke.c | 36 +---
midori/sokoke.h |6 +++-
3 files changed, 102 insertions(+), 13 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index a691dff..a2337f4 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2256,9 +2256,9 @@ midori_web_view_menu_link_copy_activate_cb (GtkWidget*
widget,
MidoriView* view)
{
if (g_str_has_prefix (view-link_uri, mailto:;))
-sokoke_widget_copy_clipboard (widget, view-link_uri + 7);
+sokoke_widget_copy_clipboard (widget, view-link_uri + 7, NULL, NULL);
else
-sokoke_widget_copy_clipboard (widget, view-link_uri);
+sokoke_widget_copy_clipboard (widget, view-link_uri, NULL, NULL);
}
static void
@@ -2291,12 +2291,73 @@ midori_web_view_menu_image_new_tab_activate_cb
(GtkWidget* widget,
g_free (uri);
}
+static GString*
+midori_view_get_data_for_uri (MidoriView* view,
+ const gchar* uri)
+{
+WebKitWebView* web_view = WEBKIT_WEB_VIEW (view-web_view);
+WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
+WebKitWebDataSource* data_source = webkit_web_frame_get_data_source
(frame);
+GList* resources = webkit_web_data_source_get_subresources (data_source);
+GList* list;
+GString* result;
+
+for (list = resources; list; list = g_list_next (list))
+{
+WebKitWebResource* resource = WEBKIT_WEB_RESOURCE (list-data);
+GString* data = webkit_web_resource_get_data (resource);
+if (!g_strcmp0 (webkit_web_resource_get_uri (resource), uri))
+{
+result = data;
+break;
+}
+}
+g_list_free (resources);
+return result;
+}
+
+static void
+midori_view_clipboard_get_image_cb (GtkClipboard* clipboard,
+GtkSelectionData* selection_data,
+guint info,
+gpointer user_data)
+{
+MidoriView* view = MIDORI_VIEW (g_object_get_data (user_data, view));
+WebKitHitTestResult* hit_test = user_data;
+gchar* uri = katze_object_get_string (hit_test, image-uri);
+/* if (gtk_selection_data_targets_include_image (selection_data, TRUE)) */
+{
+GString* data = midori_view_get_data_for_uri (view, uri);
+if (data != NULL)
+{
+GInputStream* stream = g_memory_input_stream_new_from_data
(data-str, data-len, NULL);
+GError* error = NULL;
+GdkPixbuf* pixbuf = gdk_pixbuf_new_from_stream (stream, NULL,
error);
+g_object_unref (stream);
+if (error != NULL)
+{
+g_critical (Error copying pixbuf: %s\n, error-message);
+g_error_free (error);
+}
+gtk_selection_data_set_pixbuf (selection_data, pixbuf);
+g_object_unref (pixbuf);
+}
+else
+g_warn_if_reached ();
+}
+/* if (gtk_selection_data_targets_include_text (selection_data)) */
+gtk_selection_data_set_text (selection_data, uri, -1);
+g_free (uri);
+}
+
static void
midori_web_view_menu_image_copy_activate_cb (GtkWidget* widget,
MidoriView* view)
{
gchar* uri = katze_object_get_string (view-hit_test, image-uri);
-sokoke_widget_copy_clipboard (widget, uri);
+g_object_set_data (G_OBJECT (view-hit_test), view, view);
+sokoke_widget_copy_clipboard (widget,
+uri, midori_view_clipboard_get_image_cb, view-hit_test);
g_free (uri);
}
@@ -2323,7 +2384,7 @@ midori_web_view_menu_video_copy_activate_cb (GtkWidget*
widget,
MidoriView* view)
{
gchar* uri = katze_object_get_string (view-hit_test, media-uri);
-sokoke_widget_copy_clipboard (widget, uri);
+sokoke_widget_copy_clipboard (widget, uri, NULL, NULL);
g_free (uri);
}
@@ -2398,7 +2459,7 @@ static void
midori_web_view_menu_copy_activate_cb (GtkWidget* widget,
MidoriView* view)
{
-sokoke_widget_copy_clipboard (widget, view-selected_text);
+sokoke_widget_copy_clipboard (widget, view-selected_text, NULL, NULL);
}
static void
@@ -2689,7 +2750,7 @@ midori_view_populate_popup (MidoriView* view,
_(Open _Image in New Tab), STOCK_TAB_NEW,
G_CALLBACK (midori_web_view_menu_image_new_tab_activate_cb),
widget);
[Xfce4-commits] thunar:master Use mnemonic widgets in the properties dialog.
Updating branch refs/heads/master to 8fc3176fb50dbd00f381c16262917171840ff4ba (commit) from 8b99888a739492fd21426b525bd1fa174ee830e4 (commit) commit 8fc3176fb50dbd00f381c16262917171840ff4ba Author: Nick Schermer n...@xfce.org Date: Tue Sep 18 18:51:06 2012 +0200 Use mnemonic widgets in the properties dialog. thunar/thunar-permissions-chooser.c | 16 ++-- thunar/thunar-properties-dialog.c |6 -- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c index 542650c..9eab0d1 100644 --- a/thunar/thunar-permissions-chooser.c +++ b/thunar/thunar-permissions-chooser.c @@ -232,13 +232,14 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser) row += 1; - label = gtk_label_new (_(Access:)); + label = gtk_label_new_with_mnemonic (_(_Access:)); gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f); gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ()); gtk_table_attach (GTK_TABLE (chooser-table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (label); chooser-access_combos[2] = gtk_combo_box_new (); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser-access_combos[2]); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser-access_combos[2]), renderer_text, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (chooser-access_combos[2]), renderer_text, text, 0); exo_binding_new (G_OBJECT (chooser), mutable, G_OBJECT (chooser-access_combos[2]), sensitive); @@ -255,13 +256,14 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser) row += 1; - label = gtk_label_new (_(Group:)); + label = gtk_label_new_with_mnemonic (_(Gro_up:)); gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f); gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ()); gtk_table_attach (GTK_TABLE (chooser-table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (label); chooser-group_combo = gtk_combo_box_new (); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser-group_combo); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser-group_combo), renderer_text, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (chooser-group_combo), renderer_text, text, THUNAR_PERMISSIONS_STORE_COLUMN_NAME); gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (chooser-group_combo), thunar_permissions_chooser_row_separator, NULL, NULL); @@ -273,13 +275,14 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser) row += 1; - label = gtk_label_new (_(Access:)); + label = gtk_label_new_with_mnemonic (_(Acce_ss:)); gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f); gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ()); gtk_table_attach (GTK_TABLE (chooser-table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (label); chooser-access_combos[1] = gtk_combo_box_new (); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser-access_combos[1]); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser-access_combos[1]), renderer_text, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (chooser-access_combos[1]), renderer_text, text, 0); exo_binding_new (G_OBJECT (chooser), mutable, G_OBJECT (chooser-access_combos[1]), sensitive); @@ -296,13 +299,14 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser) row += 1; - label = gtk_label_new (_(Others:)); + label = gtk_label_new_with_mnemonic (_(O_thers:)); gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f); gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ()); gtk_table_attach (GTK_TABLE (chooser-table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (label); chooser-access_combos[0] = gtk_combo_box_new (); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser-access_combos[0]); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser-access_combos[0]), renderer_text, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (chooser-access_combos[0]), renderer_text, text, 0); exo_binding_new (G_OBJECT (chooser), mutable, G_OBJECT (chooser-access_combos[0]), sensitive); @@ -373,7 +377,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser) gtk_table_attach (GTK_TABLE (chooser-table), hbox, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (hbox); - chooser-fixperm_button = gtk_button_new_with_mnemonic (_(Correct folder permissions...)); + chooser-fixperm_button = gtk_button_new_with_mnemonic (_(Correct _folder permissions...)); gtk_widget_set_tooltip_text (chooser-fixperm_button, _(Click here to automatically fix the folder permissions.)); g_signal_connect_swapped (G_OBJECT (chooser-fixperm_button), clicked, G_CALLBACK
[Xfce4-commits] thunar:master Improve view response when using dnd between 2 windows.
Updating branch refs/heads/master
to c21dc002c6cac3347bb94bc73627aef1d407cca6 (commit)
from 8fc3176fb50dbd00f381c16262917171840ff4ba (commit)
commit c21dc002c6cac3347bb94bc73627aef1d407cca6
Author: Nick Schermer n...@xfce.org
Date: Tue Sep 18 21:40:18 2012 +0200
Improve view response when using dnd between 2 windows.
thunar/thunar-standard-view.c | 46 -
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 50bf0d7..0077d8b 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -189,7 +189,8 @@ static void
thunar_standard_view_action_rename (Gtk
ThunarStandardView *standard_view);
static void thunar_standard_view_action_restore
(GtkAction*action,
ThunarStandardView *standard_view);
-static GClosure*thunar_standard_view_new_files_closure
(ThunarStandardView *standard_view);
+static GClosure*thunar_standard_view_new_files_closure
(ThunarStandardView *standard_view,
+
GtkWidget*source_view);
static void thunar_standard_view_new_files
(ThunarStandardView *standard_view,
GList*path_list);
static gboolean thunar_standard_view_button_release_event
(GtkWidget*view,
@@ -1848,7 +1849,7 @@ thunar_standard_view_action_create_empty_file (GtkAction
*action,
/* launch the operation */
application = thunar_application_get ();
thunar_application_creat (application, GTK_WIDGET (standard_view),
path_list,
-thunar_standard_view_new_files_closure
(standard_view));
+thunar_standard_view_new_files_closure
(standard_view, NULL));
g_object_unref (application);
/* release the path */
@@ -1892,7 +1893,7 @@ thunar_standard_view_action_create_folder (GtkAction
*action,
/* launch the operation */
application = thunar_application_get ();
thunar_application_mkdir (application, GTK_WIDGET (standard_view),
path_list,
-thunar_standard_view_new_files_closure
(standard_view));
+thunar_standard_view_new_files_closure
(standard_view, NULL));
g_object_unref (G_OBJECT (application));
/* release the path */
@@ -1950,7 +1951,7 @@ thunar_standard_view_action_create_template (GtkAction
*action,
/* launch the operation */
application = thunar_application_get ();
thunar_application_copy_to (application, GTK_WIDGET (standard_view),
source_path_list, target_path_list,
- thunar_standard_view_new_files_closure
(standard_view));
+ thunar_standard_view_new_files_closure
(standard_view, NULL));
g_object_unref (G_OBJECT (application));
/* release the target path */
@@ -2045,7 +2046,7 @@ thunar_standard_view_action_paste (GtkAction
*action,
if (G_LIKELY (current_directory != NULL))
{
thunar_clipboard_manager_paste_files (standard_view-clipboard,
thunar_file_get_file (current_directory),
-GTK_WIDGET (standard_view),
thunar_standard_view_new_files_closure (standard_view));
+GTK_WIDGET (standard_view),
thunar_standard_view_new_files_closure (standard_view, NULL));
}
}
@@ -2185,7 +2186,7 @@ thunar_standard_view_action_duplicate (GtkAction
*action,
* creates duplicates of the files.
*/
application = thunar_application_get ();
- new_files_closure = thunar_standard_view_new_files_closure
(standard_view);
+ new_files_closure = thunar_standard_view_new_files_closure
(standard_view, NULL);
thunar_application_copy_into (application, GTK_WIDGET
(standard_view), selected_files,
thunar_file_get_file
(current_directory), new_files_closure);
g_object_unref (G_OBJECT (application));
@@ -,7 +2223,7 @@ thunar_standard_view_action_make_link (GtkAction
*action,
* creates new unique links for the files.
*/
application = thunar_application_get ();
- new_files_closure = thunar_standard_view_new_files_closure
(standard_view);
[Xfce4-commits] midori:master Remove generic browser creation and property set tests
Updating branch refs/heads/master
to b4b795e1567d39317b1598e479a30f68348a3fd2 (commit)
from 2e3882db4b97138250121c3c3fe42c4f9388b05c (commit)
commit b4b795e1567d39317b1598e479a30f68348a3fd2
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Sep 18 21:00:56 2012 +0200
Remove generic browser creation and property set tests
tests/browser.c| 24 ++--
tests/properties.c | 105
2 files changed, 4 insertions(+), 125 deletions(-)
diff --git a/tests/browser.c b/tests/browser.c
index f05e1be..fa94912 100644
--- a/tests/browser.c
+++ b/tests/browser.c
@@ -15,32 +15,16 @@ static void
browser_create (void)
{
MidoriApp* app;
+MidoriSpeedDial* dial;
MidoriBrowser* browser;
-GtkActionGroup* action_group;
-GList* actions;
app = midori_app_new ();
+dial = midori_speed_dial_new (/, NULL);
+g_object_set (app, speed-dial, dial, NULL);
browser = midori_app_create_browser (app);
gtk_widget_destroy (GTK_WIDGET (browser));
-
-app = midori_app_new ();
-browser = midori_app_create_browser (app);
-action_group = midori_browser_get_action_group (browser);
-actions = gtk_action_group_list_actions (action_group);
-while (actions)
-{
-GtkAction* action = actions-data;
-if (g_strcmp0 (gtk_action_get_name (action), WindowClose))
-if (g_strcmp0 (gtk_action_get_name (action), EncodingCustom))
-if (g_strcmp0 (gtk_action_get_name (action), AddSpeedDial))
-if (g_strcmp0 (gtk_action_get_name (action),
PrivateBrowsing))
-if (g_strcmp0 (gtk_action_get_name (action),
AddDesktopShortcut))
-gtk_action_activate (action);
-actions = g_list_next (actions);
-}
-g_list_free (actions);
-gtk_widget_destroy (GTK_WIDGET (browser));
g_object_unref (app);
+g_object_unref (dial);
}
static void
diff --git a/tests/properties.c b/tests/properties.c
index 99bd847..2613fdb 100644
--- a/tests/properties.c
+++ b/tests/properties.c
@@ -11,29 +11,6 @@
#include midori.h
-typedef struct
-{
-const gchar* type;
-const gchar* property;
-} ObjectProperty;
-
-static ObjectProperty properties_object_skip[] =
-{
-{ MidoriWebSettings, user-agent },
-};
-
-static gboolean
-properties_should_skip (const gchar* type,
-const gchar* property)
-{
-guint i;
-for (i = 0; i G_N_ELEMENTS (properties_object_skip); i++)
-if (g_str_equal (properties_object_skip[i].type, type))
-if (g_str_equal (properties_object_skip[i].property, property))
-return TRUE;
-return FALSE;
-}
-
#define pspec_is_writable(pspec) (pspec-flags G_PARAM_WRITABLE \
!(pspec-flags (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)))
@@ -49,19 +26,12 @@ properties_object_get_set (GObject* object)
for (i = 0; i n_properties; i++)
{
GParamSpec *pspec = pspecs[i];
-GType type = G_PARAM_SPEC_TYPE (pspec);
-const gchar* property = g_param_spec_get_name (pspec);
-void* value = NULL;
guint j;
/* Skip properties of parent classes */
if (pspec-owner_type != G_OBJECT_TYPE (object))
continue;
-/* Skip properties that cannot be tested generically */
-if (properties_should_skip (G_OBJECT_TYPE_NAME (object), property))
-continue;
-
/* Verify that the ID is unique */
if (pspecs[i]-owner_type == G_OBJECT_TYPE (object))
for (j = 0; j n_properties; j++)
@@ -71,81 +41,6 @@ properties_object_get_set (GObject* object)
pspec-param_id,
g_param_spec_get_name (pspec),
g_param_spec_get_name (pspecs[j]));
-
-if (!(pspec-flags G_PARAM_READABLE))
-continue;
-
-g_object_get (object, property, value, NULL);
-if (type == G_TYPE_PARAM_BOOLEAN)
-{
-gboolean current_value = value ? TRUE : FALSE;
-gboolean default_value = G_PARAM_SPEC_BOOLEAN
(pspec)-default_value;
-if (current_value != default_value)
-g_error (Set %s.%s to default (%d), but returned '%d',
-G_OBJECT_TYPE_NAME (object), property,
-G_PARAM_SPEC_BOOLEAN (pspec)-default_value,
current_value);
-if (pspec_is_writable (pspec))
-{
-g_object_set (object, property, !default_value, NULL);
-g_object_get (object, property, current_value, NULL);
-if (current_value == default_value)
-g_error (Set %s.%s to non-default (%d), but returned
'%d',
-G_OBJECT_TYPE_NAME (object), property,
-!G_PARAM_SPEC_BOOLEAN (pspec)-default_value,
current_value);
-g_object_set (object, property, default_value,
[Xfce4-commits] midori:master Remove is_email API and needless hard-coding of mailto:
Updating branch refs/heads/master
to 7e39d05a172b2b5ae885c5538ce18b18c10c13ff (commit)
from b4b795e1567d39317b1598e479a30f68348a3fd2 (commit)
commit 7e39d05a172b2b5ae885c5538ce18b18c10c13ff
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Sep 18 21:25:59 2012 +0200
Remove is_email API and needless hard-coding of mailto:
katze/midori-uri.vala |7 +--
midori/midori-view.c | 11 +++
tests/magic-uri.c |1 -
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/katze/midori-uri.vala b/katze/midori-uri.vala
index adefff8..05ebcea 100644
--- a/katze/midori-uri.vala
+++ b/katze/midori-uri.vala
@@ -114,12 +114,7 @@ namespace Midori {
|| (uri.has_prefix (geo:) uri.chr (-1, ',') != null)
|| uri.has_prefix (javascript:));
}
-public static bool is_email (string? uri) {
-return uri != null
- (uri.chr (-1, '@') != null || uri.has_prefix (mailto:;))
-/* :// and @ together would mean login credentials */
- uri.str (://) == null;
-}
+
public static bool is_ip_address (string? uri) {
/* Quick check for IPv4 or IPv6, no validation.
FIXME: Schemes are not handled
diff --git a/midori/midori-view.c b/midori/midori-view.c
index a2337f4..b3b6634 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -959,7 +959,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView*
web_view
g_free (new_uri);
return TRUE;
}
-else if (g_str_has_prefix (uri, mailto:;) || sokoke_external_uri (uri))
+else if (sokoke_external_uri (uri))
{
if (sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (web_view)),
uri, GDK_CURRENT_TIME, NULL))
@@ -1784,7 +1784,7 @@ static gboolean
midori_view_always_same_tab (const gchar* uri)
{
/* No opening in tab, window or app for Javascript or mailto links */
-return g_str_has_prefix (uri, javascript:) || midori_uri_is_email (uri);
+return g_str_has_prefix (uri, javascript:) || g_str_has_prefix (uri,
mailto:;);
}
static void
@@ -2831,7 +2831,10 @@ midori_view_populate_popup (MidoriView* view,
g_strstrip (view-selected_text);
if (midori_uri_is_valid (view-selected_text))
{
-if (midori_uri_is_email (view-selected_text))
+/* :// and @ together would mean login credentials */
+if (g_str_has_prefix (view-selected_text, mailto:;)
+ || (strchr (view-selected_text, '@') != NULL
+ strstr (view-selected_text, ://) == NULL))
{
gchar* text = g_strdup_printf (_(Send a message to %s),
view-selected_text);
menuitem = midori_view_insert_menu_item (menu_shell, -1,
@@ -4466,7 +4469,7 @@ midori_view_set_uri (MidoriView* view,
g_free (exception);
}
}
-else if (g_str_has_prefix (uri, mailto:;) || sokoke_external_uri
(uri))
+else if (sokoke_external_uri (uri))
{
sokoke_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
}
diff --git a/tests/magic-uri.c b/tests/magic-uri.c
index f036fea..be9a199 100644
--- a/tests/magic-uri.c
+++ b/tests/magic-uri.c
@@ -212,7 +212,6 @@ static void
magic_uri_pseudo (void)
{
test_input (javascript:alert(1), javascript:alert(1));
-test_input (mailto:christ...@twotoasts.de;,
mailto:christ...@twotoasts.de;);
test_input (data:text/html;charset=utf-8,titleTest/titleTest,
data:text/html;charset=utf-8,titleTest/titleTest);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Enclose screen saver and root window in IS_X11_DISPLAY
Updating branch refs/heads/master
to 01b36c5fc46385faf40eea9d66af1a5c8c497409 (commit)
from 7e39d05a172b2b5ae885c5538ce18b18c10c13ff (commit)
commit 01b36c5fc46385faf40eea9d66af1a5c8c497409
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Sep 18 21:29:38 2012 +0200
Enclose screen saver and root window in IS_X11_DISPLAY
If building with a Wayland-enabled GTK+3 the GdkDisplay
can be something other than GdkX11Display at runtime.
Fixes: https://bugs.launchpad.net/midori/+bug/975355
katze/gtk3-compat.h |4
midori/main.c | 13 ++---
midori/sokoke.c | 43 +++
3 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h
index 12981b1..a8450af 100644
--- a/katze/gtk3-compat.h
+++ b/katze/gtk3-compat.h
@@ -116,6 +116,10 @@ G_BEGIN_DECLS
#define GDK_KEY_Return GDK_Return
#endif
+#ifndef GDK_IS_X11_DISPLAY
+#define GDK_IS_X11_DISPLAY(display) TRUE
+#endif
+
G_END_DECLS
#endif
diff --git a/midori/main.c b/midori/main.c
index d2104d7..2d3af37 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1599,9 +1599,16 @@ midori_inactivity_timeout (gpointer data)
if (has_extension == -1)
{
GdkDisplay* display = gtk_widget_get_display (GTK_WIDGET
(mit-browser));
-xdisplay = GDK_DISPLAY_XDISPLAY (display);
-has_extension = XScreenSaverQueryExtension (xdisplay,
-event_base, error_base);
+if (GDK_IS_X11_DISPLAY (display))
+{
+xdisplay = GDK_DISPLAY_XDISPLAY (display);
+has_extension = XScreenSaverQueryExtension (xdisplay,
+event_base,
error_base);
+}
+else
+{
+has_extension = 0;
+}
}
if (has_extension)
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 8efc184..a303bfb 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -688,26 +688,29 @@ sokoke_get_desktop (void)
}
else
{
-/* Are we running in Xfce = 4.6? */
-GdkDisplay* display = gdk_display_get_default ();
-Display* xdisplay = GDK_DISPLAY_XDISPLAY (display);
-Window root_window = RootWindow (xdisplay, 0);
-Atom save_mode_atom = gdk_x11_get_xatom_by_name_for_display (
-display, _DT_SAVE_MODE);
-Atom actual_type;
-int actual_format;
-unsigned long n_items, bytes;
-gchar* value;
-int status = XGetWindowProperty (xdisplay, root_window,
-save_mode_atom, 0, (~0L),
-False, AnyPropertyType, actual_type, actual_format,
-n_items, bytes, (unsigned char**)value);
-if (status == Success)
-{
-if (n_items == 6 !strncmp (value, xfce4, 6))
-desktop = SOKOKE_DESKTOP_XFCE;
-XFree (value);
-}
+/* Are we running in Xfce = 4.6? */
+GdkDisplay* display = gdk_display_get_default ();
+if (GDK_IS_X11_DISPLAY (display))
+{
+Display* xdisplay = GDK_DISPLAY_XDISPLAY (display);
+Window root_window = RootWindow (xdisplay, 0);
+Atom save_mode_atom = gdk_x11_get_xatom_by_name_for_display (
+display, _DT_SAVE_MODE);
+Atom actual_type;
+int actual_format;
+unsigned long n_items, bytes;
+gchar* value;
+int status = XGetWindowProperty (xdisplay, root_window,
+save_mode_atom, 0, (~0L),
+False, AnyPropertyType, actual_type, actual_format,
+n_items, bytes, (unsigned char**)value);
+if (status == Success)
+{
+if (n_items == 6 !strncmp (value, xfce4, 6))
+desktop = SOKOKE_DESKTOP_XFCE;
+XFree (value);
+}
+}
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master Add function to invert selection in icon view.
Updating branch refs/heads/master
to 2b103d2cc906b55829e3f8b0064e2f241127018f (commit)
from 4d487fd7e4d18f5308297b05282fcb8974941b8a (commit)
commit 2b103d2cc906b55829e3f8b0064e2f241127018f
Author: Nick Schermer n...@xfce.org
Date: Tue Sep 18 22:26:33 2012 +0200
Add function to invert selection in icon view.
docs/reference/exo-sections.txt |1 +
exo/exo-icon-view.c | 35 +++
exo/exo-icon-view.h |1 +
exo/exo.symbols |1 +
4 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/docs/reference/exo-sections.txt b/docs/reference/exo-sections.txt
index 842fc1c..a1fe34f 100644
--- a/docs/reference/exo-sections.txt
+++ b/docs/reference/exo-sections.txt
@@ -198,6 +198,7 @@ exo_icon_view_get_item_row
exo_icon_view_get_selected_items
exo_icon_view_select_all
exo_icon_view_unselect_all
+exo_icon_view_selection_invert
exo_icon_view_item_activated
exo_icon_view_get_cursor
exo_icon_view_set_cursor
diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index 9587596..39bf93c 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -5627,6 +5627,41 @@ exo_icon_view_select_all (ExoIconView *icon_view)
/**
+ * exo_icon_view_selection_invert:
+ * @icon_view : A #ExoIconView.
+ *
+ * Selects all the icons that are currently not selected. @icon_view must
+ * has its selection mode set to #GTK_SELECTION_MULTIPLE.
+ **/
+void
+exo_icon_view_selection_invert (ExoIconView *icon_view)
+{
+ GList *items;
+ gboolean dirty = FALSE;
+ ExoIconViewItem *item;
+
+ g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
+
+ if (icon_view-priv-selection_mode != GTK_SELECTION_MULTIPLE)
+return;
+
+ for (items = icon_view-priv-items; items; items = items-next)
+{
+ item = items-data;
+
+ item-selected = !item-selected;
+ exo_icon_view_queue_draw_item (icon_view, item);
+
+ dirty = TRUE;
+}
+
+ if (dirty)
+g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+
+
+/**
* exo_icon_view_unselect_all:
* @icon_view : A #ExoIconView.
*
diff --git a/exo/exo-icon-view.h b/exo/exo-icon-view.h
index 0dec327..6a8df23 100644
--- a/exo/exo-icon-view.h
+++ b/exo/exo-icon-view.h
@@ -260,6 +260,7 @@ gboolean exo_icon_view_path_is_selected
(const ExoIconView
GList*exo_icon_view_get_selected_items(const
ExoIconView*icon_view);
void exo_icon_view_select_all(ExoIconView
*icon_view);
void exo_icon_view_unselect_all (ExoIconView
*icon_view);
+void exo_icon_view_selection_invert (ExoIconView
*icon_view);
void exo_icon_view_item_activated(ExoIconView
*icon_view,
GtkTreePath
*path);
diff --git a/exo/exo.symbols b/exo/exo.symbols
index 74511cb..9c3a659 100644
--- a/exo/exo.symbols
+++ b/exo/exo.symbols
@@ -197,6 +197,7 @@ exo_icon_view_get_item_row
exo_icon_view_get_selected_items
exo_icon_view_select_all
exo_icon_view_unselect_all
+exo_icon_view_selection_invert
exo_icon_view_item_activated
exo_icon_view_get_cursor
exo_icon_view_set_cursor
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Implement selection invertion.
Updating branch refs/heads/master
to d385dd9d08f84cb11797ec3421f2f0076446499f (commit)
from c21dc002c6cac3347bb94bc73627aef1d407cca6 (commit)
commit d385dd9d08f84cb11797ec3421f2f0076446499f
Author: Nick Schermer n...@xfce.org
Date: Tue Sep 18 22:42:39 2012 +0200
Implement selection invertion.
thunar/thunar-abstract-icon-view.c | 11 +++
thunar/thunar-details-view.c | 52
thunar/thunar-standard-view-ui.xml |1 +
thunar/thunar-standard-view.c | 21 ++
thunar/thunar-standard-view.h |3 ++
5 files changed, 88 insertions(+), 0 deletions(-)
diff --git a/thunar/thunar-abstract-icon-view.c
b/thunar/thunar-abstract-icon-view.c
index b2f3164..d244a79 100644
--- a/thunar/thunar-abstract-icon-view.c
+++ b/thunar/thunar-abstract-icon-view.c
@@ -44,6 +44,7 @@ static void
thunar_abstract_icon_view_disconnect_ui_manager (ThunarStand
static GList *thunar_abstract_icon_view_get_selected_items
(ThunarStandardView *standard_view);
static void thunar_abstract_icon_view_select_all
(ThunarStandardView *standard_view);
static void thunar_abstract_icon_view_unselect_all
(ThunarStandardView *standard_view);
+static void thunar_abstract_icon_view_selection_invert
(ThunarStandardView *standard_view);
static void thunar_abstract_icon_view_select_path
(ThunarStandardView *standard_view,
GtkTreePath *path);
static void thunar_abstract_icon_view_set_cursor
(ThunarStandardView *standard_view,
@@ -153,6 +154,7 @@ thunar_abstract_icon_view_class_init
(ThunarAbstractIconViewClass *klass)
thunarstandard_view_class-get_selected_items =
thunar_abstract_icon_view_get_selected_items;
thunarstandard_view_class-select_all = thunar_abstract_icon_view_select_all;
thunarstandard_view_class-unselect_all =
thunar_abstract_icon_view_unselect_all;
+ thunarstandard_view_class-selection_invert =
thunar_abstract_icon_view_selection_invert;
thunarstandard_view_class-select_path =
thunar_abstract_icon_view_select_path;
thunarstandard_view_class-set_cursor = thunar_abstract_icon_view_set_cursor;
thunarstandard_view_class-scroll_to_path =
thunar_abstract_icon_view_scroll_to_path;
@@ -319,6 +321,15 @@ thunar_abstract_icon_view_unselect_all (ThunarStandardView
*standard_view)
static void
+thunar_abstract_icon_view_selection_invert (ThunarStandardView *standard_view)
+{
+ _thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
+ exo_icon_view_selection_invert (EXO_ICON_VIEW (GTK_BIN
(standard_view)-child));
+}
+
+
+
+static void
thunar_abstract_icon_view_select_path (ThunarStandardView *standard_view,
GtkTreePath*path)
{
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index 09b9429..7bb2957 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -58,6 +58,7 @@ static void thunar_details_view_disconnect_ui_manager
(ThunarStandardV
static GList *thunar_details_view_get_selected_items
(ThunarStandardView *standard_view);
static void thunar_details_view_select_all
(ThunarStandardView *standard_view);
static void thunar_details_view_unselect_all
(ThunarStandardView *standard_view);
+static void thunar_details_view_selection_invert
(ThunarStandardView *standard_view);
static void thunar_details_view_select_path
(ThunarStandardView *standard_view,
GtkTreePath
*path);
static void thunar_details_view_set_cursor
(ThunarStandardView *standard_view,
@@ -156,6 +157,7 @@ thunar_details_view_class_init (ThunarDetailsViewClass
*klass)
thunarstandard_view_class-get_selected_items =
thunar_details_view_get_selected_items;
thunarstandard_view_class-select_all = thunar_details_view_select_all;
thunarstandard_view_class-unselect_all = thunar_details_view_unselect_all;
+ thunarstandard_view_class-selection_invert =
thunar_details_view_selection_invert;
thunarstandard_view_class-select_path = thunar_details_view_select_path;
thunarstandard_view_class-set_cursor = thunar_details_view_set_cursor;
thunarstandard_view_class-scroll_to_path =
thunar_details_view_scroll_to_path;
@@ -460,6 +462,56 @@ thunar_details_view_unselect_all (ThunarStandardView
*standard_view)
static void
+thunar_details_view_selection_invert_foreach (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+
[Xfce4-commits] xfce4-xkb-plugin:master Get rid of a redundant if (handle) check.
Updating branch refs/heads/master
to 1474d4a846cc20781f99b7718e4b7372d47be55f (commit)
from e8fe13e2f74cc462215cecca19271e0254df5b4d (commit)
commit 1474d4a846cc20781f99b7718e4b7372d47be55f
Author: Igor Slepchin igor.slepc...@gmail.com
Date: Mon Sep 10 17:50:09 2012 -0400
Get rid of a redundant if (handle) check.
We did the same exact check a few lines earlier.
panel-plugin/xkb-cairo.c | 45 -
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/panel-plugin/xkb-cairo.c b/panel-plugin/xkb-cairo.c
index 8de3ec5..9c80444 100644
--- a/panel-plugin/xkb-cairo.c
+++ b/panel-plugin/xkb-cairo.c
@@ -92,39 +92,34 @@ xkb_cairo_draw_flag (cairo_t *cr,
scalex = (double) (width - 4) / dim.width;
scaley = (double) (height - 4) / dim.height;
-if (handle)
-{
-layoutx = (actual_width - width) / 2 + 2;
-layouty = (actual_height - height) / 2 + 2;
-cairo_translate (cr, layoutx, layouty);
-
-//cairo_translate (cr, 2, 2);
+layoutx = (actual_width - width) / 2 + 2;
+layouty = (actual_height - height) / 2 + 2;
+cairo_translate (cr, layoutx, layouty);
-cairo_save (cr);
+cairo_save (cr);
-cairo_scale (cr, scalex, scaley);
-rsvg_handle_render_cairo (handle, cr);
+cairo_scale (cr, scalex, scaley);
+rsvg_handle_render_cairo (handle, cr);
-cairo_restore (cr);
+cairo_restore (cr);
-/* draw variant_markers_count circles */
-for (i = 0; i variant_markers_count; i++)
-{
-cairo_set_source_rgb (cr, 0, 0, 0);
-
-cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-cairo_set_line_width (cr, 1);
+/* draw variant_markers_count circles */
+for (i = 0; i variant_markers_count; i++)
+{
+cairo_set_source_rgb (cr, 0, 0, 0);
-xkb_cairo_arc_for_flag (cr, -(7 * i) + 4, 4, 2.5, 0, 2 * G_PI);
+cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+cairo_set_line_width (cr, 1);
-cairo_set_source_rgb (cr, 0, 0, 0);
-cairo_fill_preserve (cr);
-cairo_set_source_rgb (cr, 1, 1, 1);
-cairo_stroke (cr);
-}
+xkb_cairo_arc_for_flag (cr, -(7 * i) + 4, 4, 2.5, 0, 2 * G_PI);
-g_object_unref (handle);
+cairo_set_source_rgb (cr, 0, 0, 0);
+cairo_fill_preserve (cr);
+cairo_set_source_rgb (cr, 1, 1, 1);
+cairo_stroke (cr);
}
+
+g_object_unref (handle);
}
void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-xkb-plugin:master Update the tooltip whenever the selected layout changes.
Updating branch refs/heads/master
to 6a0acf5d78451e4c4648d99a1b7f4c0d52d78a66 (commit)
from 1474d4a846cc20781f99b7718e4b7372d47be55f (commit)
commit 6a0acf5d78451e4c4648d99a1b7f4c0d52d78a66
Author: Enrique cqu...@ovi.com
Date: Tue Sep 18 13:34:58 2012 -0400
Update the tooltip whenever the selected layout changes.
Bug 9286.
panel-plugin/xfce4-xkb-plugin.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/xfce4-xkb-plugin.c b/panel-plugin/xfce4-xkb-plugin.c
index 598d68a..e9b1233 100644
--- a/panel-plugin/xfce4-xkb-plugin.c
+++ b/panel-plugin/xfce4-xkb-plugin.c
@@ -416,9 +416,17 @@ xkb_populate_popup_menu (t_xkb *xkb)
void
xkb_refresh_gui (t_xkb *xkb)
{
+GdkDisplay * display;
+
/* Part of the image may remain visible after display type change */
gtk_widget_queue_draw_area (xkb-btn, 0, 0,
xkb-button_hsize, xkb-button_vsize);
+
+display = gdk_display_get_default();
+if (display)
+{
+gtk_tooltip_trigger_tooltip_query(display);
+}
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-appfinder:master l10n: Updated Amharic (am) translation to 32%
Updating branch refs/heads/master to 5865abb99861614124cecbd1415370d42624c4e7 (commit) from 424418316733e3f8b9b17cd7345fe6d967b06ef8 (commit) commit 5865abb99861614124cecbd1415370d42624c4e7 Author: Tegegne Tefera tef...@mekuria.com Date: Wed Sep 19 07:41:16 2012 +0200 l10n: Updated Amharic (am) translation to 32% New status: 22 messages complete with 1 fuzzy and 45 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/am.po | 227 -- 1 files changed, 161 insertions(+), 66 deletions(-) diff --git a/po/am.po b/po/am.po index b6291a6..1e935dc 100644 --- a/po/am.po +++ b/po/am.po @@ -2,123 +2,163 @@ # Copyright (C) 2002-2007 The Xfce development team. # This file is distributed under the same license as the xfce4-appfinder package. # Tegegne Tefera tef...@mekuria.com, 2007. -# +# msgid msgstr Project-Id-Version: xfce4-appfinder 4.4.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-09-21 20:43+0200\n +POT-Creation-Date: 2012-09-19 02:21+\n PO-Revision-Date: 2007-07-01 11:31+0100\n Last-Translator: tegegne tefera tef...@mekuria.com\n Language-Team: Amharic l10n...@googlegroups.com\n -Language: am\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: am\n -#: ../src/appfinder-category-model.c:108 -#, fuzzy +#: ../src/appfinder-category-model.c:146 msgid All Applications -msgstr ለሸፍሲ4 ፕሮግራም ፈላጊ +msgstr ሁሉም ፕሮግራሞች -#: ../src/appfinder-model.c:422 +#: ../src/appfinder-model.c:545 msgid Name -msgstr +msgstr ስም + +#: ../src/appfinder-model.c:546 +msgid Comment +msgstr አስተያየት -#: ../src/appfinder-model.c:423 +#: ../src/appfinder-model.c:547 msgid Command -msgstr +msgstr ትዕዛዝ -#: ../src/appfinder-model.c:424 +#: ../src/appfinder-model.c:548 msgid Categories msgstr ክፍሎች -#: ../src/appfinder-model.c:425 -#, fuzzy +#: ../src/appfinder-model.c:549 msgid Filename -msgstr ፋይል አስተናባሪ +msgstr የፋይል ስም -#: ../src/appfinder-model.c:1317 -#, fuzzy +#: ../src/appfinder-model.c:1829 msgid Application has no command -msgstr ለሸፍሲ4 ፕሮግራም ፈላጊ +msgstr ፕሮግራሙ ትዕዛዝ የለውም -#: ../src/appfinder-model.c:1634 +#: ../src/appfinder-model.c:2153 msgid Commands History -msgstr +msgstr የትዕዛዝ ታሪክ -#: ../src/appfinder-preferences.c:175 +#: ../src/appfinder-preferences.c:221 msgid C_lear msgstr -#: ../src/appfinder-preferences.c:176 +#: ../src/appfinder-preferences.c:222 msgid This will permanently clear the custom command history. msgstr -#: ../src/appfinder-preferences.c:177 +#: ../src/appfinder-preferences.c:223 msgid Are you sure you want to clear the command history? msgstr -#: ../src/appfinder-preferences.c:287 +#: ../src/appfinder-preferences.c:333 msgid The custom action will be deleted permanently. msgstr -#: ../src/appfinder-preferences.c:288 +#: ../src/appfinder-preferences.c:334 #, c-format msgid Are you sure you want to delete pattern \%s\? msgstr -#: ../src/appfinder-window.c:183 ../src/main.c:344 -#: ../src/appfinder-preferences.glade.h:3 +#: ../src/appfinder-window.c:219 ../src/main.c:446 +#: ../src/appfinder-preferences.glade.h:4 #: ../data/xfce4-appfinder.desktop.in.h:1 -#, fuzzy msgid Application Finder -msgstr ለሸፍሲ4 ፕሮግራም ፈላጊ +msgstr ፕሮግራም ፈላጊ -#: ../src/appfinder-window.c:224 +#: ../src/appfinder-window.c:271 msgid Toggle view mode msgstr -#: ../src/main.c:70 +#: ../src/appfinder-window.c:363 +msgid La_unch +msgstr + +#: ../src/appfinder-window.c:798 +msgid Failed to launch desktop item editor +msgstr + +#: ../src/appfinder-window.c:824 +msgid +This will permanently remove the custom desktop file from your home +directory. +msgstr + +#: ../src/appfinder-window.c:825 +#, c-format +msgid Are you sure you want to revert \%s\? +msgstr + +#: ../src/appfinder-window.c:835 +msgid Failed to remove desktop file +msgstr + +#. I18N: the first %s will be replace with users' applications directory, the +#. * second with Hidden=true +#: ../src/appfinder-window.c:868 +#, c-format +msgid +To unhide the item you have to manually remove the desktop file from \%s\ +or open the file in the same directory and remove the line \%s\. +msgstr + +#: ../src/appfinder-window.c:873 ../src/appfinder-window.c:965 +msgid _Hide +msgstr + +#: ../src/appfinder-window.c:874 +#, c-format +msgid Are you sure you want to hide \%s\? +msgstr + +#: ../src/main.c:75 msgid Start in collapsed mode msgstr -#: ../src/main.c:71 -#, fuzzy +#: ../src/main.c:76 msgid Print version information and exit msgstr ተጨማሪ መረጃ... -#: ../src/main.c:72 +#: ../src/main.c:77 msgid Replace the existing service msgstr -#: ../src/main.c:73 +#: ../src/main.c:78 msgid Quit all instances msgstr -#: ../src/main.c:74 +#: ../src/main.c:79 msgid Do not try to use or become a D-Bus service msgstr #. close all windows and quit -#: ../src/main.c:159 +#: ../src/main.c:244 msgid Forced to quit msgstr -#:
