date:20130405

[Xfce4-commits] Conditionally connect web-process-crashed

2013-04-05 Thread Christian Dywan

Updating branch refs/heads/master
 to 945a70bbf7addde3337a9f8ed32f2c7ca47c8ce4 (commit)
   from 898da5f2bb2d14e271d5b0f2ad588c577fa5ebca (commit)

commit 945a70bbf7addde3337a9f8ed32f2c7ca47c8ce4
Author: Christian Dywan 
Date:   Sat Apr 6 00:06:22 2013 +0200

Conditionally connect web-process-crashed

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

diff --git a/midori/midori-view.c b/midori/midori-view.c
index c274f5a..e6fdafc 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3845,8 +3845,6 @@ midori_view_constructor (GType  type,
 view->web_view = GTK_WIDGET (midori_tab_get_web_view (MIDORI_TAB (view)));
 g_object_connect (view->web_view,
   #ifdef HAVE_WEBKIT2
-  "signal::web-process-crashed",
-  midori_view_web_view_crashed_cb, view,
   "signal::load-failed",
   webkit_web_view_load_error_cb, view,
   "signal::load-changed",
@@ -3928,6 +3926,9 @@ midori_view_constructor (GType  type,
 }
 
 #ifdef HAVE_WEBKIT2
+if (g_signal_lookup ("web-process-crashed", WEBKIT_TYPE_WEB_VIEW))
+g_signal_connect (view->web_view, "web-process-crashed",
+(GCallback)midori_view_web_view_crashed_cb, view);
 view->scrolled_window = view->web_view;
 #endif
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Implement certificate handling with WebKit2

2013-04-05 Thread Christian Dywan

Updating branch refs/heads/master
 to 898da5f2bb2d14e271d5b0f2ad588c577fa5ebca (commit)
   from 910547a6a3542bd1c9e9acca58b002d5851b51f4 (commit)

commit 898da5f2bb2d14e271d5b0f2ad588c577fa5ebca
Author: Christian Dywan 
Date:   Sat Apr 6 00:04:17 2013 +0200

Implement certificate handling with WebKit2

 midori/midori-locationaction.c |   23 -
 midori/midori-view.c   |   52 ---
 midori/midori-view.h   |7 +
 3 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index f39c1af..63e8e83 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1382,20 +1382,21 @@ midori_location_action_show_page_info (GtkWidget* 
widget,
GtkBox*box,
GtkWidget* dialog)
 {
-#ifndef HAVE_WEBKIT2
+GTlsCertificate* tls_cert;
+GTlsCertificateFlags tls_flags;
+gchar* hostname;
+
 MidoriBrowser* browser = midori_browser_get_for_widget (widget);
 MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser));
+#ifdef HAVE_WEBKIT2
+void* request = NULL;
+#else
 WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view 
(view));
 WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (web_view);
 WebKitWebDataSource* source = webkit_web_frame_get_data_source (web_frame);
 WebKitNetworkRequest* request = webkit_web_data_source_get_request 
(source);
-SoupMessage* message = midori_map_get_message 
(webkit_network_request_get_message (request));
-GTlsCertificate* tls_cert;
-GTlsCertificateFlags tls_flags;
-
-g_return_if_fail (message);
-g_object_get (message, "tls-certificate", &tls_cert, "tls-errors", 
&tls_flags, NULL);
-
+#endif
+midori_view_get_tls_info (view, request, &tls_cert, &tls_flags, &hostname);
 if (tls_cert == NULL)
 return;
 
@@ -1403,7 +1404,6 @@ midori_location_action_show_page_info (GtkWidget* widget,
 GByteArray* der_cert;
 GcrCertificate* gcr_cert;
 GtkWidget* details;
-SoupURI* uri = soup_message_get_uri (message);
 
 g_object_get (tls_cert, "certificate", &der_cert, NULL);
 gcr_cert = gcr_simple_certificate_new (
@@ -1412,7 +1412,7 @@ midori_location_action_show_page_info (GtkWidget* widget,
 details = (GtkWidget*)gcr_certificate_details_widget_new (gcr_cert);
 gtk_widget_show (details);
 gtk_container_add (GTK_CONTAINER (box), details);
-if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, 
uri->host, NULL, NULL))
+if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, 
hostname, NULL, NULL))
 gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 ("_Don't trust this website"), MIDORI_CERT_REVOKE, NULL);
 else if (tls_flags > 0)
@@ -1422,7 +1422,7 @@ midori_location_action_show_page_info (GtkWidget* widget,
 gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Export certificate"), 
MIDORI_CERT_EXPORT),
 "secondary", TRUE, NULL);
 
-g_object_set_data_full (G_OBJECT (gcr_cert), "peer", g_strdup (uri->host), 
(GDestroyNotify)g_free);
+g_object_set_data_full (G_OBJECT (gcr_cert), "peer", hostname, 
(GDestroyNotify)g_free);
 g_object_set_data_full (G_OBJECT (dialog), "gcr-cert", gcr_cert, 
(GDestroyNotify)g_object_unref);
 g_signal_connect (dialog, "response",
 G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert);
@@ -1440,7 +1440,6 @@ midori_location_action_show_page_info (GtkWidget* widget,
 #endif
 
 g_object_unref (tls_cert);
-#endif
 }
 #endif
 
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 3c57423..c274f5a 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -721,6 +721,34 @@ midori_view_update_load_status (MidoriView*  view,
 #endif
 }
 
+gboolean
+midori_view_get_tls_info (MidoriView*   view,
+  void* request,
+  GTlsCertificate** tls_cert,
+  GTlsCertificateFlags* tls_flags,
+  gchar**   hostname)
+{
+#ifdef HAVE_WEBKIT2
+WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
+*hostname = midori_uri_parse_hostname (webkit_web_view_get_uri (web_view), 
NULL);
+return webkit_web_view_get_tls_info (web_view, tls_cert, tls_flags);
+#else
+SoupMessage* message = midori_map_get_message 
(webkit_network_request_get_message (request));
+if (message != NULL)
+{
+SoupURI* uri = soup_message_get_uri (message);
+*hostname = uri ? g_strdup (uri->host) : NULL;
+g_object_get (message, "tls-certificate", tls_cert, "tls-errors", 
tls_flags, NULL);
+return tls_flags == 0
+ && soup_message_get_flags (message) & 
SOUP_MESSAGE_CERTIFICATE_TRUSTED;
+}
+*

[Xfce4-commits] Mouse button handling with WebKit2 except URL paste

2013-04-05 Thread Christian Dywan

Updating branch refs/heads/master
 to 910547a6a3542bd1c9e9acca58b002d5851b51f4 (commit)
   from 473e3087e9cd6dbc2768a3cdcb7abe4fa39884ac (commit)

commit 910547a6a3542bd1c9e9acca58b002d5851b51f4
Author: Christian Dywan 
Date:   Fri Apr 5 23:33:39 2013 +0200

Mouse button handling with WebKit2 except URL paste

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

diff --git a/midori/midori-view.c b/midori/midori-view.c
index d81bb88..3c57423 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1713,7 +1713,10 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView*
   web_view,
 {
 #ifdef HAVE_WEBKIT2
 if (!webkit_hit_test_result_context_is_link (hit_test_result))
+{
+katze_assign (view->link_uri, NULL);
 return;
+}
 const gchar* link_uri = webkit_hit_test_result_get_link_uri 
(hit_test_result);
 #endif
 
@@ -1783,7 +1786,6 @@ midori_view_web_view_button_press_event_cb 
(WebKitWebView*  web_view,
 GdkEventButton* event,
 MidoriView* view)
 {
-#ifndef HAVE_WEBKIT2
 GtkClipboard* clipboard;
 gchar* uri;
 gchar* new_uri;
@@ -1842,13 +1844,10 @@ midori_view_web_view_button_press_event_cb 
(WebKitWebView*  web_view,
 if (midori_settings_get_middle_click_opens_selection (MIDORI_SETTINGS 
(view->settings)))
 #endif
 {
-gboolean is_editable;
-WebKitHitTestResult* result;
-WebKitHitTestResultContext context;
-
-result = webkit_web_view_get_hit_test_result (web_view, event);
-context = katze_object_get_int (result, "context");
-is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
+#ifndef HAVE_WEBKIT2
+WebKitHitTestResult* result = webkit_web_view_get_hit_test_result 
(web_view, event);
+WebKitHitTestResultContext context = katze_object_get_int (result, 
"context");
+gboolean is_editable = context & 
WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
 g_object_unref (result);
 if (!is_editable)
 {
@@ -1900,6 +1899,7 @@ midori_view_web_view_button_press_event_cb 
(WebKitWebView*  web_view,
 }
 }
 }
+#endif
 }
 if (MIDORI_MOD_SCROLL (event->state))
 {
@@ -1943,7 +1943,6 @@ midori_view_web_view_button_press_event_cb 
(WebKitWebView*  web_view,
 
 /* We propagate the event, since it may otherwise be stuck in WebKit */
 g_signal_emit_by_name (view, "event", event, &background);
-#endif
 return FALSE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Add a Gtk.Entry to --plain mode for entering URLs

2013-04-05 Thread Christian Dywan

Updating branch refs/heads/master
 to 473e3087e9cd6dbc2768a3cdcb7abe4fa39884ac (commit)
   from 183747f06cd9e327b61360b20056a3f5f228cddb (commit)

commit 473e3087e9cd6dbc2768a3cdcb7abe4fa39884ac
Author: Christian Dywan 
Date:   Fri Apr 5 23:31:40 2013 +0200

Add a Gtk.Entry to --plain mode for entering URLs

On Windows it's especially tedious to use a command line.

 midori/main.c |   25 +++--
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 9be9d4d..0c53bdb 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -30,6 +30,15 @@
 #include "katze/katze.h"
 #include 
 
+static void
+plain_entry_activate_cb (GtkWidget* entry,
+ GtkWidget* web_view)
+{
+gchar* uri = sokoke_magic_uri (gtk_entry_get_text (GTK_ENTRY (entry)), 
FALSE, TRUE);
+webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri);
+g_free (uri);
+}
+
 #define HAVE_OFFSCREEN GTK_CHECK_VERSION (2, 20, 0)
 
 #ifndef HAVE_WEBKIT2
@@ -307,25 +316,29 @@ main (intargc,
 if (plain)
 {
 GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+GtkWidget* vbox = gtk_vbox_new (FALSE, 0);
+GtkWidget* entry = gtk_entry_new ();
 #ifndef HAVE_WEBKIT2
 GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL);
 #endif
 GtkWidget* web_view = webkit_web_view_new ();
-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));
 
+gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
 #ifndef HAVE_WEBKIT2
-gtk_container_add (GTK_CONTAINER (window), scrolled);
+gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0);
 gtk_container_add (GTK_CONTAINER (scrolled), web_view);
 #else
-gtk_container_add (GTK_CONTAINER (window), web_view);
+gtk_box_pack_start (GTK_BOX (vbox), web_view, TRUE, TRUE, 0);
 #endif
+gtk_container_add (GTK_CONTAINER (window), vbox);
+gtk_entry_set_text (GTK_ENTRY (entry), uris && *uris ? *uris : 
"http://www.example.com";);
+plain_entry_activate_cb (entry, web_view);
+g_signal_connect (entry, "activate",
+G_CALLBACK (plain_entry_activate_cb), web_view);
 g_signal_connect (window, "delete-event",
 G_CALLBACK (gtk_main_quit), window);
 gtk_widget_show_all (window);
-webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri);
-g_free (uri);
 gtk_main ();
 return 0;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Implement view-based favicon handling for WebKit2

2013-04-05 Thread Christian Dywan

Updating branch refs/heads/master
 to 183747f06cd9e327b61360b20056a3f5f228cddb (commit)
   from 8d041d8a30fd40a70627fe806a42930c1a93f5f9 (commit)

commit 183747f06cd9e327b61360b20056a3f5f228cddb
Author: Christian Dywan 
Date:   Fri Apr 5 23:28:30 2013 +0200

Implement view-based favicon handling for WebKit2

 katze/midori-paths.vala|   18 --
 midori/midori-view.c   |   23 ++-
 midori/webkit2gtk-3.0.vapi |   11 +++
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index 6f5cd45..b894b19 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -131,20 +131,24 @@ namespace Midori {
 cache_dir = Path.build_path (Path.DIR_SEPARATOR_S,
 Environment.get_user_cache_dir (), PACKAGE_NAME);
 user_data_dir = Environment.get_user_data_dir ();
+#if 0 // HAVE_WEBKIT2
+WebKit.WebContext.get_default ().set_disk_cache_directory (
+Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "web"));
+#endif
 tmp_dir = get_runtime_dir ();
 }
-#if !HAVE_WEBKIT2
 #if HAVE_WEBKIT_1_3_13
 if (user_data_dir != null) {
 string folder = Path.build_filename (user_data_dir, "webkit", 
"icondatabase");
-#if HAVE_WEBKIT_1_8_0
+#if HAVE_WEBKIT2
+WebKit.WebContext.get_default 
().set_favicon_database_directory (folder);
+#elif HAVE_WEBKIT_1_8_0
 WebKit.get_favicon_database ().set_path (folder);
 #elif HAVE_WEBKIT_1_3_13
 WebKit.get_icon_database ().set_path (folder);
 #endif
 }
 #endif
-#endif
 if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 
0) {
 stdout.printf ("config: %s\ncache: %s\nuser_data: %s\ntmp: 
%s\n",
config_dir, cache_dir, user_data_dir, tmp_dir);
@@ -419,8 +423,11 @@ namespace Midori {
 if (widget != null)
 Gtk.icon_size_lookup_for_settings (widget.get_settings (),
 Gtk.IconSize.MENU, out icon_width, out icon_height);
-#if !HAVE_WEBKIT2
-#if HAVE_WEBKIT_1_8_0
+#if HAVE_WEBKIT2
+/* TODO async
+var database = WebKit.WebContext.get_default 
().get_favicon_database ();
+database.get_favicon.begin (uri, null); */
+#elif HAVE_WEBKIT_1_8_0
 Gdk.Pixbuf? pixbuf = WebKit.get_favicon_database ()
 .try_get_favicon_pixbuf (uri, icon_width, icon_height);
 if (pixbuf != null)
@@ -448,7 +455,6 @@ namespace Midori {
 catch (GLib.Error error) { }
 }
 #endif
-#endif
 if (widget != null)
 return widget.render_icon (Gtk.STOCK_FILE, Gtk.IconSize.MENU, 
null);
 return null;
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 7fa0165..d81bb88 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -619,7 +619,17 @@ _midori_web_view_load_icon (MidoriView* view)
 gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, 
&icon_width, &icon_height);
 GdkPixbuf* pixbuf = NULL;
 #ifdef HAVE_WEBKIT2
-/* FIXME */
+cairo_surface_t* surface = webkit_web_view_get_favicon (WEBKIT_WEB_VIEW 
(view->web_view));
+if (surface != NULL
+ && (pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
+cairo_image_surface_get_width (surface),
+cairo_image_surface_get_height (surface
+{
+GdkPixbuf* pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf,
+icon_width, icon_height, GDK_INTERP_BILINEAR);
+g_object_unref (pixbuf);
+midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri);
+}
 #elif WEBKIT_CHECK_VERSION (1, 8, 0)
 if ((pixbuf = webkit_web_view_try_get_favicon_pixbuf (
 WEBKIT_WEB_VIEW (view->web_view), icon_width, icon_height)))
@@ -1643,12 +1653,15 @@ midori_web_view_notify_icon_uri_cb (WebKitWebView* 
web_view,
 MidoriView*view)
 {
 #ifdef HAVE_WEBKIT2
-/* TODO */
+const gchar* uri = webkit_web_view_get_uri (web_view);
+WebKitWebContext* context = webkit_web_context_get_default ();
+WebKitFaviconDatabase* favicon_database = 
webkit_web_context_get_favicon_database (context);
+gchar* icon_uri = webkit_favicon_database_get_favicon_uri 
(favicon_database, uri);
 #else
-const gchar* icon_uri = webkit_web_view_get_icon_uri (web_view);
-katze_assign (view->icon_uri, g_strdup (icon_uri));
-_midori_web_view_load_icon (view);
+gchar* icon_uri = g_strdup (webkit_web_view_get_icon_uri (web_view));
 #endif
+katze_assign (view->icon_uri, icon_uri);
+_midori_web_view_load_icon (view);
 }
 #endif
 
diff --git a/midori/webkit2gtk-3.0.vapi b/midori/webkit2gtk-3.0.vapi
index 0279812..0cb4757 100644
--- a/midori/webkit2gtk-3.0.vapi
+++ b/midori/webkit2gtk-3.0.vapi
@@ -

[Xfce4-commits] Wrapper ported for both Gtk+-2 and Gtk+-3

2013-04-05 Thread Peter de Ridder

Updating branch refs/heads/nick/gtk3
 to 0ff5a96563d2779775b182ae87bb0229be1d (commit)
   from cc2584b1571ba65cecb312897ebe51a85b32c43b (commit)

commit 0ff5a96563d2779775b182ae87bb0229be1d
Author: Peter de Ridder 
Date:   Fri Apr 5 21:36:18 2013 +0200

Wrapper ported for both Gtk+-2 and Gtk+-3

 wrapper/Makefile.am|   50 ++---
 wrapper/main.c |4 ++
 wrapper/wrapper-plug.c |  116 +---
 wrapper/wrapper-plug.h |7 +++
 4 files changed, 164 insertions(+), 13 deletions(-)

diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 94bb13a..86abda1 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -8,12 +8,12 @@ AM_CPPFLAGS = \
 wrapperdir = $(HELPER_PATH_PREFIX)/xfce4/panel
 
 wrapper_PROGRAMS = \
-   wrapper
+   wrapper3
 
 wrapper_built_sources = \
wrapper-dbus-client-infos.h
 
-wrapper_SOURCES = \
+wrapper3_SOURCES = \
$(wrapper_built_sources) \
main.c \
wrapper-module.c \
@@ -21,27 +21,65 @@ wrapper_SOURCES = \
wrapper-plug.c \
wrapper-plug.h
 
-wrapper_CFLAGS = \
+wrapper3_CFLAGS = \
$(GTK_CFLAGS) \
$(DBUS_CFLAGS) \
$(GMODULE_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(PLATFORM_CFLAGS)
 
-wrapper_LDFLAGS = \
+wrapper3_LDFLAGS = \
-no-undefined \
$(PLATFORM_LDFLAGS)
 
-wrapper_LDADD = \
+wrapper3_LDADD = \

$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(GTK_LIBS) \
$(DBUS_LIBS) \
$(GMODULE_LIBS) \
$(LIBXFCE4UTIL_LIBS)
 
-wrapper_DEPENDENCIES = \
+wrapper3_DEPENDENCIES = \

$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la
 
+#
+# Gtk+ 2 support library
+#
+if ENABLE_GTK2_LIBRARY
+
+wrapper_PROGRAMS += wrapper2
+
+wrapper2_SOURCES = \
+   $(wrapper_built_sources) \
+   main.c \
+   wrapper-module.c \
+   wrapper-module.h \
+   wrapper-plug.c \
+   wrapper-plug.h
+
+wrapper2_CFLAGS = \
+   $(GTK2_CFLAGS) \
+   $(DBUS_CFLAGS) \
+   $(GMODULE_CFLAGS) \
+   $(LIBXFCE4UTIL_CFLAGS) \
+   $(PLATFORM_CFLAGS)
+
+wrapper2_LDFLAGS = \
+   -no-undefined \
+   $(PLATFORM_LDFLAGS)
+
+wrapper2_LDADD = \
+   $(top_builddir)/libxfce4panel/libxfce4panel-1.0.la \
+   $(GTK2_LIBS) \
+   $(DBUS_LIBS) \
+   $(GMODULE_LIBS) \
+   $(LIBXFCE4UTIL_LIBS)
+
+wrapper2_DEPENDENCIES = \
+   $(top_builddir)/libxfce4panel/libxfce4panel-1.0.la
+
+endif
+
 if MAINTAINER_MODE
 
 wrapper-dbus-client-infos.h: 
$(top_builddir)/panel/panel-plugin-external-wrapper-infos.xml Makefile
diff --git a/wrapper/main.c b/wrapper/main.c
index 2420d79..0a19ec6 100644
--- a/wrapper/main.c
+++ b/wrapper/main.c
@@ -271,7 +271,11 @@ main (gint argc, gchar **argv)
   GError  *error = NULL;
   const gchar *filename;
   gint unique_id;
+#if GTK_CHECK_VERSION (3, 0, 0)
+  Window   socket_id;
+#else
   GdkNativeWindow  socket_id;
+#endif
   const gchar *name;
   const gchar *display_name;
   const gchar *comment;
diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index 29cced3..d00784e 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -30,8 +30,13 @@
 
 
 static void wrapper_plug_finalize (GObject*object);
+#if GTK_CHECK_VERSION (3, 0, 0)
+static gboolean wrapper_plug_draw (GtkWidget  *widget,
+   cairo_t*cr);
+#else
 static gboolean wrapper_plug_expose_event (GtkWidget  *widget,
GdkEventExpose *event);
+#endif
 static void wrapper_plug_background_reset (WrapperPlug*plug);
 
 
@@ -73,7 +78,11 @@ wrapper_plug_class_init (WrapperPlugClass *klass)
   gobject_class->finalize = wrapper_plug_finalize;
 
   gtkwidget_class = GTK_WIDGET_CLASS (klass);
+#if GTK_CHECK_VERSION (3, 0, 0)
+  gtkwidget_class->draw = wrapper_plug_draw;
+#else
   gtkwidget_class->expose_event = wrapper_plug_expose_event;
+#endif
 }
 
 
@@ -81,8 +90,13 @@ wrapper_plug_class_init (WrapperPlugClass *klass)
 static void
 wrapper_plug_init (WrapperPlug *plug)
 {
+#if GTK_CHECK_VERSION (3, 0, 0)
+  GdkVisual *visual = NULL;
+  GdkScreen *screen;
+#else
   GdkColormap *colormap = NULL;
   GdkScreen   *screen;
+#endif
 
   plug->background_alpha = 1.00;
   plug->background_color = NULL;
@@ -94,18 +108,17 @@ wrapper_plug_init (WrapperPlug *plug)
   /* allow painting, else compositing won't work */
   gtk_widget_set_app_paintable (GTK_WIDGET (plug), TRUE);
 
-  /* old versions of gtk don't support transparent tray icons, if we
-   * set an argb colormap on the tray, the icons won't be embedded because
-   * the socket-plugin implementation requires identical colormaps */
-  if (gtk_check_version (2, 16, 0) != NULL
-  && strcm

[Xfce4-commits] There shouldn't be G DECLS around includes.

2013-04-05 Thread Peter de Ridder

Updating branch refs/heads/nick/gtk3
 to cc2584b1571ba65cecb312897ebe51a85b32c43b (commit)
   from 707b0e40935313cfa6018f84867783688d851c9f (commit)

commit cc2584b1571ba65cecb312897ebe51a85b32c43b
Author: Peter de Ridder 
Date:   Fri Apr 5 18:53:51 2013 +0200

There shouldn't be G DECLS around includes.

 libxfce4panel/libxfce4panel.h |4 
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h
index 85ecbf5..f6b4b22 100644
--- a/libxfce4panel/libxfce4panel.h
+++ b/libxfce4panel/libxfce4panel.h
@@ -21,8 +21,6 @@
 
 #include 
 
-G_BEGIN_DECLS
-
 #define LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H
 
 #include 
@@ -40,6 +38,4 @@ G_BEGIN_DECLS
 
 #undef LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H
 
-G_END_DECLS
-
 #endif /* !__LIBXFCE4PANEL__ */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfce4ui isn't used by the panel lib

2013-04-05 Thread Peter de Ridder

Updating branch refs/heads/nick/gtk3
 to 707b0e40935313cfa6018f84867783688d851c9f (commit)
   from f9e5f6a12098724e2e51532c4b79d322ec6a51b0 (commit)

commit 707b0e40935313cfa6018f84867783688d851c9f
Author: Peter de Ridder 
Date:   Fri Apr 5 18:50:38 2013 +0200

libxfce4ui isn't used by the panel lib

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

diff --git a/configure.ac.in b/configure.ac.in
index 28767b8..d3291ad 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -144,9 +144,6 @@ dnl 
***
 XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
[gtk+-2.0], [2.20.0], [gtk2],
[GTK+ 2 support])
-if "x$GTK2_FOUND" = "xyes" ; then
-XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-1], [4.9.0])
-fi
 AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"])
 
 dnl **
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Russian (ru) translation to 100%

2013-04-05 Thread Transifex

Updating branch refs/heads/master
 to 95e3b85baa1dec2d01061a4b04c6bece63706f9c (commit)
   from 4e3d5a3acc95abef29658ef1b36410e26df5fc00 (commit)

commit 95e3b85baa1dec2d01061a4b04c6bece63706f9c
Author: Sergey Alyoshin 
Date:   Fri Apr 5 21:40:07 2013 +0200

l10n: Updated Russian (ru) translation to 100%

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

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

 po/ru.po |   28 ++--
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 12b0080..ae19f00 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,11 +1,19 @@
+# Russian translation of xfce4-smartbookmark-plugin.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the
+# xfce4-smartbookmark-plugin package.
+#
+#
+# Andriy Kovtun , 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-smartbookmark-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-03 22:26+0100\n"
-"PO-Revision-Date: \n"
+"POT-Creation-Date: 2013-04-05 23:38+0400\n"
+"PO-Revision-Date: 2013-04-05 23:38+0400\n"
 "Last-Translator: Andriy Kovtun \n"
-"Language-Team: Russian \n"
+"Language-Team: xfce-i...@xfce.org\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,33 +24,33 @@ msgstr ""
 #: ../src/smartbookmark.c:90
 #, c-format
 msgid "Failed to send %s to your preferred browser"
-msgstr ""
+msgstr "Ошибка при отправке %s вашему предпочитаемому браузеру"
 
-#: ../src/smartbookmark.c:296
+#: ../src/smartbookmark.c:259
 msgid "Smartbookmark"
 msgstr "Умные закладки"
 
-#: ../src/smartbookmark.c:301
+#: ../src/smartbookmark.c:264
 msgid "Preferences"
 msgstr "Параметры"
 
 #. text label
-#: ../src/smartbookmark.c:316
+#: ../src/smartbookmark.c:279
 msgid "Label:"
 msgstr "Метка:"
 
 #. size label
-#: ../src/smartbookmark.c:331
+#: ../src/smartbookmark.c:294
 msgid "Size:"
 msgstr "Размер:"
 
 #. Hide label option
-#: ../src/smartbookmark.c:342
+#: ../src/smartbookmark.c:305
 msgid "Hide label"
 msgstr "Спрятать метку"
 
 #. url label
-#: ../src/smartbookmark.c:353
+#: ../src/smartbookmark.c:316
 msgid "URL:  "
 msgstr "Ссылка URL:"
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-04-05 Thread Transifex

Updating branch refs/heads/master
 to ec508823542a9317e60b8b029782f018eb43c10b (commit)
   from c71954bd92a9db9046b51c422c86f6061727cb6c (commit)

commit ec508823542a9317e60b8b029782f018eb43c10b
Author: Саша Петровић 
Date:   Fri Apr 5 14:33:10 2013 +0200

l10n: Updated Serbian (sr) translation to 100%

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

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

 po/sr.po |   50 +-
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index db18c27..702f0e9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-panel 4.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-20 11:54+\n"
+"POT-Creation-Date: 2013-04-05 07:45+\n"
 "PO-Revision-Date: 2013-03-05 15:09+0100\n"
 "Last-Translator: Саша Петровић \n"
 "Language-Team: српски <>\n"
@@ -34,41 +34,41 @@ msgstr "Прилагодите полицу"
 #: ../panel/panel-preferences-dialog.glade.h:29 ../panel/panel-window.c:2353
 #: ../migrate/main.c:117
 msgid "Panel"
-msgstr "полица"
+msgstr "Полица"
 
 #. I18N: %s is the name of the plugin
-#: ../libxfce4panel/xfce-panel-plugin.c:1037
+#: ../libxfce4panel/xfce-panel-plugin.c:1029
 #: ../panel/panel-preferences-dialog.c:1099
 #, c-format
 msgid "Are you sure that you want to remove \"%s\"?"
 msgstr "Да ли сте сигурни да желите да уклоните „%s“?"
 
-#: ../libxfce4panel/xfce-panel-plugin.c:1042
+#: ../libxfce4panel/xfce-panel-plugin.c:1034
 #: ../panel/panel-preferences-dialog.c:1102
 msgid "If you remove the item from the panel, it is permanently lost."
 msgstr "Ако уклоните ставку са полице, биће заувек изгубљена."
 
 #. move item
-#: ../libxfce4panel/xfce-panel-plugin.c:1202
+#: ../libxfce4panel/xfce-panel-plugin.c:1194
 msgid "_Move"
 msgstr "_Премести"
 
-#: ../libxfce4panel/xfce-panel-plugin.c:1236
+#: ../libxfce4panel/xfce-panel-plugin.c:1228
 msgid "Pane_l"
-msgstr "полиц_а"
+msgstr "Полиц_а"
 
 #. add new items
-#: ../libxfce4panel/xfce-panel-plugin.c:1244 ../panel/panel-window.c:2365
+#: ../libxfce4panel/xfce-panel-plugin.c:1236 ../panel/panel-window.c:2365
 msgid "Add _New Items..."
 msgstr "Додај _нове ставке..."
 
 #. customize panel
-#: ../libxfce4panel/xfce-panel-plugin.c:1255 ../panel/panel-window.c:2376
+#: ../libxfce4panel/xfce-panel-plugin.c:1247 ../panel/panel-window.c:2376
 msgid "Panel Pr_eferences..."
 msgstr "По_дешавања полице..."
 
 #. logout item
-#: ../libxfce4panel/xfce-panel-plugin.c:1272 ../panel/panel-window.c:2404
+#: ../libxfce4panel/xfce-panel-plugin.c:1264 ../panel/panel-window.c:2404
 msgid "Log _Out"
 msgstr "Одја_ва"
 
@@ -78,7 +78,7 @@ msgstr "Приказује прозорче „Особине полице“"
 
 #: ../panel/main.c:79 ../panel/main.c:80
 msgid "PANEL-NUMBER"
-msgstr "БРОЈ-полицЕ"
+msgstr "БРОЈ-ПОЛИЦЕ"
 
 #: ../panel/main.c:80
 msgid "Show the 'Add New Items' dialog"
@@ -149,7 +149,7 @@ msgstr "Нисам успео да прикажем прозорче подеш
 
 #: ../panel/main.c:379
 msgid "Failed to show the add new items dialog"
-msgstr "Нисам успео да прикажем прозорче за додам нових ставки"
+msgstr "Нисам успео да прикажем прозорче за додаавање нових ставки"
 
 #: ../panel/main.c:381
 msgid "Failed to save the panel configuration"
@@ -255,7 +255,7 @@ msgstr "Неактивни одржаваоци"
 
 #: ../panel/panel-dialogs.c:82
 msgid "The panel of the Xfce Desktop Environment"
-msgstr "полица за ИксФЦЕ радно окружење"
+msgstr "Полица за ИксФЦЕ радно окружење"
 
 #: ../panel/panel-dialogs.c:87
 msgid "translator-credits"
@@ -273,7 +273,7 @@ msgstr "Изаберите полицу за нови прикључак:"
 #: ../panel/panel-dialogs.c:192 ../panel/panel-preferences-dialog.c:806
 #, c-format
 msgid "Panel %d"
-msgstr "полица %d"
+msgstr "Полица %d"
 
 #: ../panel/panel-dialogs.c:232
 msgid ""
@@ -934,23 +934,23 @@ msgstr "_Иконица:"
 msgid "_Show button title"
 msgstr "_Прикажи наслов дугмади"
 
-#: ../plugins/applicationsmenu/applicationsmenu.c:565
+#: ../plugins/applicationsmenu/applicationsmenu.c:557
 #: ../plugins/directorymenu/directorymenu.c:388
 msgid "Select An Icon"
 msgstr "Изаберите иконицу"
 
-#: ../plugins/applicationsmenu/applicationsmenu.c:603
-#: ../plugins/applicationsmenu/applicationsmenu.c:844
+#: ../plugins/applicationsmenu/applicationsmenu.c:598
+#: ../plugins/applicationsmenu/applicationsmenu.c:839
 #: ../plugins/clock/clock.c:865 ../plugins/launcher/launcher.c:2308
 #, c-format
 msgid "Failed to execute command \"%s\"."
 msgstr "Нисам успео да извршим наредбу „%s“."
 
-#: ../plugins/applicationsmenu/applicationsmenu.c:1113
+#: ../plugins/applicationsmenu/applicationsmenu.c:1108
 msgid "No applications found"
 msgstr "Нису пронађени програми"
 
-#: ../plugins/applicationsmenu/applicationsmenu.c:1136
+#: ../plugins/applicationsmenu/applicationsmenu.c:1131
 msgid "Failed to load the applications menu"
 msgstr "Нисам успео да учитам изборник програма"
 
@@ -1097,7 +1097,7 @@ msgstr "Временска _област:"

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-04-05 Thread Transifex

Updating branch refs/heads/master
 to c47509d7c9394329ee3dad48ef8e93751be61b67 (commit)
   from 7f332e0fcedb818a5adfa497dcba1a3ffb272d8e (commit)

commit c47509d7c9394329ee3dad48ef8e93751be61b67
Author: Саша Петровић 
Date:   Fri Apr 5 14:22:57 2013 +0200

l10n: Updated Serbian (sr) translation to 100%

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

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

 po/sr.po |  130 -
 1 files changed, 119 insertions(+), 11 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 9c36c9c..7a4387e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,31 +3,139 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # Саша Петровић , 2012.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-30 03:30+\n"
+"POT-Creation-Date: 2013-04-05 07:15+\n"
 "PO-Revision-Date: 2012-10-30 09:02+0100\n"
 "Last-Translator: salepetronije \n"
 "Language-Team: српски \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
(n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 2.91.5\n"
 
-#: ../panel-plugin/indicator.c:175
-msgid "No Indicators"
-msgstr "Нема показивача"
-
-#: ../panel-plugin/indicator.desktop.in.in.h:1
+#: ../panel-plugin/indicator.desktop.in.h:1 ../panel-plugin/indicator.c:157
 msgid "An indicator of something that needs your attention on the desktop"
-msgstr "Показивач нечег што захтева вашу пажњу на радној површи"
+msgstr "Указивач нечега што захтева вашу пажњу на радној површи"
 
-#: ../panel-plugin/indicator.desktop.in.in.h:2
+#: ../panel-plugin/indicator.desktop.in.h:2
 msgid "Indicator Plugin"
-msgstr "Прикључак показивач"
+msgstr "Прикључак Указивач"
+
+#: ../panel-plugin/indicator.c:159
+msgid "Copyright (c) 2009-2013\n"
+msgstr "Права умножавања (c) 2009-2013\n"
+
+#: ../panel-plugin/indicator.c:288
+msgid "No Indicators"
+msgstr "Нема указивача"
+
+#. raw name,  pretty name,
+#. icon-name(?)
+#: ../panel-plugin/indicator-dialog.c:57
+msgid "Application Indicators"
+msgstr "Указивачи програма"
+
+#: ../panel-plugin/indicator-dialog.c:58
+msgid "Sound Menu"
+msgstr "Изборник звука"
+
+#: ../panel-plugin/indicator-dialog.c:59
+msgid "Printers Menu"
+msgstr "Изборник штампача"
+
+#: ../panel-plugin/indicator-dialog.c:60
+msgid "Power Management"
+msgstr "Управљање поторшњом"
+
+#: ../panel-plugin/indicator-dialog.c:61
+msgid "Application Menus (Global Menu)"
+msgstr "Изборници програма (општи изборник)"
+
+#: ../panel-plugin/indicator-dialog.c:62
+msgid "Session Management"
+msgstr "Управљање сесијом"
+
+#: ../panel-plugin/indicator-dialog.c:63
+msgid "Messaging Menu"
+msgstr "Изборник порука"
+
+#: ../panel-plugin/indicator-dialog.c:64
+msgid "Date and Time"
+msgstr "Датум и време"
+
+#: ../panel-plugin/indicator-dialog.c:436
+msgid "Are you sure you want to clear the list of known indicators?"
+msgstr "Да ли сте сигурни да желите очистити списак познатих указивача?"
+
+#: ../panel-plugin/indicator-dialog.c:572
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Нисам успео да отворим следећу урл адресу: %s"
+
+#: ../panel-plugin/indicator-dialog.glade.h:1
+msgid "Please restart the panel for visibility changes to take effect."
+msgstr "Молим, покрените поново полицу да би измене приказа ступиле на 
снагу."
+
+#: ../panel-plugin/indicator-dialog.glade.h:2
+msgid "Align left in deskbar mode"
+msgstr "Поравнај лево у начину приказа траке пулта"
+
+#: ../panel-plugin/indicator-dialog.glade.h:3
+msgid "Appearance"
+msgstr "Приказ"
+
+#: ../panel-plugin/indicator-dialog.glade.h:4
+msgid "C_lear known indicators"
+msgstr "Очисти познате указиваче"
+
+#: ../panel-plugin/indicator-dialog.glade.h:5
+msgid ""
+"Controls the indicator button layout when the panel is in a Deskbar mode. "
+"Possible choices are \"centered\" or \"aligned left\"."
+msgstr "Управља размештајем дугмета указивача када је полица у начину приказа 
траке пулта. Могући избори су „у средини“ и „лево поравнање“."
+
+#: ../panel-plugin/indicator-dialog.glade.h:6
+msgid "Hide indicators by default"
+msgstr "Подразумевано скривај указиваче"
+
+#: ../panel-plugin/indicator-dialog.glade.h:7
+msgid ""
+"Icons are scaled to fit a single row of the panel. Use this option to "
+"restrict the maximum size of the icon."
+msgstr "Величина икона је подешена да стане у један рд на полицу. Користите 
ову могућност да ограничите највећу величину приказа иконе."
+
+#: ../panel-plugin/indicator-dialog.glade.h:8
+msgid "Indicators"
+msgstr "Указивачи"
+
+#: ../panel-plugin/indicator-dialog.glade.h:9
+msgid "Known Indicators"
+msgstr "Познати указивачи"
+
+#: ../panel-plugin/indicator-dialog.glade.h:10
+msgid "Mov

[Xfce4-commits] Conditionally connect web-process-crashed

[Xfce4-commits] Implement certificate handling with WebKit2

[Xfce4-commits] Mouse button handling with WebKit2 except URL paste

[Xfce4-commits] Add a Gtk.Entry to --plain mode for entering URLs

[Xfce4-commits] Implement view-based favicon handling for WebKit2

[Xfce4-commits] Wrapper ported for both Gtk+-2 and Gtk+-3

[Xfce4-commits] There shouldn't be G DECLS around includes.

[Xfce4-commits] libxfce4ui isn't used by the panel lib

[Xfce4-commits] l10n: Updated Russian (ru) translation to 100%

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

11 matches

Site Navigation

Mail list logo

Footer information