date:20130310

[Xfce4-commits] Use stripped down XBEL variant for session and trash

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to c3e74779f195037abd04c50af11c148acfae86b2 (commit)
   from e612e5923a2502706cc6fbf10ec1b98284ccaf81 (commit)

commit c3e74779f195037abd04c50af11c148acfae86b2
Author: Christian Dywan 
Date:   Mon Mar 11 01:27:34 2013 +0100

Use stripped down XBEL variant for session and trash

 midori/midori-array.c|   50 +++--
 midori/midori-frontend.c |2 +-
 midori/midori-session.c  |2 +-
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/midori/midori-array.c b/midori/midori-array.c
index 06877e3..5d7d5ff 100644
--- a/midori/midori-array.c
+++ b/midori/midori-array.c
@@ -35,7 +35,8 @@ katze_xbel_parse_info (KatzeItem* item,
xmlNodePtr cur);
 
 static gchar*
-katze_item_metadata_to_xbel (KatzeItem* item);
+katze_item_metadata_to_xbel (KatzeItem* item,
+ gboolean   tiny_xbel);
 
 #if HAVE_LIBXML
 static KatzeItem*
@@ -187,6 +188,7 @@ katze_xbel_parse_info (KatzeItem* item,
 /* Loads the contents from an xmlNodePtr into an array. */
 static gboolean
 katze_array_from_xmlDocPtr (KatzeArray* array,
+gbooleantiny_xbel,
 xmlDocPtr   doc)
 {
 xmlNodePtr cur;
@@ -205,7 +207,7 @@ katze_array_from_xmlDocPtr (KatzeArray* array,
 gchar* value;
 
 value = (gchar*)xmlGetProp (cur, (xmlChar*)"version");
-if (!value || !katze_str_equal (value, "1.0"))
+if (!tiny_xbel && (!value || !katze_str_equal (value, "1.0")))
 g_warning ("XBEL version is not 1.0.");
 g_free (value);
 
@@ -597,6 +599,7 @@ midori_array_from_file (KatzeArray*  array,
 
 /* XBEL */
 if (katze_str_equal (format, "xbel")
+ || katze_str_equal (format, "xbel-tiny")
  || !*format)
 {
 xmlDocPtr doc;
@@ -610,7 +613,7 @@ midori_array_from_file (KatzeArray*  array,
 return FALSE;
 }
 
-if (!katze_array_from_xmlDocPtr (array, doc))
+if (!katze_array_from_xmlDocPtr (array, katze_str_equal (format, 
"xbel-tiny"), doc))
 {
 /* Parsing failed */
 xmlFreeDoc (doc);
@@ -701,13 +704,14 @@ string_append_xml_element (GString* string,
 
 static void
 string_append_item (GString*   string,
-KatzeItem* item)
+KatzeItem* item,
+gboolean   tiny_xbel)
 {
 gchar* metadata;
 
 g_return_if_fail (KATZE_IS_ITEM (item));
 
-metadata = katze_item_metadata_to_xbel (item);
+metadata = katze_item_metadata_to_xbel (item, tiny_xbel);
 if (KATZE_IS_ARRAY (item))
 {
 KatzeItem* _item;
@@ -719,7 +723,7 @@ string_append_item (GString*   string,
 string_append_xml_element (string, "title", katze_item_get_name 
(item));
 string_append_xml_element (string, "desc", katze_item_get_text (item));
 KATZE_ARRAY_FOREACH_ITEM_L (_item, array, list)
-string_append_item (string, _item);
+string_append_item (string, _item, tiny_xbel);
 g_string_append (string, metadata);
 g_string_append (string, "\n");
 g_list_free (list);
@@ -787,7 +791,8 @@ string_append_netscape_item (GString*   string,
 }
 
 static gchar*
-katze_item_metadata_to_xbel (KatzeItem* item)
+katze_item_metadata_to_xbel (KatzeItem* item,
+ gboolean   tiny_xbel)
 {
 GList* keys = katze_item_get_meta_keys (item);
 GString* markup;
@@ -817,7 +822,7 @@ katze_item_metadata_to_xbel (KatzeItem* item)
 string_append_escaped (markdown, value);
 g_string_append_printf (markdown, "\n", key);
 }
-else if (namespace)
+else if (namespace || tiny_xbel)
 {
 g_string_append_printf (markup, " %s=\"", key);
 string_append_escaped (markup, value);
@@ -830,7 +835,7 @@ katze_item_metadata_to_xbel (KatzeItem* item)
 g_string_append_c (markup, '\"');
 }
 }
-if (!namespace)
+if (!namespace && !tiny_xbel)
 {
 namespace_uri = "http://www.twotoasts.de";;
 g_string_append_printf (markup, " owner=\"%s\"", namespace_uri);
@@ -845,25 +850,27 @@ katze_item_metadata_to_xbel (KatzeItem* item)
 
 static gchar*
 katze_array_to_xbel (KatzeArray* array,
+ gbooleantiny_xbel,
  GError**error)
 {
-gchar* metadata = katze_item_metadata_to_xbel (KATZE_ITEM (array));
+gchar* metadata = katze_item_metadata_to_xbel (KATZE_ITEM (array), 
tiny_xbel);
 KatzeItem* item;
 GList* list;
 
-GString* markup = g_string_new (
-"\n"
-"http://www.python.org/topics/xml/dtds/xbel-1.0.dtd\";>\n"
-"http://www.twotoasts.de\"";
-">\n");
+GString* markup = g_string_new ("\n");
+if (tiny_xbel)
+g_string_append (markup, "\n");
+else
+g_string_append (

[Xfce4-commits] Check more carefully that app/ private got URLs

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to e612e5923a2502706cc6fbf10ec1b98284ccaf81 (commit)
   from c382eb25af0b13debd047d44947adcb682e03181 (commit)

commit e612e5923a2502706cc6fbf10ec1b98284ccaf81
Author: Christian Dywan 
Date:   Mon Mar 11 01:01:44 2013 +0100

Check more carefully that app/ private got URLs

Fixes: https://bugs.launchpad.net/midori/+bug/1152590

 midori/midori-frontend.c |   18 ++
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/midori/midori-frontend.c b/midori/midori-frontend.c
index 963cb6a..47593ba 100644
--- a/midori/midori-frontend.c
+++ b/midori/midori-frontend.c
@@ -45,6 +45,8 @@ midori_web_app_new (const gchar* config,
 gint inactivity_reset,
 const gchar* block_uris)
 {
+guint i;
+
 midori_paths_init (MIDORI_RUNTIME_MODE_APP, config);
 #ifndef HAVE_WEBKIT2
 g_object_set_data (G_OBJECT (webkit_get_default_session ()), 
"pass-through-console", (void*)1);
@@ -84,11 +86,7 @@ midori_web_app_new (const gchar* config,
 midori_browser_add_uri (browser, tmp_uri);
 g_free (tmp_uri);
 }
-else if (open_uris == NULL)
-midori_browser_add_uri (browser, "about:blank");
-gtk_widget_show (GTK_WIDGET (browser));
 
-guint i;
 if (open_uris != NULL)
 for (i = 0; open_uris[i] != NULL; i++)
 {
@@ -96,6 +94,9 @@ midori_web_app_new (const gchar* config,
 midori_browser_add_uri (browser, new_uri);
 g_free (new_uri);
 }
+if (midori_browser_get_n_pages (browser) == 0)
+midori_browser_add_uri (browser, "about:blank");
+gtk_widget_show (GTK_WIDGET (browser));
 
 if (execute_commands != NULL)
 for (i = 0; execute_commands[i] != NULL; i++)
@@ -145,6 +146,8 @@ midori_private_app_new (const gchar* config,
 gint inactivity_reset,
 const gchar* block_uris)
 {
+guint i;
+
 midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, config);
 #ifndef HAVE_WEBKIT2
 g_object_set_data (G_OBJECT (webkit_get_default_session ()), 
"pass-through-console", (void*)1);
@@ -211,11 +214,7 @@ midori_private_app_new (const gchar* config,
 midori_browser_add_uri (browser, tmp_uri);
 g_free (tmp_uri);
 }
-else if (open_uris == NULL)
-midori_browser_add_uri (browser, "about:private");
-gtk_widget_show (GTK_WIDGET (browser));
 
-guint i;
 if (open_uris != NULL)
 for (i = 0; open_uris[i] != NULL; i++)
 {
@@ -223,6 +222,9 @@ midori_private_app_new (const gchar* config,
 midori_browser_add_uri (browser, new_uri);
 g_free (new_uri);
 }
+if (midori_browser_get_n_pages (browser) == 0)
+midori_browser_add_uri (browser, "about:private");
+gtk_widget_show (GTK_WIDGET (browser));
 
 if (execute_commands != NULL)
 for (i = 0; execute_commands[i] != NULL; i++)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Merge sokoke_prepare_uri into _magic_uri

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to c382eb25af0b13debd047d44947adcb682e03181 (commit)
   from 9da062efdd93d3eaf6bffcd1bd53c93ff920a6b9 (commit)

commit c382eb25af0b13debd047d44947adcb682e03181
Author: Christian Dywan 
Date:   Mon Mar 11 01:00:52 2013 +0100

Merge sokoke_prepare_uri into _magic_uri

Add flag to consider search an error.

 midori/main.c|6 +++---
 midori/midori-app.c  |2 +-
 midori/midori-browser.c  |4 ++--
 midori/midori-frontend.c |8 
 midori/midori-session.c  |2 +-
 midori/midori-view.c |6 +++---
 midori/sokoke.c  |   36 
 midori/sokoke.h  |7 +++
 8 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index e999b2d..f0ea8a0 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -266,7 +266,7 @@ main (intargc,
 g_signal_connect (web_view, "load-finished",
 G_CALLBACK (snapshot_load_finished_cb), filename);
 #endif
-uri = sokoke_prepare_uri (snapshot);
+uri = sokoke_magic_uri (snapshot, FALSE, TRUE);
 webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri);
 g_free (uri);
 gtk_main ();
@@ -281,8 +281,8 @@ main (intargc,
 GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL);
 #endif
 GtkWidget* web_view = webkit_web_view_new ();
-gchar* uri = sokoke_prepare_uri (
-(uris != NULL && uris[0]) ? uris[0] : "http://www.example.com";);
+gchar* uri = sokoke_magic_uri (
+(uris != NULL && uris[0]) ? uris[0] : "http://www.example.com";, 
FALSE, TRUE);
 katze_window_set_sensible_default_size (GTK_WINDOW (window));
 
 #ifndef HAVE_WEBKIT2
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 2a587c9..df2a060 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1071,7 +1071,7 @@ midori_app_instance_send_uris (MidoriApp* app,
 int i = 0;
 while (uris[i] != NULL)
 {
-gchar* new_uri = sokoke_prepare_uri (uris[i]);
+gchar* new_uri = sokoke_magic_uri (uris[i], TRUE, TRUE);
 gchar* escaped_uri = g_uri_escape_string (new_uri, NULL, FALSE);
 g_free (new_uri);
 katze_assign (uris[i], escaped_uri);
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index ae716b3..d9b70f0 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2929,7 +2929,7 @@ midori_browser_open_bookmark (MidoriBrowser* browser,
 return;
 
 /* Imported bookmarks may lack a protocol */
-uri_fixed = sokoke_magic_uri (uri);
+uri_fixed = sokoke_magic_uri (uri, TRUE, FALSE);
 if (!uri_fixed)
 uri_fixed = g_strdup (uri);
 
@@ -3789,7 +3789,7 @@ _action_location_submit_uri (GtkAction* action,
 }
 
 uri = katze_skip_whitespace (uri);
-new_uri = sokoke_magic_uri (uri);
+new_uri = sokoke_magic_uri (uri, TRUE, FALSE);
 if (!new_uri)
 {
 const gchar* keywords = NULL;
diff --git a/midori/midori-frontend.c b/midori/midori-frontend.c
index a578042..963cb6a 100644
--- a/midori/midori-frontend.c
+++ b/midori/midori-frontend.c
@@ -79,7 +79,7 @@ midori_web_app_new (const gchar* config,
 
 if (webapp != NULL)
 {
-gchar* tmp_uri = sokoke_prepare_uri (webapp);
+gchar* tmp_uri = sokoke_magic_uri (webapp, FALSE, TRUE);
 g_object_set (settings, "homepage", tmp_uri, NULL);
 midori_browser_add_uri (browser, tmp_uri);
 g_free (tmp_uri);
@@ -92,7 +92,7 @@ midori_web_app_new (const gchar* config,
 if (open_uris != NULL)
 for (i = 0; open_uris[i] != NULL; i++)
 {
-gchar* new_uri = sokoke_prepare_uri (open_uris[i]);
+gchar* new_uri = sokoke_magic_uri (open_uris[i], FALSE, TRUE);
 midori_browser_add_uri (browser, new_uri);
 g_free (new_uri);
 }
@@ -206,7 +206,7 @@ midori_private_app_new (const gchar* config,
 
 if (webapp != NULL)
 {
-gchar* tmp_uri = sokoke_prepare_uri (webapp);
+gchar* tmp_uri = sokoke_magic_uri (webapp, FALSE, TRUE);
 g_object_set (settings, "homepage", tmp_uri, NULL);
 midori_browser_add_uri (browser, tmp_uri);
 g_free (tmp_uri);
@@ -219,7 +219,7 @@ midori_private_app_new (const gchar* config,
 if (open_uris != NULL)
 for (i = 0; open_uris[i] != NULL; i++)
 {
-gchar* new_uri = sokoke_prepare_uri (open_uris[i]);
+gchar* new_uri = sokoke_magic_uri (open_uris[i], FALSE, TRUE);
 midori_browser_add_uri (browser, new_uri);
 g_free (new_uri);
 }
diff --git a/midori/midori-session.c b/midori/midori-session.c
index 5808f0d..e194b4c 100644
--- a/midori/midori-session.c
+++ b/midori/midori-session.c
@@ -519,7 +519,7 @@ midori_load_session (gpointer data)
 guint i = 0;
 while (open_uris[i])
 {
-

[Xfce4-commits] Use g_printerr not g_error for argument error at startup

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to 9da062efdd93d3eaf6bffcd1bd53c93ff920a6b9 (commit)
   from 262087d02ee011c1f3545c2d8e1f2b789450fe58 (commit)

commit 9da062efdd93d3eaf6bffcd1bd53c93ff920a6b9
Author: Christian Dywan 
Date:   Mon Mar 11 00:17:51 2013 +0100

Use g_printerr not g_error for argument error at startup

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

diff --git a/midori/midori-app.c b/midori/midori-app.c
index 779c2ac..2a587c9 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1439,7 +1439,10 @@ midori_app_setup (gint   *argc,
 g_object_unref (factory);
 
 if (!success)
-g_error ("%s - %s", _("Midori"), error->message);
+{
+g_printerr ("%s - %s\n", _("Midori"), error->message);
+exit (1);
+}
 }
 
 gboolean
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Check parts isn't empty in get_display_ellipsize

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to 262087d02ee011c1f3545c2d8e1f2b789450fe58 (commit)
   from 81d3e2d62aa6808533babd7e07dbeb69210ed772 (commit)

commit 262087d02ee011c1f3545c2d8e1f2b789450fe58
Author: Christian Dywan 
Date:   Mon Mar 11 00:15:09 2013 +0100

Check parts isn't empty in get_display_ellipsize

Fixes: https://bugs.launchpad.net/midori/+bug/1153072

 midori/midori-tab.vala |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/midori/midori-tab.vala b/midori/midori-tab.vala
index 161300b..a7b8671 100644
--- a/midori/midori-tab.vala
+++ b/midori/midori-tab.vala
@@ -180,7 +180,7 @@ namespace Midori {
 return Pango.EllipsizeMode.START;
 
 string[] parts = title.split (" ");
-if (uri.has_suffix (parts[parts.length - 1].down ()))
+if (parts[0] != null && uri.has_suffix (parts[parts.length - 
1].down ()))
 return Pango.EllipsizeMode.START;
 
 return Pango.EllipsizeMode.END;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Escape paths and custom strings in about:version/ paths

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to 81d3e2d62aa6808533babd7e07dbeb69210ed772 (commit)
   from 02e52bf2ec58a251125bfde0fbd1686c653c6bae (commit)

commit 81d3e2d62aa6808533babd7e07dbeb69210ed772
Author: Christian Dywan 
Date:   Sun Mar 10 23:56:28 2013 +0100

Escape paths and custom strings in about:version/ paths

Fixes: https://bugs.launchpad.net/midori/+bug/1049016

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

diff --git a/midori/midori-view.c b/midori/midori-view.c
index f776b7f..54b9000 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4188,7 +4188,7 @@ midori_view_set_uri (MidoriView*  view,
 {
 gchar* res_dir = midori_paths_get_res_filename ("");
 gchar* lib_dir = midori_paths_get_lib_path (PACKAGE_NAME);
-data = g_strdup_printf ("%s"
+data = g_markup_printf_escaped ("%s"
 "config: %s"
 "res: %s"
 "lib: %s"
@@ -4217,12 +4217,12 @@ midori_view_set_uri (MidoriView*  view,
 "style=\"position: absolute; right: 15px; bottom: 15px; 
z-index: -9;\">"
 "",
 _("Version numbers in brackets show the version used at 
runtime."));
-midori_view_add_version (tmp, TRUE, g_strdup_printf ("Command 
line %s",
+midori_view_add_version (tmp, TRUE, g_markup_printf_escaped 
("Command line %s",
 command_line));
 midori_view_list_versions (tmp, TRUE);
-midori_view_add_version (tmp, TRUE, g_strdup_printf ("Platform 
%s %s %s",
+midori_view_add_version (tmp, TRUE, g_markup_printf_escaped 
("Platform %s %s %s",
 platform, sys_name, architecture ? architecture : ""));
-midori_view_add_version (tmp, TRUE, g_strdup_printf 
("Identification %s",
+midori_view_add_version (tmp, TRUE, g_markup_printf_escaped 
("Identification %s",
 ident));
 midori_view_add_version (tmp, TRUE, g_strdup_printf ("Video 
Formats %s",
 list_video_formats (view)));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Entangle destroy/ free of transfers

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to 02e52bf2ec58a251125bfde0fbd1686c653c6bae (commit)
   from c9e1c7cd5f90765634bafb555ffb464ba08eca83 (commit)

commit 02e52bf2ec58a251125bfde0fbd1686c653c6bae
Author: Christian Dywan 
Date:   Sun Mar 10 23:44:54 2013 +0100

Entangle destroy/ free of transfers

Fixes: https://bugs.launchpad.net/midori/+bug/1153130

 toolbars/midori-transferbar.c |   27 +--
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c
index c4db861..34abb72 100644
--- a/toolbars/midori-transferbar.c
+++ b/toolbars/midori-transferbar.c
@@ -47,27 +47,26 @@ typedef struct
 } TransferInfo;
 
 static gboolean
-midori_transferbar_info_free (gpointer data)
+midori_transferbar_info_free (TransferInfo* info)
 {
-TransferInfo* info = data;
 MidoriTransferbar* transferbar = info->transferbar;
 
 transferbar->infos = g_list_remove (transferbar->infos, info);
 g_object_unref (info->download);
-gtk_widget_destroy (info->toolitem);
 g_slice_free (TransferInfo, info);
 
-if (!transferbar->infos || !g_list_nth_data (transferbar->infos, 0))
-gtk_widget_hide (GTK_WIDGET (transferbar->clear));
-
 return FALSE;
 }
 
 static void
-midori_transferbar_button_destroy_cb (GtkWidget*button,
-  TransferInfo* info)
+midori_transferbar_info_destroy (TransferInfo* info)
 {
-g_idle_add (midori_transferbar_info_free, info);
+MidoriTransferbar* transferbar = info->transferbar;
+
+gtk_widget_destroy (info->toolitem);
+
+if (!transferbar->infos || !g_list_nth_data (transferbar->infos, 0))
+gtk_widget_hide (GTK_WIDGET (transferbar->clear));
 }
 
 static void
@@ -133,7 +132,7 @@ midori_transferbar_download_button_clicked_cb (GtkWidget*   
 button,
 {
 WebKitDownload* download = info->download;
 if (midori_download_action_clear (download, button, NULL))
-gtk_widget_destroy (button);
+midori_transferbar_info_destroy (info);
 }
 
 void
@@ -157,7 +156,7 @@ midori_transferbar_check_size (GtkWidget* statusbar,
   TransferInfo* info = list->data;
   if (midori_download_is_finished (info->download)
|| webkit_download_get_status (info->download) == 
WEBKIT_DOWNLOAD_STATUS_STARTED)
-  gtk_widget_destroy (info->button);
+  midori_transferbar_info_destroy (info);
 }
   }
 #endif
@@ -208,8 +207,8 @@ midori_transferbar_add_download_item (MidoriTransferbar* 
transferbar,
 info->button = button;
 info->toolitem = GTK_WIDGET (toolitem);
 info->transferbar = transferbar;
-g_signal_connect (button, "destroy",
-  G_CALLBACK (midori_transferbar_button_destroy_cb), info);
+g_signal_connect_swapped (button, "destroy",
+  G_CALLBACK (midori_transferbar_info_free), info);
 transferbar->infos = g_list_prepend (transferbar->infos, info);
 
 g_signal_connect (download, "notify::progress",
@@ -231,7 +230,7 @@ midori_transferbar_clear_clicked_cb (GtkWidget* 
button,
 {
 TransferInfo* info = list->data;
 if (midori_download_is_finished (info->download))
-gtk_widget_destroy (info->button);
+midori_transferbar_info_destroy (info);
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Allow any proxies supported by libproxy

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to c9e1c7cd5f90765634bafb555ffb464ba08eca83 (commit)
   from fd15e8e34153b3ee10d73f0dfe471267725b1fe1 (commit)

commit c9e1c7cd5f90765634bafb555ffb464ba08eca83
Author: Christian Dywan 
Date:   Sun Mar 10 23:40:34 2013 +0100

Allow any proxies supported by libproxy

Fixes: https://bugs.launchpad.net/midori/+bug/1153332

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

diff --git a/midori/midori-session.c b/midori/midori-session.c
index 55dd878..5808f0d 100644
--- a/midori/midori-session.c
+++ b/midori/midori-session.c
@@ -32,8 +32,12 @@ midori_soup_session_set_proxy_uri (SoupSession* session,
 SoupURI* proxy_uri;
 
 /* soup_uri_new expects a non-NULL string with a protocol */
-if (midori_uri_is_http (uri))
+gchar* scheme = uri ? g_uri_parse_scheme (uri): NULL;
+if (scheme)
+{
 proxy_uri = soup_uri_new (uri);
+g_free (scheme);
+}
 else if (uri && *uri)
 {
 gchar* fixed_uri = g_strconcat ("http://";, uri, NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Drop unnecessary tab NULL-checks in browser

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to fd15e8e34153b3ee10d73f0dfe471267725b1fe1 (commit)
   from 3897ce273c9085d2ea582e41c137f6e898260cc1 (commit)

commit fd15e8e34153b3ee10d73f0dfe471267725b1fe1
Author: Christian Dywan 
Date:   Sun Mar 10 14:51:31 2013 +0100

Drop unnecessary tab NULL-checks in browser

 midori/midori-browser.c |   88 +++
 1 files changed, 13 insertions(+), 75 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 591c15e..ae716b3 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -557,18 +557,15 @@ midori_view_notify_load_status_cb (GtkWidget*  widget,
GParamSpec* pspec,
MidoriBrowser*  browser)
 {
-MidoriView* view = MIDORI_VIEW (widget);
-MidoriLoadStatus load_status = midori_view_get_load_status (view);
-const gchar* uri;
-GtkAction* action;
-
-uri = midori_view_get_display_uri (view);
-action = _action_by_name (browser, "Location");
-
 if (widget == midori_browser_get_current_tab (browser))
 {
+MidoriView* view = MIDORI_VIEW (widget);
+MidoriLoadStatus load_status = midori_view_get_load_status (view);
+
 if (load_status == MIDORI_LOAD_COMMITTED)
 {
+const gchar* uri = midori_view_get_display_uri (view);
+GtkAction* action = _action_by_name (browser, "Location");
 midori_location_action_set_text (
 MIDORI_LOCATION_ACTION (action), uri);
 g_object_notify (G_OBJECT (browser), "uri");
@@ -2344,9 +2341,6 @@ _action_open_activate (GtkAction* action,
 GtkWidget* dialog;
 GtkWidget* view;
 
-if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
-return;
-
 dialog = (GtkWidget*)midori_file_chooser_dialog_new (_("Open file"),
 GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN);
 
@@ -2511,9 +2505,6 @@ _action_compact_add_activate (GtkAction* action,
"AddDesktopShortcut", "AddNewsFeed" };
 guint i;
 
-if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
-return;
-
 dialog = g_object_new (GTK_TYPE_DIALOG,
 "transient-for", browser,
 "title", _("Add a new bookmark"), NULL);
@@ -2559,13 +2550,7 @@ static void
 _action_print_activate (GtkAction* action,
 MidoriBrowser* browser)
 {
-GtkWidget* view;
-
-if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
-return;
-
-if (!(view = midori_browser_get_current_tab (browser)))
-return;
+GtkWidget* view = midori_browser_get_current_tab (browser);
 
 #if 0 // def HAVE_GRANITE
 /* FIXME: Blacklist/ custom contract doesn't work
@@ -3187,9 +3172,6 @@ _action_preferences_activate (GtkAction* action,
 {
 static GtkWidget* dialog = NULL;
 
-if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
-return;
-
 if (!dialog)
 {
 dialog = midori_preferences_new (GTK_WINDOW (browser), 
browser->settings);
@@ -3306,12 +3288,8 @@ static void
 _action_reload_stop_activate (GtkAction* action,
   MidoriBrowser* browser)
 {
+GtkWidget* view = midori_browser_get_current_tab (browser);
 gchar* stock_id;
-GtkWidget* view;
-
-if (!(view = midori_browser_get_current_tab (browser)))
-return;
-
 g_object_get (action, "stock-id", &stock_id, NULL);
 
 /* Refresh or stop, depending on the stock id */
@@ -3342,8 +3320,6 @@ _action_zoom_activate (GtkAction* action,
MidoriBrowser* browser)
 {
 GtkWidget* view = midori_browser_get_current_tab (browser);
-if (!view)
-return;
 
 if (g_str_equal (gtk_action_get_name (action), "ZoomIn"))
 midori_view_set_zoom_level (MIDORI_VIEW (view),
@@ -3361,8 +3337,6 @@ _action_view_encoding_activate (GtkAction* action,
 MidoriBrowser* browser)
 {
 GtkWidget* view = midori_browser_get_current_tab (browser);
-if (view)
-{
 const gchar* name;
 GtkWidget* web_view;
 
@@ -3391,7 +3365,6 @@ _action_view_encoding_activate (GtkAction* action,
 g_assert_not_reached ();
 g_object_set (web_view, "custom-encoding", encoding, NULL);
 }
-}
 }
 
 static void
@@ -3437,9 +3410,6 @@ _action_caret_browsing_activate (GtkAction* action,
 gint response;
 GtkWidget* dialog;
 
-if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
-return;
-
 if (!katze_object_get_boolean (browser->settings, "enable-caret-browsing"))
 {
 dialog = gtk_message_dialog_new (GTK_WINDOW (browser),
@@ -3523,8 +3493,6 @@ _action_scroll_somewhere_activate (GtkAction* action,
 const gchar* name;
 
 view = midori_browser_get_current_tab (browser);
-if (!view)
-return;
 web_view = WEBKIT_WEB_VIEW (midori_view_

[Xfce4-commits] Introduce about:dial/ :new/ :search alias URLs

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to 3897ce273c9085d2ea582e41c137f6e898260cc1 (commit)
   from bd7bf7b5b04172641bbbca5e32fb7d9ac1167c2d (commit)

commit 3897ce273c9085d2ea582e41c137f6e898260cc1
Author: Christian Dywan 
Date:   Sun Mar 10 14:36:23 2013 +0100

Introduce about:dial/ :new/ :search alias URLs

 midori/midori-browser.c |   59 ++
 midori/midori-session.c |2 +-
 midori/midori-settings.vala |3 +-
 midori/midori-view.c|   21 +--
 4 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 572a0a7..591c15e 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -96,9 +96,7 @@ struct _MidoriBrowser
 gboolean show_navigationbar;
 gboolean show_statusbar;
 guint maximum_history_age;
-gchar* location_entry_search;
 guint last_web_search;
-gchar* news_aggregator;
 };
 
 G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW)
@@ -579,8 +577,7 @@ midori_view_notify_load_status_cb (GtkWidget*  widget,
 _midori_browser_update_interface (browser, view);
 _midori_browser_set_statusbar_text (browser, view, NULL);
 
-/* This is a hack to ensure that the address entry is focussed
-   with speed dial open. */
+/* Focus the urlbar on blank pages */
 if (midori_view_is_blank (view))
 midori_browser_activate_action (browser, "Location");
 }
@@ -1617,7 +1614,7 @@ midori_browser_disconnect_tab (MidoriBrowser* browser,
which is indicated by the proxy array having been unset. */
 if (katze_array_is_empty (browser->proxy_array))
 {
-midori_browser_add_uri (browser, "");
+midori_browser_add_uri (browser, "about:new");
 midori_browser_set_current_page (browser, 0);
 }
 
@@ -2317,14 +2314,14 @@ static void
 _action_window_new_activate (GtkAction* action,
  MidoriBrowser* browser)
 {
-midori_view_new_window_cb (NULL, "", browser);
+midori_view_new_window_cb (NULL, "about:home", browser);
 }
 
 static void
 _action_tab_new_activate (GtkAction* action,
   MidoriBrowser* browser)
 {
-GtkWidget* view = midori_browser_add_uri (browser, "");
+GtkWidget* view = midori_browser_add_uri (browser, "about:new");
 midori_browser_set_current_tab (browser, view);
 }
 
@@ -2455,7 +2452,8 @@ static void
 midori_browser_subscribe_to_news_feed (MidoriBrowser* browser,
const gchar*   uri)
 {
-if (browser->news_aggregator && *browser->news_aggregator)
+const gchar* news_aggregator = midori_settings_get_news_aggregator 
(MIDORI_SETTINGS (browser->settings));
+if (news_aggregator && *news_aggregator)
 {
 /* Thunderbird only accepts feed://, Liferea doesn't mind */
 gchar* feed = g_strdup (uri);
@@ -2467,11 +2465,11 @@ midori_browser_subscribe_to_news_feed (MidoriBrowser* 
browser,
 feed[3] = 'd';
 }
 /* Special-case Liferea because a helper script may be required */
-if (g_str_equal (browser->news_aggregator, "liferea")
+if (g_str_equal (news_aggregator, "liferea")
  && g_find_program_in_path ("liferea-add-feed"))
 sokoke_spawn_program ("liferea-add-feed", FALSE, feed, TRUE, 
FALSE);
 else
-sokoke_spawn_program (browser->news_aggregator, TRUE, feed, TRUE, 
FALSE);
+sokoke_spawn_program (news_aggregator, TRUE, feed, TRUE, FALSE);
 g_free (feed);
 }
 else
@@ -3855,7 +3853,8 @@ _action_location_submit_uri (GtkAction* action,
 if (keywords == NULL)
 {
 keywords = uri;
-search_uri = browser->location_entry_search;
+search_uri = midori_settings_get_location_entry_search (
+MIDORI_SETTINGS (browser->settings));
 }
 new_uri = midori_uri_for_search (search_uri, keywords);
 
@@ -4004,7 +4003,7 @@ _action_search_submit (GtkAction* action,
 if (item)
 url = katze_item_get_uri (item);
 else /* The location entry search is our fallback */
-url = browser->location_entry_search;
+url = midori_settings_get_location_entry_search (MIDORI_SETTINGS 
(browser->settings));
 
 search = midori_uri_for_search (url, keywords);
 if (item != NULL)
@@ -4026,9 +4025,6 @@ _action_search_activate (GtkAction* action,
  MidoriBrowser* browser)
 {
 GSList* proxies = gtk_action_get_proxies (action);
-const gchar* uri;
-gchar* search;
-
 for (; proxies != NULL; proxies = g_slist_next (proxies))
 if (GTK_IS_TOOL_ITEM (proxies->data))
 {
@@ -4037,12 +4033,8 @@ _action_search_activate (GtkAction* action,
 return;
 }
 
-/* Load default search engine in current tab */
-uri = browser->location_entry_search;
-

[Xfce4-commits] l10n: Updated Polish (pl) translation to 100%

2013-03-10 Thread Transifex

Updating branch refs/heads/master
 to 0063fc2f5a1dda4a57084a4f46c6d8334dcb291f (commit)
   from e5f22c0d217d4efe2b8674866240b2a7cbafd625 (commit)

commit 0063fc2f5a1dda4a57084a4f46c6d8334dcb291f
Author: Piotr Sokół 
Date:   Sun Mar 10 14:38:35 2013 +0100

l10n: Updated Polish (pl) translation to 100%

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

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

 po/pl.po |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 64e1e00..37ec027 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 4.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-03 11:51+\n"
-"PO-Revision-Date: 2013-02-03 13:52+0100\n"
+"POT-Creation-Date: 2013-03-10 11:48+\n"
+"PO-Revision-Date: 2013-03-10 14:36+0100\n"
 "Last-Translator: Piotr Sokół \n"
 "Language-Team: polski <>\n"
 "Language: \n"
@@ -483,15 +483,15 @@ msgstr "Plik jest większy, niż %d MB, kończenie 
instalacji"
 
 #: ../dialogs/appearance-settings/main.c:738
 msgid "Failed to create temporary directory"
-msgstr "Błąd tworzenia tymczasowego katalogu"
+msgstr "Nie udało się utworzyć katalogu tymczasowego"
 
 #: ../dialogs/appearance-settings/main.c:743
 msgid "Failed to extract archive"
-msgstr "Błąd rozpakowywania archiwum"
+msgstr "Nie udało się rozpakować archiwum"
 
 #: ../dialogs/appearance-settings/main.c:748
 msgid "Unknown format, only archives and directories are supported"
-msgstr "Nieznany format, wspierane są tylko archiwa i katalogi"
+msgstr "Nieznany format. Obsługiwane są tylko archiwa i katalogi"
 
 #: ../dialogs/appearance-settings/main.c:753
 #, c-format
@@ -656,7 +656,7 @@ msgstr "Poziomo i Pionowo"
 
 #: ../dialogs/display-settings/main.c:139
 msgid "Minimal interface to set up an external output"
-msgstr "Otwiera okno podstawowej konfiguracji ekranów"
+msgstr "Otwiera okno uproszczonej konfiguracji ekranów"
 
 #: ../dialogs/display-settings/main.c:227
 #, c-format
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Polish (pl) translation to 96%

2013-03-10 Thread Transifex

Updating branch refs/heads/master
 to e2390ca46fac453f52b0f21b575dd9be5798d7ee (commit)
   from 9fcdac310197360c5c609c1e70d7c889f35c0504 (commit)

commit e2390ca46fac453f52b0f21b575dd9be5798d7ee
Author: Piotr Sokół 
Date:   Sun Mar 10 14:13:44 2013 +0100

l10n: Updated Polish (pl) translation to 96%

New status: 380 messages complete with 0 fuzzies and 13 untranslated.

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

 po/pl.po |   40 
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 6fc088d..265f4a4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-panel 4.10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-09 13:45+\n"
-"PO-Revision-Date: 2013-03-09 16:35+0100\n"
+"POT-Creation-Date: 2013-03-10 11:09+\n"
+"PO-Revision-Date: 2013-03-10 14:15+0100\n"
 "Last-Translator: Piotr Sokół \n"
 "Language-Team: polski <>\n"
 "Language: \n"
@@ -239,15 +239,15 @@ msgstr "Nie udało się wykonać polecenia „%s”."
 msgid ""
 "Invalid plugin event syntax specified. Use PLUGIN-NAME:NAME[:TYPE:VALUE]."
 msgstr ""
-"Nieprawidłowa składnia zdarzenia określonej wtyczki. Użyj PLUGIN-NAME:NAME[:"
-"TYPE:VALUE]."
+"Użyto nieprawidłowej składni zdarzenia wtyczki. Proszę użyć wyrażenia PLUGIN-"
+"NAME:NAME[:TYPE:VALUE]."
 
 #: ../panel/panel-dbus-client.c:244
 #, c-format
 msgid ""
 "Invalid hint type \"%s\". Valid types are bool, double, int, string and uint."
 msgstr ""
-"Nieprawidłowy typ podpowiedzi \"%s\". Prawidłowe typy to bool, double, int, "
+"Nieprawidłowy typ podpowiedzi „%s”. Prawidłowe typy to bool, double, int, "
 "string i uint."
 
 #: ../panel/panel-dialogs.c:65
@@ -331,7 +331,7 @@ msgstr ""
 
 #: ../panel/panel-preferences-dialog.c:472
 msgid "Automatic"
-msgstr "Autmatycznie"
+msgstr "Automatycznie"
 
 #. I18N: screen name in the output selector
 #: ../panel/panel-preferences-dialog.c:491
@@ -491,7 +491,7 @@ msgstr "_Ilość wierszy:"
 
 #: ../panel/panel-preferences-dialog.glade.h:27
 msgid "O_utput:"
-msgstr "Wyjście"
+msgstr "_Ekran:"
 
 #: ../panel/panel-preferences-dialog.glade.h:28
 msgid "Opacity"
@@ -511,7 +511,7 @@ msgstr "Usuwa wybrany panel"
 
 #: ../panel/panel-preferences-dialog.glade.h:33
 msgid "Row _Size (pixels):"
-msgstr "_Rozmiar (piksele):"
+msgstr "_Rozmiar wiersza (piksele):"
 
 #: ../panel/panel-preferences-dialog.glade.h:34
 msgid "Select A Background Image"
@@ -761,7 +761,7 @@ msgstr "Zakończenie sesji..."
 
 #: ../plugins/actions/actions.c:160
 msgid "Log _Out..."
-msgstr "Za_kończ sesję"
+msgstr "Za_kończ sesję..."
 
 #: ../plugins/actions/actions.c:166
 msgid "Switch User"
@@ -955,7 +955,7 @@ msgstr "Nie udało się wykonać polecenia „%s”."
 
 #: ../plugins/applicationsmenu/applicationsmenu.c:1113
 msgid "No applications found"
-msgstr "Nie odnaleziono programu"
+msgstr "Nie odnaleziono programów"
 
 #: ../plugins/applicationsmenu/applicationsmenu.c:1136
 msgid "Failed to load the applications menu"
@@ -1009,7 +1009,7 @@ msgstr "Własny"
 
 #: ../plugins/clock/clock-dialog.glade.h:1
 msgid "24-_hour clock"
-msgstr "24 _godziny"
+msgstr "24 g_odziny"
 
 #: ../plugins/clock/clock-dialog.glade.h:2
 msgid "Analog"
@@ -1169,42 +1169,42 @@ msgstr "%0"
 #: ../plugins/clock/clock-fuzzy.c:103
 #, no-c-format
 msgid "five past %0"
-msgstr "pięć minut po %0"
+msgstr "%0 pięć"
 
 #: ../plugins/clock/clock-fuzzy.c:104
 #, no-c-format
 msgid "ten past %0"
-msgstr "dziesięć minut po %0"
+msgstr "%0 dziesięć"
 
 #: ../plugins/clock/clock-fuzzy.c:105
 #, no-c-format
 msgid "quarter past %0"
-msgstr "kwadrans po %0"
+msgstr "%0 i kwadrans"
 
 #: ../plugins/clock/clock-fuzzy.c:106
 #, no-c-format
 msgid "twenty past %0"
-msgstr "dwadzieścia minut po %0"
+msgstr "%0 dwadzieścia"
 
 #: ../plugins/clock/clock-fuzzy.c:107
 #, no-c-format
 msgid "twenty five past %0"
-msgstr "dwadzieścia pięć minut po %0"
+msgstr "%0 dwadzieścia pięć"
 
 #: ../plugins/clock/clock-fuzzy.c:108
 #, no-c-format
 msgid "half past %0"
-msgstr "pół godziny po %0"
+msgstr "%0 trzydzieści"
 
 #: ../plugins/clock/clock-fuzzy.c:109
 #, no-c-format
 msgid "twenty five to %1"
-msgstr "za dwadzieścia pięć minut %1"
+msgstr "za dwadzieścia pięć %1"
 
 #: ../plugins/clock/clock-fuzzy.c:110
 #, no-c-format
 msgid "twenty to %1"
-msgstr "za dwadzieścia minut %1"
+msgstr "za dwadzieścia %1"
 
 #: ../plugins/clock/clock-fuzzy.c:111
 #, no-c-format
@@ -1219,7 +1219,7 @@ msgstr "za dziesięć %1"
 #: ../plugins/clock/clock-fuzzy.c:113
 #, no-c-format
 msgid "five to %1"
-msgstr "za pięć minut %1"
+msgstr "za pięć %1"
 
 #: ../plugins/clock/clock-fuzzy.c:114
 #, no-c-format
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Split Midori.View loading off into logical functions

2013-03-10 Thread Christian Dywan

Updating branch refs/heads/master
 to bd7bf7b5b04172641bbbca5e32fb7d9ac1167c2d (commit)
   from 08510a8dbbd57083911fdca50cc37a141915ed9b (commit)

commit bd7bf7b5b04172641bbbca5e32fb7d9ac1167c2d
Author: Christian Dywan 
Date:   Sun Mar 10 13:42:02 2013 +0100

Split Midori.View loading off into logical functions

Use WebKit.WebView.notify-load-status for WebKit1 and
WebKit.WebView.load-changed for WebKit2 respectively.

 midori/midori-view.c |  163 ++
 1 files changed, 98 insertions(+), 65 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index abe8e6a..2c1a762 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -810,51 +810,36 @@ midori_view_web_view_navigation_decision_cb 
(WebKitWebView* web_view
 }
 #endif
 
-#ifndef HAVE_WEBKIT2
 static void
-webkit_web_view_load_started_cb (WebKitWebView*  web_view,
- WebKitWebFrame* web_frame,
- MidoriView* view)
+midori_view_load_started (MidoriView* view)
 {
 midori_view_update_load_status (view, MIDORI_LOAD_PROVISIONAL);
 midori_tab_set_progress (MIDORI_TAB (view), 0.0);
 }
-#endif
 
 #ifdef HAVE_GCR
 const gchar*
 midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags);
 #endif
 
-#ifndef HAVE_WEBKIT2
 static void
-webkit_web_view_load_committed_cb (WebKitWebView*  web_view,
-   WebKitWebFrame* web_frame,
-   MidoriView* view)
+midori_view_load_committed (MidoriView* view)
 {
-const gchar* uri;
-GList* children;
-
-if (web_frame != webkit_web_view_get_main_frame (web_view))
-return;
-
 #ifdef HAVE_GRANITE_CLUTTER
 GraniteWidgetsNavigationBox* navigation_box = 
midori_tab_get_navigation_box (MIDORI_TAB (view));
 granite_widgets_navigation_box_transition_ready (navigation_box);
 #endif
-g_object_freeze_notify (G_OBJECT (view));
 
-uri = webkit_web_frame_get_uri (web_frame);
-g_return_if_fail (uri != NULL);
 katze_assign (view->icon_uri, NULL);
 
-children = gtk_container_get_children (GTK_CONTAINER (view));
+GList* children = gtk_container_get_children (GTK_CONTAINER (view));
 for (; children; children = g_list_next (children))
 if (g_object_get_data (G_OBJECT (children->data), "midori-infobar-cb"))
 gtk_widget_destroy (children->data);
 g_list_free (children);
 view->alerts = 0;
 
+const gchar* uri = webkit_web_view_get_uri (WEBKIT_WEB_VIEW  
(view->web_view));
 if (g_strcmp0 (uri, katze_item_get_uri (view->item)))
 {
 midori_tab_set_uri (MIDORI_TAB (view), uri);
@@ -871,14 +856,13 @@ webkit_web_view_load_committed_cb (WebKitWebView*  
web_view,
 
 if (!strncmp (uri, "https", 5))
 {
-#if defined (HAVE_LIBSOUP_2_29_91)
-WebKitWebDataSource *source;
-WebKitNetworkRequest *request;
-SoupMessage *message;
-
-source = webkit_web_frame_get_data_source (web_frame);
-request = webkit_web_data_source_get_request (source);
-message = webkit_network_request_get_message (request);
+#ifdef HAVE_WEBKIT2
+/* Not implemented */
+#elif defined (HAVE_LIBSOUP_2_29_91)
+WebKitWebFrame* web_frame = webkit_web_view_get_main_frame 
(WEBKIT_WEB_VIEW (view->web_view));
+WebKitWebDataSource* source = webkit_web_frame_get_data_source 
(web_frame);
+WebKitNetworkRequest* request = webkit_web_data_source_get_request 
(source);
+SoupMessage* message = webkit_network_request_get_message (request);
 
 if (message
  && soup_message_get_flags (message) & 
SOUP_MESSAGE_CERTIFICATE_TRUSTED)
@@ -925,9 +909,7 @@ webkit_web_view_load_committed_cb (WebKitWebView*  web_view,
 view->find_links = -1;
 midori_view_update_load_status (view, MIDORI_LOAD_COMMITTED);
 
-g_object_thaw_notify (G_OBJECT (view));
 }
-#endif
 
 static void
 webkit_web_view_progress_changed_cb (WebKitWebView* web_view,
@@ -1405,18 +1387,16 @@ midori_view_apply_scroll_position (MidoriView* view)
 view->scrollv = -3;
 }
 }
+#endif
 
 static void
-webkit_web_view_load_finished_cb (WebKitWebView*  web_view,
-  WebKitWebFrame* web_frame,
-  MidoriView* view)
+midori_view_load_finished (MidoriView* view)
 {
-g_object_freeze_notify (G_OBJECT (view));
-
+#ifndef HAVE_WEBKIT2
 midori_view_apply_scroll_position (view);
 
-if (web_frame == webkit_web_view_get_main_frame (web_view))
 {
+WebKitWebFrame* web_frame = webkit_web_view_get_main_frame 
(WEBKIT_WEB_VIEW (view->web_view));
 JSContextRef js_context = webkit_web_frame_get_global_context 
(web_frame);
 /* Icon: URI, News Feed: $URI|title, Search: :URI|title */
 gchar* value = sokoke_js_script_eval (js_context,
@@ -1507,14 +1487,74

[Xfce4-commits] Creating annotated tag xfdesktop-4.10.2

2013-03-10 Thread Jérôme Guelfucci

Updating annotated tag refs/tags/xfdesktop-4.10.2
 as new annotated tag
 to e7f18809a51de6767ab2a53cbbc90e59d74abc09 (tag)
   succeeds xfdesktop-4.10.1-2-g7b2eda1
  tagged by Jérôme Guelfucci 
 on 2013-03-10 11:53 +0100

Jérôme Guelfucci (1):
  Get ready for 4.10.2 release.

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Bump version tag.

2013-03-10 Thread Jérôme Guelfucci

Updating branch refs/heads/xfce-4.10
 to 183047717c7aa9b6520d53badc96bcc68e67a6db (commit)
   from 9da21ec6e69190359f1b3b7bdd98886034c3fa3c (commit)

commit 183047717c7aa9b6520d53badc96bcc68e67a6db
Author: Jérôme Guelfucci 
Date:   Sun Mar 10 11:54:28 2013 +0100

Bump version tag.

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

diff --git a/configure.ac.in b/configure.ac.in
index 8ec1ce4..450ae6d 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -9,7 +9,7 @@ m4_define([xfdesktop_version_minor], [10])
 m4_define([xfdesktop_version_micro], [2])
 m4_define([xfdesktop_version_nano], [])
 m4_define([xfdesktop_version_build], [@REVISION@])
-m4_define([xfdesktop_version_tag],[])
+m4_define([xfdesktop_version_tag],[git])
 m4_define([xfdesktop_version], 
[xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(),
 [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], 
[xfdesktop_version_tag()-xfdesktop_version_build()], 
[xfdesktop_version_tag()])])
 
 dnl minimum required versions
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Get ready for 4.10.2 release.

2013-03-10 Thread Jérôme Guelfucci

Updating branch refs/heads/xfce-4.10
 to 9da21ec6e69190359f1b3b7bdd98886034c3fa3c (commit)
   from 7b2eda13185b9e48d7f2a45f9b327f8d36a4637c (commit)

commit 9da21ec6e69190359f1b3b7bdd98886034c3fa3c
Author: Jérôme Guelfucci 
Date:   Sun Mar 10 11:49:44 2013 +0100

Get ready for 4.10.2 release.

 NEWS|5 +
 configure.ac.in |2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 1c17983..e3c13fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+4.10.2
+==
+- Fix hang when no backdrop image is selected (Bug #9892).
+- Fix tiling for some images.
+
 4.10.1
 ==
 - Add a tabs width of padding for tooltip text (Bug #9162).
diff --git a/configure.ac.in b/configure.ac.in
index 4d98a05..8ec1ce4 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,7 +6,7 @@ dnl
 dnl version info
 m4_define([xfdesktop_version_major], [4])
 m4_define([xfdesktop_version_minor], [10])
-m4_define([xfdesktop_version_micro], [1])
+m4_define([xfdesktop_version_micro], [2])
 m4_define([xfdesktop_version_nano], [])
 m4_define([xfdesktop_version_build], [@REVISION@])
 m4_define([xfdesktop_version_tag],[])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Polish (pl) translation to 100%

2013-03-10 Thread Transifex

Updating branch refs/heads/master
 to f5a701881a44e1b14b8d9eab879a404c8135770f (commit)
   from 9688e4b038983ab2bbbf63d840d83a3cea697f8e (commit)

commit f5a701881a44e1b14b8d9eab879a404c8135770f
Author: Piotr Sokół 
Date:   Sun Mar 10 10:31:53 2013 +0100

l10n: Updated Polish (pl) translation to 100%

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

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

 po/pl.po |  114 --
 1 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 48fe0d5..882d70f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,25 +2,27 @@
 # Copyright (C) 2006-2007 Enrico Tröger
 # This file is distributed under the same license as the xfce4-dict-plugin 
package.
 # Piotr Maliński , 2007.
-# Piotr Sokół , 2009.
-# 
+# Piotr Sokół , 2009, 2013.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-dict 0.5.2\n"
+"Project-Id-Version: xfce4-dict 0.6.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-03-09 12:57+\n"
-"PO-Revision-Date: 2009-03-30 00:05+0100\n"
-"Last-Translator: Piotr Sokół \n"
-"Language-Team: Polish\n"
+"PO-Revision-Date: 2013-03-10 10:29+0100\n"
+"Last-Translator: Piotr Sokół \n"
+"Language-Team: polski <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Language: \n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && 
(n%100<10 || n%100>=20)) ? 1 : 2));\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20)) ? 1 : 2));\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #: ../panel-plugin/xfce4-dict-plugin.desktop.in.h:1
 msgid "A plugin to query different dictionaries."
-msgstr "Klient wielu słowników"
+msgstr "Umożliwia wyszukiwanie wyrażeń w różnych słownikach"
 
 #: ../panel-plugin/xfce4-dict-plugin.desktop.in.h:2
 #: ../src/xfce4-dict.desktop.in.h:2 ../lib/gui.c:736 ../lib/prefs.c:270
@@ -35,23 +37,23 @@ msgstr "Gotowy"
 
 #: ../panel-plugin/xfce4-dict-plugin.c:431
 msgid "Look up a word"
-msgstr "Uruchamia słownik"
+msgstr "Wyszukuje wyrażenie"
 
 #: ../panel-plugin/xfce4-dict-plugin.c:467 ../lib/gui.c:766
 msgid "Search term"
-msgstr "Poszukiwany ciąg"
+msgstr "Wyszukiwanie..."
 
 #: ../src/xfce4-dict.c:51
 msgid "Search the given text using a Dict server(RFC 2229)"
-msgstr "Wyszukuje określony ciąg używając serwera Dict (RFC 2229)"
+msgstr "Wyszukuje wprowadzone wyrażenie przy użyciu serwera Dict (RFC 2229)"
 
 #: ../src/xfce4-dict.c:52
 msgid "Search the given text using a web-based search engine"
-msgstr "Wyszukuje określony ciąg używając usługi internetowej"
+msgstr "Wyszukuje wprowadzone wyrażenie przy użyciu usługi internetowej"
 
 #: ../src/xfce4-dict.c:53
 msgid "Check the given text with a spell checker"
-msgstr "Sprawdza poprawność pisowni określonego ciągu"
+msgstr "Sprawdza poprawność pisowni wprowadzonego wyrażenia"
 
 #: ../src/xfce4-dict.c:54
 msgid "Grab the focus on the text field in the panel"
@@ -84,7 +86,7 @@ msgstr "Proszę zgłaszać błędy na adres <%s>."
 
 #: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:962
 msgid "A client program to query different dictionaries."
-msgstr "Klient wielu słowników"
+msgstr "Umożliwia wyszukiwanie wyrażeń w różnych słownikach"
 
 #: ../src/xfce4-dict.desktop.in.h:3
 msgid "Dictionary Client"
@@ -98,14 +100,14 @@ msgstr "Wyniki sprawdzania pisowni:"
 #, c-format
 msgid "%d suggestion found."
 msgid_plural "%d suggestions found."
-msgstr[0] "Odnaleziono %d sugestię"
-msgstr[1] "Odnaleziono %d sugestie"
-msgstr[2] "Odnaleziono %d sugestii"
+msgstr[0] "Odnaleziono %d sugestię pisowni"
+msgstr[1] "Odnaleziono %d sugestie pisowni"
+msgstr[2] "Odnaleziono %d sugestii pisowni"
 
 #: ../lib/spell.c:105
 #, c-format
 msgid "Suggestions for \"%s\" (%s):"
-msgstr "Sugestie dla  „%s” (%s):"
+msgstr "Sugestie dla „%s” (%s):"
 
 #: ../lib/spell.c:122
 #, c-format
@@ -115,7 +117,7 @@ msgstr "Wyrażenie „%s” jest zapisane poprawnie (%s)."
 #: ../lib/spell.c:134
 #, c-format
 msgid "No suggestions could be found for \"%s\" (%s)."
-msgstr "Nie znaleziono sugestii dla „%s” (%s)."
+msgstr "Nie odnaleziono sugestii pisowni wyrażenia „%s” (%s)."
 
 #. translation hint:
 #. * Error while executing  ()
@@ -130,7 +132,7 @@ msgstr "Proszę wprowadzić polecenie sprawdzania pisowni w 
oknie preferencji."
 
 #: ../lib/spell.c:208 ../lib/common.c:223
 msgid "Invalid input"
-msgstr "Niepoprawne dane"
+msgstr "Nieprawidłowe dane wejściowe"
 
 #: ../lib/spell.c:247
 #, c-format
@@ -163,7 +165,7 @@ msgstr "Proszę wprowadzić tekst."
 
 #: ../lib/speedreader.c:506
 msgid "Choose a file to load"
-msgstr "Proszę wybrać plik do wczytania"
+msgstr "Wybór pliku"
 
 #: ../lib/speedreader.c:535
 #, c-format
@@ -183,12 +185,12 @@ msgid ""
 "This is an easy speed reading utility to help train you to read faster. It "
 "does this by flashing words at a rap

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

2013-03-10 Thread Transifex

Updating branch refs/heads/master
 to 8bcc84ad0549141882e4f4d32a9403b9a4402c02 (commit)
   from a4e84ab1151d5ca7149d88ae784061f3b6604ec9 (commit)

commit 8bcc84ad0549141882e4f4d32a9403b9a4402c02
Author: Cristian Marchi 
Date:   Sun Mar 10 10:04:35 2013 +0100

l10n: Updated Italian (it) translation to 100%

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

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

 po/it.po |   40 
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/po/it.po b/po/it.po
index 185d1b8..ea0f691 100644
--- a/po/it.po
+++ b/po/it.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-02 04:54+\n"
+"POT-Creation-Date: 2013-03-10 07:36+\n"
 "PO-Revision-Date: 2012-03-08 20:41+0100\n"
 "Last-Translator: Cristian Marchi \n"
 "Language-Team: Italian \n"
@@ -126,7 +126,7 @@ msgstr ""
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:3
 msgid "Color:"
-msgstr "Colore:"
+msgstr "Colore: "
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:4
 msgid "Folder:"
@@ -235,7 +235,7 @@ msgstr "Dimen_sione delle icone:"
 
 #: ../settings/xfdesktop-settings-ui.glade.h:11
 msgid "Icon _type:"
-msgstr "_Tipo delle icone:"
+msgstr "_Tipo di icone:"
 
 #: ../settings/xfdesktop-settings-ui.glade.h:12
 msgid "Left"
@@ -540,8 +540,8 @@ msgid "_Open in New Window"
 msgstr "Apri in una nuova _finestra"
 
 #: ../src/xfdesktop-file-icon-manager.c:1425
-#: ../src/xfdesktop-special-file-icon.c:505 ../src/xfdesktop-volume-icon.c:751
-#: ../src/xfdesktop-volume-icon.c:755
+#: ../src/xfdesktop-special-file-icon.c:505 ../src/xfdesktop-volume-icon.c:774
+#: ../src/xfdesktop-volume-icon.c:778
 msgid "_Open"
 msgstr "_Apri"
 
@@ -598,7 +598,7 @@ msgid "Desktop _Settings..."
 msgstr "Impostazioni della sc_rivania..."
 
 #: ../src/xfdesktop-file-icon-manager.c:1744
-#: ../src/xfdesktop-volume-icon.c:797
+#: ../src/xfdesktop-volume-icon.c:820
 msgid "P_roperties..."
 msgstr "_Proprietà..."
 
@@ -750,12 +750,12 @@ msgstr ""
 "supporto o disconnettere il dispositivo"
 
 #. TRANSLATORS: Please use the same translation here as in Thunar
-#: ../src/xfdesktop-notify.c:138 ../src/xfdesktop-notify.c:313
+#: ../src/xfdesktop-notify.c:138 ../src/xfdesktop-notify.c:318
 msgid "Writing data to device"
 msgstr "Scrittura dei dati sul dispositivo"
 
 #. TRANSLATORS: Please use the same translation here as in Thunar
-#: ../src/xfdesktop-notify.c:141 ../src/xfdesktop-notify.c:316
+#: ../src/xfdesktop-notify.c:141 ../src/xfdesktop-notify.c:321
 #, c-format
 msgid ""
 "There is data that needs to be written to the device \"%s\" before it can be "
@@ -764,29 +764,29 @@ msgstr ""
 "Devono essere scritti dei dati sul dispositivo \"%s\" prima che possa essere "
 "rimosso. Non rimuovere il supporto o disconnettere il dispositivo"
 
-#: ../src/xfdesktop-notify.c:218
+#: ../src/xfdesktop-notify.c:223
 msgid "Unmount Finished"
 msgstr "Smontaggio concluso"
 
-#: ../src/xfdesktop-notify.c:220 ../src/xfdesktop-notify.c:395
+#: ../src/xfdesktop-notify.c:225 ../src/xfdesktop-notify.c:405
 #, c-format
 msgid "The device \"%s\" has been safely removed from the system. "
 msgstr ""
 "Il dispositivo \"%s\" sta per essere espulso. Potrebbe volerci del tempo"
 
 #. TRANSLATORS: Please use the same translation here as in Thunar
-#: ../src/xfdesktop-notify.c:304
+#: ../src/xfdesktop-notify.c:309
 msgid "Ejecting device"
 msgstr "Espulsione del dispositivo in corso..."
 
 #. TRANSLATORS: Please use the same translation here as in Thunar
-#: ../src/xfdesktop-notify.c:307
+#: ../src/xfdesktop-notify.c:312
 #, c-format
 msgid "The device \"%s\" is being ejected. This may take some time"
 msgstr ""
 "Il dispositivo \"%s\" sta per essere espulso. Potrebbe volerci del tempo"
 
-#: ../src/xfdesktop-notify.c:393
+#: ../src/xfdesktop-notify.c:403
 msgid "Eject Finished"
 msgstr "Espulsione conclusa"
 
@@ -853,33 +853,33 @@ msgstr ""
 "Dispositivo rimovibile\n"
 "Non ancora montato"
 
-#: ../src/xfdesktop-volume-icon.c:480 ../src/xfdesktop-volume-icon.c:522
+#: ../src/xfdesktop-volume-icon.c:483 ../src/xfdesktop-volume-icon.c:528
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Impossibile espellere \"%s\""
 
-#: ../src/xfdesktop-volume-icon.c:485 ../src/xfdesktop-volume-icon.c:527
+#: ../src/xfdesktop-volume-icon.c:488 ../src/xfdesktop-volume-icon.c:533
 msgid "Eject Failed"
 msgstr "Espulsione fallita"
 
-#: ../src/xfdesktop-volume-icon.c:559
+#: ../src/xfdesktop-volume-icon.c:565
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Impossibile montare \"%s\""
 
-#: ../src/xfdesktop-volume-icon.c:562
+#: ../src/xfdesktop-volume-icon.c:568
 msgid "Mount Failed"
 msgstr "Montaggio fallito"
 
-#: ../src/xfdesktop-volume-icon.c:770
+#: ../src/xfdesktop-volume-icon.c:793
 msgid "E_ject Volume"
 msgstr "_Espelli volume"
 
-#: ../src/xfdesktop-volume-icon.

[Xfce4-commits] Apply wallpaper to all workspaces option

2013-03-10 Thread Eric Koegel

Updating branch refs/heads/eric/wallpaper-and-settings-improvements
 to f51d49ec663ae59c3c5c357eedd9c378a1fdfd13 (commit)
   from c4a10cc1524490d35a6afd7aa67cdd57c59729b8 (commit)

commit f51d49ec663ae59c3c5c357eedd9c378a1fdfd13
Author: Eric Koegel 
Date:   Sun Mar 10 11:31:45 2013 +0300

Apply wallpaper to all workspaces option

 common/xfdesktop-common.h  |3 +
 settings/main.c|   83 +++--
 .../xfdesktop-settings-appearance-frame-ui.glade   |   15 +++
 src/xfce-desktop.c |  132 ++--
 4 files changed, 214 insertions(+), 19 deletions(-)

diff --git a/common/xfdesktop-common.h b/common/xfdesktop-common.h
index 5334ba8..b34d7b5 100644
--- a/common/xfdesktop-common.h
+++ b/common/xfdesktop-common.h
@@ -49,6 +49,9 @@
 #define ARRANGE_MESSAGE"arrange"
 #define QUIT_MESSAGE   "quit"
 
+#define SINGLE_WORKSPACE_MODE "/backdrop/single-workspace-mode"
+#define SINGLE_WORKSPACE_NUMBER   "/backdrop/single-workspace-number"
+
 /**
  * File information namespaces queried for #GFileInfo objects.
  */
diff --git a/settings/main.c b/settings/main.c
index f82bd7c..95ced14 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -96,6 +96,8 @@ typedef struct
 gchar *monitor_name;
 gulong image_list_loaded:1;
 
+WnckWindow *wnck_window;
+
 GtkWidget *frame_image_list;
 GtkWidget *image_iconview;
 GtkWidget *btn_folder;
@@ -674,6 +676,35 @@ cb_image_selection_changed(GtkIconView *icon_view,
 g_free(buf);
 }
 
+static gint
+xfdesktop_settings_get_active_workspace(AppearancePanel *panel,
+WnckWindow *wnck_window)
+{
+WnckWorkspace *wnck_workspace;
+gboolean single_workspace;
+gint workspace_num, active_workspace;
+
+wnck_workspace = wnck_window_get_workspace(wnck_window);
+
+workspace_num = wnck_workspace_get_number(wnck_workspace);
+
+single_workspace = xfconf_channel_get_bool(panel->channel,
+   SINGLE_WORKSPACE_MODE,
+   TRUE);
+
+/* If we're in single_workspace mode we need to return the workspace that
+ * it was set to, otherwise return the current workspace */
+if(single_workspace) {
+active_workspace = xfconf_channel_get_int(panel->channel,
+  SINGLE_WORKSPACE_NUMBER,
+  0);
+} else {
+active_workspace = workspace_num;
+}
+
+return active_workspace;
+}
+
 static void
 cb_xfdesktop_chk_custom_font_size_toggled(GtkCheckButton *button,
   gpointer user_data)
@@ -1013,7 +1044,7 @@ cb_update_background_tab(WnckWindow *wnck_window,
 screen = gtk_widget_get_screen(panel->image_iconview);
 wnck_workspace = wnck_window_get_workspace(wnck_window);
 
-workspace_num = wnck_workspace_get_number(wnck_workspace);
+workspace_num = xfdesktop_settings_get_active_workspace(panel, 
wnck_window);
 screen_num = gdk_screen_get_number(screen);
 monitor_num = gdk_screen_get_monitor_at_window(screen,

gtk_widget_get_window(panel->image_iconview));
@@ -1062,6 +1093,29 @@ cb_update_background_tab(WnckWindow *wnck_window,
 }
 
 static void
+cb_xfdesktop_chk_apply_to_all(GtkCheckButton *button,
+  gpointer user_data)
+{
+AppearancePanel *panel = user_data;
+gboolean active;
+active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
+
+TRACE("entering");
+
+xfconf_channel_set_bool(panel->channel,
+SINGLE_WORKSPACE_MODE,
+active);
+
+if(active) {
+xfconf_channel_set_int(panel->channel,
+   SINGLE_WORKSPACE_NUMBER,
+   panel->workspace);
+} else {
+cb_update_background_tab(panel->wnck_window, panel);
+}
+}
+
+static void
 xfdesktop_settings_setup_image_iconview(AppearancePanel *panel)
 {
 GtkIconView *iconview = GTK_ICON_VIEW(panel->image_iconview);
@@ -1093,13 +1147,12 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder 
*main_gxml,
 GtkWidget *appearance_container, *chk_custom_font_size,
   *spin_font_size, *w, *box, *spin_icon_size,
   *chk_show_thumbnails, *chk_single_click, *appearance_settings,
-  *bnt_exit;
+  *bnt_exit, *chk_apply_to_all;
 GtkBuilder *appearance_gxml;
 AppearancePanel *panel = g_new0(AppearancePanel, 1);
 GError *error = NULL;
 GtkFileFilter *filter;
 WnckScreen *wnck_screen;
-WnckWindow *wnck_window = NULL;
 
 TRACE("entering");
 
@@ -1156,16 +1209,16 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder 
*main_gxml,
 /* We have to force wnck to initialize */
 wnck_screen = wnck_scree

[Xfce4-commits] Add an iconview tooltip

2013-03-10 Thread Eric Koegel

Updating branch refs/heads/eric/wallpaper-and-settings-improvements
 to c4a10cc1524490d35a6afd7aa67cdd57c59729b8 (commit)
   from d51fb8ba1ca31f1f66f2855c4e514b80b88b15de (commit)

commit c4a10cc1524490d35a6afd7aa67cdd57c59729b8
Author: Eric Koegel 
Date:   Mon Mar 4 15:44:27 2013 +0300

Add an iconview tooltip

Add a tooltip letting the user know that the image style is set to
none and therefore they can't select a wallpaper in the iconview.

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

diff --git a/settings/main.c b/settings/main.c
index 239eab1..f82bd7c 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -848,8 +848,11 @@ cb_xfdesktop_combo_image_style_changed(GtkComboBox *combo,
 
 if(gtk_combo_box_get_active(combo) == XFCE_BACKDROP_IMAGE_NONE) {
 gtk_widget_set_sensitive(panel->image_iconview, FALSE);
+gtk_widget_set_tooltip_text(panel->image_iconview,
+_("Image selection is unavailable while 
the image style is set to None."));
 } else {
 gtk_widget_set_sensitive(panel->image_iconview, TRUE);
+gtk_widget_set_tooltip_text(panel->image_iconview, _("Select a 
background image for this display."));
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Use stripped down XBEL variant for session and trash

[Xfce4-commits] Check more carefully that app/ private got URLs

[Xfce4-commits] Merge sokoke_prepare_uri into _magic_uri

[Xfce4-commits] Use g_printerr not g_error for argument error at startup

[Xfce4-commits] Check parts isn't empty in get_display_ellipsize

[Xfce4-commits] Escape paths and custom strings in about:version/ paths

[Xfce4-commits] Entangle destroy/ free of transfers

[Xfce4-commits] Allow any proxies supported by libproxy

[Xfce4-commits] Drop unnecessary tab NULL-checks in browser

[Xfce4-commits] Introduce about:dial/ :new/ :search alias URLs

[Xfce4-commits] l10n: Updated Polish (pl) translation to 100%

[Xfce4-commits] l10n: Updated Polish (pl) translation to 96%

[Xfce4-commits] Split Midori.View loading off into logical functions

[Xfce4-commits] Creating annotated tag xfdesktop-4.10.2

[Xfce4-commits] Bump version tag.

[Xfce4-commits] Get ready for 4.10.2 release.

[Xfce4-commits] l10n: Updated Polish (pl) translation to 100%

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

[Xfce4-commits] Apply wallpaper to all workspaces option

[Xfce4-commits] Add an iconview tooltip

20 matches

Site Navigation

Mail list logo

Footer information