[Xfce4-commits] xfce4-weather-plugin:master Fix color parsing when reading config file.

[Harald Judt]

Updating branch refs/heads/master
 to 462e85dfd54e9a3bdf6c330c602a6545bccce585 (commit)
   from 69842d364cc2dc453445926e4cdf036ab245b871 (commit)

commit 462e85dfd54e9a3bdf6c330c602a6545bccce585
Author: Harald Judt h.j...@gmx.at
Date:   Wed Feb 20 15:25:09 2013 +0100

Fix color parsing when reading config file.

This turned out to be a stupid copy  paste mistake.

 panel-plugin/weather.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 710c33c..4a2e3c3 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -884,7 +884,7 @@ xfceweather_read_config(XfcePanelPlugin *plugin,
 
 value = xfce_rc_read_entry(rc, scrollbox_color, NULL);
 if (value)
-gdk_color_parse(#, (data-scrollbox_color));
+gdk_color_parse(value, (data-scrollbox_color));
 
 data-scrollbox_use_color =
 xfce_rc_read_bool_entry(rc, scrollbox_use_color, FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Link to libmath and clean up AC_CHECK_HEADERS.

[Harald Judt]

Updating branch refs/heads/master
 to 69842d364cc2dc453445926e4cdf036ab245b871 (commit)
   from afa2027a1fd7504fd2fabbfcc4dfcfb48b627603 (commit)

commit 69842d364cc2dc453445926e4cdf036ab245b871
Author: Harald Judt h.j...@gmx.at
Date:   Wed Feb 20 15:08:08 2013 +0100

Link to libmath and clean up AC_CHECK_HEADERS.

 configure.ac.in  |6 +++---
 panel-plugin/Makefile.am |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 6b3492b..d95bab0 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -45,9 +45,9 @@ dnl **
 dnl *** Check for standard headers ***
 dnl **
 AC_HEADER_STDC()
-AC_CHECK_HEADERS([string.h fcntl.h errno.h sys/socket.h netdb.h \
-  netinet/in.h sys/types.h time.h unistd.h stdio.h \
-  sys/stat.h stddef.h stdlib.h netinet/in.h])
+AC_CHECK_HEADERS([math.h stdarg.h stddef.h stdlib.h string.h sys/stat.h 
time.h])
+AC_CHECK_LIBM
+AC_SUBST(LIBM)
 
 dnl **
 dnl *** Check for i18n support ***
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 901197e..3c63d2d 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -41,13 +41,13 @@ libweather_la_CFLAGS =  
\
$(LIBXML_CFLAGS)
 
 libweather_la_LIBADD = \
+   $(LIBM) \
$(LIBXFCE4PANEL_LIBS)   \
$(LIBXFCE4UTIL_LIBS)\
$(LIBXFCE4UI_LIBS)  \
$(GTK_LIBS) \
$(LIBXML_LIBS)  \
-   $(SOUP_LIBS)\
-   $(LIBRESOLV)
+   $(SOUP_LIBS)
 
 libweather_la_LDFLAGS = \
-avoid-version \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master l10n: Updated French (fr) translation to 98%

[Transifex]

Updating branch refs/heads/master
 to e2f4a6cca7730b37a3a4c1bc8e0fd3e363a22054 (commit)
   from 889767357a580ef5a24eae28d230e92e97410598 (commit)

commit e2f4a6cca7730b37a3a4c1bc8e0fd3e363a22054
Author: jc jc1 jc1.quebe...@gmail.com
Date:   Wed Feb 20 17:56:33 2013 +0100

l10n: Updated French (fr) translation to 98%

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

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

 po/fr.po |   20 +---
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 80047bf..adbfb7f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,7 @@ msgid 
 msgstr 
 Project-Id-Version: midori 0.2.7\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-02-19 20:33+\n
+POT-Creation-Date: 2013-02-20 12:36+\n
 PO-Revision-Date: 2012-12-07 14:55+0100\n
 Last-Translator: \n
 Language-Team: French f...@li.org\n
@@ -2904,7 +2904,9 @@ msgstr Supprimer toutes les autorisations cookies?
 msgid 
 This action will delete all cookie permissions. You will be asked for 
 permissions again for each web site visited.
-msgstr Cette action permet de supprimer toutes les permissions cookies. Il 
vous sera demandé pour les permissions à nouveau pour chaque site Web visité.
+msgstr 
+Cette action permet de supprimer toutes les permissions cookies. Il vous 
+sera demandé pour les permissions à nouveau pour chaque site Web visité.
 
 #: 
../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:587
 msgid Cookie permission manager
@@ -2950,7 +2952,9 @@ msgstr Demander la politique si elle est inconnue pour 
un domaine
 msgid 
 A fatal error occurred which prevents the cookie permission manager 
 extension to continue. You should disable it.
-msgstr Une erreur fatale s'est produite qui empêche l'extension gestionnaire 
de permission cookie de continuer. Vous devriez le désactiver.
+msgstr 
+Une erreur fatale s'est produite qui empêche l'extension gestionnaire de 
+permission cookie de continuer. Vous devriez le désactiver.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:87
 msgid Error in cookie permission manager extension
@@ -3019,7 +3023,7 @@ msgstr Valeur
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:521
 msgid Expire date
-msgstr 
+msgstr Date d'expiration
 
 #. Create buttons for dialog
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:545
@@ -3040,7 +3044,7 @@ msgstr Instance d'extension
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:882
 msgid The Midori extension instance for this extension
-msgstr 
+msgstr L'instance d'extension Midori pour cette extension
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:888
 msgid Application instance
@@ -3048,7 +3052,7 @@ msgstr Instance d'application
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:889
 msgid The Midori application instance this extension belongs to
-msgstr 
+msgstr L'instance de l'application Midori cette extension appartient à
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:895
 msgid Database instance
@@ -3056,7 +3060,9 @@ msgstr Instance base de données
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:896
 msgid Pointer to sqlite database instance used by this extension
-msgstr Pointer vers l'instance de base de données SQLite utilisée par cette 
extension
+msgstr 
+Pointer vers l'instance de base de données SQLite utilisée par cette 
+extension
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:901
 msgid Ask for unknown policy
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master l10n: Updated French (fr) translation to 98%

[Transifex]

Updating branch refs/heads/master
 to db87dc1eeeceb310143f4d8aaa4fdc3d32a232f8 (commit)
   from e2f4a6cca7730b37a3a4c1bc8e0fd3e363a22054 (commit)

commit db87dc1eeeceb310143f4d8aaa4fdc3d32a232f8
Author: jc jc1 jc1.quebe...@gmail.com
Date:   Wed Feb 20 18:00:27 2013 +0100

l10n: Updated French (fr) translation to 98%

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

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

 po/fr.po |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index adbfb7f..8ca5f90 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2958,7 +2958,7 @@ msgstr 
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:87
 msgid Error in cookie permission manager extension
-msgstr 
+msgstr Erreur dans le extension du gestionnaire de cookie de permission
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:92
 msgid Reason
@@ -2996,12 +2996,12 @@ msgstr 
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:430
 msgid Confirm storing cookie
-msgstr 
+msgstr Confirmer cookie de stockage
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:461
 #, c-format
 msgid The website %s wants to store %d cookies.
-msgstr 
+msgstr Le sites Web %s veut stocker %d cookies.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:463
 #, c-format
@@ -3011,7 +3011,7 @@ msgstr 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:467
 #, c-format
 msgid Multiple websites want to store %d cookies in total.
-msgstr 
+msgstr Plusieurs sites Web veulent stocker %d cookies au total.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:496
 msgid Path
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master l10n: Updated French (fr) translation to 99%

[Transifex]

Updating branch refs/heads/master
 to a67620816f3b986fcbf9dfccd3d3a2f29bea4136 (commit)
   from db87dc1eeeceb310143f4d8aaa4fdc3d32a232f8 (commit)

commit a67620816f3b986fcbf9dfccd3d3a2f29bea4136
Author: jc jc1 jc1.quebe...@gmail.com
Date:   Wed Feb 20 18:06:00 2013 +0100

l10n: Updated French (fr) translation to 99%

New status: 679 messages complete with 0 fuzzies and 3 untranslated.

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

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

diff --git a/po/fr.po b/po/fr.po
index 8ca5f90..715b6fc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2966,20 +2966,20 @@ msgstr Raison
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:125
 msgid Could not get path to configuration of extension: path is NULL
-msgstr 
+msgstr Impossible d'obtenir le chemin d'accès à la configuration d'extension 
: chemin est VIDE
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:127
 msgid Could not get path to configuration of extension.
-msgstr 
+msgstr Impossible d'obtenir le chemin d'accès à la configuration d'extension.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:133
 #, c-format
 msgid Could not create configuration folder for extension: %s
-msgstr 
+msgstr Impossible de créer le dossier de configuration pour extension : %s
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:135
 msgid Could not create configuration folder for extension.
-msgstr 
+msgstr Impossible de créer le dossier de configuration pour extension.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:150
 msgid Could not open database of extension.
@@ -2987,7 +2987,7 @@ msgstr Impossible d'ouvrir la base de données des 
extensions.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:183
 msgid Could not set up database structure of extension.
-msgstr 
+msgstr Impossible de configurer la structure de la base de données extension.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:300
 #, c-format
@@ -3006,7 +3006,7 @@ msgstr Le sites Web %s veut stocker %d cookies.
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:463
 #, c-format
 msgid The website %s wants to store a cookie.
-msgstr 
+msgstr Le sites Web %s veut stocker un cookie.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:467
 #, c-format
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master l10n: Updated French (fr) translation to 99%

[Transifex]

Updating branch refs/heads/master
 to 19bd1a5fe035673f391dfd93d4ae5a88a276ef9b (commit)
   from a67620816f3b986fcbf9dfccd3d3a2f29bea4136 (commit)

commit 19bd1a5fe035673f391dfd93d4ae5a88a276ef9b
Author: jc jc1 jc1.quebe...@gmail.com
Date:   Wed Feb 20 18:09:15 2013 +0100

l10n: Updated French (fr) translation to 99%

New status: 681 messages complete with 0 fuzzies and 1 untranslated.

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

 po/fr.po |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 715b6fc..a41e99f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2992,7 +2992,7 @@ msgstr Impossible de configurer la structure de la base 
de données extension.
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:300
 #, c-format
 msgid Could not determine global cookie policy to set for domain: %s
-msgstr 
+msgstr Impossible de déterminer la politique cookie globale à définir pour le 
domaine : %s
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:430
 msgid Confirm storing cookie
@@ -3072,7 +3072,7 @@ msgstr Interroger pour une politique inconnue
 msgid 
 If true this extension ask for policy for every unknown domain.If false this 
 extension uses the global cookie policy set in midori settings.
-msgstr 
+msgstr Si vrai cette extension demande la politique pour chaque domaine 
inconnue. Si  faux cette extension utilise la politique cookies globale  
définie dans les paramètres midori.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:983
 msgid Undetermined
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master l10n: Updated French (fr) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to 4b197b6b4d2797098c66bb09f5828021cfe2937e (commit)
   from 19bd1a5fe035673f391dfd93d4ae5a88a276ef9b (commit)

commit 4b197b6b4d2797098c66bb09f5828021cfe2937e
Author: jc jc1 jc1.quebe...@gmail.com
Date:   Wed Feb 20 18:11:48 2013 +0100

l10n: Updated French (fr) translation to 100%

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

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

 po/fr.po |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index a41e99f..5337218 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2928,7 +2928,7 @@ msgid 
 policies by marking the entries and clicking on iDelete/i.You can also 
 add a policy for a domain manually by entering the domain below, choosing 
 the policy and clicking on iAdd/i.
-msgstr 
+msgstr Ci-dessous est une liste de tous les sites Web et l'ensemble de la 
politique pour eux. Vous pouvez supprimer des stratégies en marquant les 
entrées et en cliquant sur iSupprimer/i. Vous pouvez également ajouter une 
stratégie pour un domaine manuellement en entrant le nom de domaine ci-dessous, 
en choisissant la politique et en cliquant sur iAjouter/i.
 
 #: 
../extensions/cookie-permissions/cookie-permission-manager-preferences-window.c:705
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:489
@@ -3072,7 +3072,7 @@ msgstr Interroger pour une politique inconnue
 msgid 
 If true this extension ask for policy for every unknown domain.If false this 
 extension uses the global cookie policy set in midori settings.
-msgstr Si vrai cette extension demande la politique pour chaque domaine 
inconnue. Si  faux cette extension utilise la politique cookies globale  
définie dans les paramètres midori.
+msgstr Si vrai cette extension demande la politique pour chaque domaine 
inconnu. Si  faux cette extension utilise la politique cookie globale  définie 
dans les paramètres midori.
 
 #: ../extensions/cookie-permissions/cookie-permission-manager.c:983
 msgid Undetermined
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Handle br in NS plugin descriptions as \n

[Christian Dywan]

Updating branch refs/heads/master
 to 321f75980abedfe0be33ffd103ca2746c721a6a0 (commit)
   from 4b197b6b4d2797098c66bb09f5828021cfe2937e (commit)

commit 321f75980abedfe0be33ffd103ca2746c721a6a0
Author: Paweł Forysiuk tuxa...@o2.pl
Date:   Wed Feb 20 22:07:50 2013 +0100

Handle br in NS plugin descriptions as \n

 extensions/nsplugin-manager.vala |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/extensions/nsplugin-manager.vala b/extensions/nsplugin-manager.vala
index c270c54..1bcb929 100644
--- a/extensions/nsplugin-manager.vala
+++ b/extensions/nsplugin-manager.vala
@@ -34,6 +34,7 @@ namespace NSPlugins {
 try {
 var regex = new Regex (a.+href.+(.+)/a);
 desc = regex.replace (desc, -1, 0, u\\1/u);
+desc = desc.replace (br, \n);
 }
 catch (Error error) { }
 GLib.Object (stock_id: Midori.Stock.PLUGINS,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master List versions from about:version in --version

[Christian Dywan]

Updating branch refs/heads/master
 to 5c6d70db33a1c5eaabfae6399cff8dd0e2b1d113 (commit)
   from 321f75980abedfe0be33ffd103ca2746c721a6a0 (commit)

commit 5c6d70db33a1c5eaabfae6399cff8dd0e2b1d113
Author: Christian Dywan christ...@twotoasts.de
Date:   Thu Feb 21 00:36:45 2013 +0100

List versions from about:version in --version

 midori/main.c|7 ++-
 midori/midori-view.c |  117 +-
 midori/midori-view.h |4 ++
 3 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 8a7d5e6..9037abd 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -141,14 +141,17 @@ main (intargc,
 
 if (version)
 {
+GString* versions = g_string_new ();
+midori_view_list_versions (versions, FALSE);
+g_print (%s\n, versions-str);
+g_string_free (versions, TRUE);
+
 g_print (
-  %s %s\n\n
   Copyright (c) 2007-2012 Christian Dywan\n\n
   %s\n
   \t%s\n\n
   %s\n
   \thttp://www.midori-browser.org\n;,
-  _(Midori), PACKAGE_VERSION,
   _(Please report comments, suggestions and bugs to:),
   PACKAGE_BUGREPORT,
   _(Check for new versions at:)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 4de318e..6aae10b 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3678,6 +3678,47 @@ midori_view_constructor (GType  type,
 }
 
 static void
+midori_view_add_version (GString* markup,
+ gboolean html,
+ gchar*   text)
+{
+if (html)
+g_string_append (markup, trtd);
+g_string_append (markup, text);
+if (html)
+g_string_append (markup, /td/tr);
+else
+g_string_append_c (markup, '\n');
+g_free (text);
+}
+
+void
+midori_view_list_versions (GString* markup,
+   gboolean html)
+{
+midori_view_add_version (markup, html, g_strdup_printf (%s %s (%s),
+_(Midori), PACKAGE_VERSION, midori_app_get_name (NULL)));
+midori_view_add_version (markup, html, g_strdup_printf (GTK+ %s 
(%u.%u.%u)\tGlib %s (%u.%u.%u),
+GTK_VERSION, gtk_major_version, gtk_minor_version, gtk_micro_version,
+GIO_VERSION, glib_major_version, glib_minor_version, 
glib_micro_version));
+midori_view_add_version (markup, html, g_strdup_printf (WebKitGTK+ %s 
(%u.%u.%u)\tlibSoup %s,
+WEBKIT_VERSION, webkit_major_version (), webkit_minor_version (), 
webkit_micro_version (),
+LIBSOUP_VERSION));
+midori_view_add_version (markup, html, g_strdup_printf (cairo %s 
(%s)\tlibnotify %s,
+CAIRO_VERSION_STRING, cairo_version_string (),
+LIBNOTIFY_VERSION));
+midori_view_add_version (markup, html, g_strdup_printf (gcr %s\tgranite 
%s,
+GCR_VERSION, GRANITE_VERSION));
+midori_view_add_version (markup, html, g_strdup_printf (single instance 
%s,
+#if HAVE_UNIQUE
+libunique  UNIQUE_VERSION
+#else
+Sockets
+#endif
+));
+}
+
+static void
 list_netscape_plugins (GString* ns_plugins,
JSContextRef js_context)
 {
@@ -3964,39 +4005,7 @@ midori_view_set_uri (MidoriView*  view,
 gchar* ident = katze_object_get_string (view-settings, 
user-agent);
 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);
-gchar* video_formats = list_video_formats (js_context);
-
-/* FIXME: This is for workarounding a crash deeper down the 
callstack on some systems. */
-static char const * const version_format_strings[] = {
- nbsp; libsoup %s/td/tr,
-trtdcairo/tdtd%s , (%s)/td/tr,
-trtdgcr/tdtd%s/td/tr,
-trtdgranite/tdtd%s/td/tr,
-trtdlibnotify/tdtd%s/td/tr,
-trtdsingle instance/tdtd%s/td/tr,
-trtdPlatform/tdtd%s , %s , %s/td/tr,
-trtdIdentification/tdtdcode%s/code/td/tr,
-trtdVideonbsp;Formats/tdtd%s/td/tr,
-};
-gchar const* version_strings[] = {
-LIBSOUP_VERSION,
-CAIRO_VERSION_STRING, cairo_version_string (),
-GCR_VERSION,
-GRANITE_VERSION,
-LIBNOTIFY_VERSION,
-#if HAVE_UNIQUE
-libunique  UNIQUE_VERSION,
-#else
-Sockets,
-#endif
-platform, sys_name, architecture ? architecture : , 
ident,
-video_formats,
-};
-gsize i = 0;
 GString * tmp = g_string_new ();
-

[Xfce4-commits] parole:master Cleanup compiler warnings, add logging to parole-screensaver.

[Sean Davis]

Updating branch refs/heads/master
 to d07986b982549509531bb09f76a61f2a02061304 (commit)
   from ad0fd21c0299ae463c50a73ab135566ba78806a4 (commit)

commit d07986b982549509531bb09f76a61f2a02061304
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Feb 20 20:12:57 2013 -0500

Cleanup compiler warnings, add logging to parole-screensaver.

 src/common/Makefile.am  |8 ++--
 src/common/parole-screensaver.c |   13 +++--
 src/parole-player.c |4 
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index fe06330..af39af2 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -16,5 +16,9 @@ libparolescreensaver_la_SOURCES = \
parole-screensaver.c\
parole-screensaver.h
 
-libparolescreensaver_la_CFLAGS =   \
-   $(GTK_CFLAGS)
\ No newline at end of file
+libparolescreensaver_la_CFLAGS =   \
+   $(GTK_CFLAGS)   \
+   $(LIBXFCE4UTIL_CFLAGS)
+
+libparolescreensaver_la_LIBADD =   \
+   $(LIBXFCE4UTIL_LIBS)
diff --git a/src/common/parole-screensaver.c b/src/common/parole-screensaver.c
index edfe455..95496ce 100644
--- a/src/common/parole-screensaver.c
+++ b/src/common/parole-screensaver.c
@@ -30,6 +30,9 @@
 
 #include gdk/gdkx.h
 
+#include libxfce4util/libxfce4util.h
+
+#include src/misc/parole-debug.h
 #include parole-screensaver.h
 
 #define RESET_SCREENSAVER_TIMEOUT  6
@@ -72,11 +75,14 @@ parole_screen_saver_new (void)
 void parole_screen_saver_inhibit (ParoleScreenSaver *saver, GtkWindow *window)
 {
 gchar *cmd;
+gint returncode;
 
 g_return_if_fail (PAROLE_IS_SCREENSAVER (saver));
 
 cmd = g_strdup_printf(xdg-screensaver suspend %lu, GDK_DRAWABLE_XID 
(gtk_widget_get_window (GTK_WIDGET (window;
-system(cmd);
+returncode = system(cmd);
+
+TRACE(\'xdg-screensaver suspend\' returned %i, returncode);
 
 g_free(cmd);
 }
@@ -84,11 +90,14 @@ void parole_screen_saver_inhibit (ParoleScreenSaver *saver, 
GtkWindow *window)
 void parole_screen_saver_uninhibit (ParoleScreenSaver *saver, GtkWindow 
*window)
 {
 gchar *cmd;
+gint returncode;
 
 g_return_if_fail (PAROLE_IS_SCREENSAVER (saver));
 
 cmd = g_strdup_printf(xdg-screensaver resume %lu, GDK_DRAWABLE_XID 
(gtk_widget_get_window (GTK_WIDGET (window;
-system(cmd);
+returncode = system(cmd);
+
+TRACE(\'xdg-screensaver resume\' returned %i, returncode);
 
 g_free(cmd);
 }
diff --git a/src/parole-player.c b/src/parole-player.c
index f5e5762..898e05d 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -147,6 +147,10 @@ void   parole_player_seekb_cb 
(GtkWidget *widget, ParolePlayer *player, gdouble
 gbooleanparole_player_scroll_event_cb  (GtkWidget *widget,
 GdkEventScroll *ev,
 ParolePlayer *player);
+
+gbooleanparole_player_window_state_event (GtkWidget *widget,
+GdkEventWindowState *event,
+ParolePlayer *player);
 
 void   parole_player_leave_fs_cb   (GtkButton *button,
 ParolePlayer *player);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Add --debug/ -g switch to run Midori in gdb

[Christian Dywan]

Updating branch refs/heads/master
 to f94fb69664749d3ae463dd0dfc2a4745fd8a69e3 (commit)
   from 5c6d70db33a1c5eaabfae6399cff8dd0e2b1d113 (commit)

commit f94fb69664749d3ae463dd0dfc2a4745fd8a69e3
Author: Christian Dywan christ...@twotoasts.de
Date:   Thu Feb 21 02:08:03 2013 +0100

Add --debug/ -g switch to run Midori in gdb

 extensions/addons.c |2 +-
 katze/midori-paths.vala |8 +---
 midori/main.c   |   17 +
 midori/midori-browser.c |6 +++---
 midori/midori-view.c|2 +-
 midori/sokoke.c |   20 ++--
 midori/sokoke.h |3 ++-
 7 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/extensions/addons.c b/extensions/addons.c
index 08c14b1..1ce19c4 100644
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -482,7 +482,7 @@ addons_open_in_editor_clicked_cb (GtkWidget* toolitem,
 
 g_object_get (settings, text-editor, text_editor, NULL);
 if (text_editor  *text_editor)
-sokoke_spawn_program (text_editor, TRUE, element-fullpath, TRUE);
+sokoke_spawn_program (text_editor, TRUE, element-fullpath, TRUE, 
FALSE);
 else
 {
 gchar* element_uri = g_filename_to_uri (element-fullpath, NULL, 
NULL);
diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index 50de349..05d2b05 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -276,7 +276,7 @@ namespace Midori {
 #endif
 if (strcmp (Environment.get_variable (MIDORI_DEBUG), paths) == 
0) {
 stdout.printf (command_line: %s\nexec_path: %s\nres: %s\nlib: 
%s\n,
-   get_command_line_str (), exec_path,
+   get_command_line_str (true), exec_path,
get_res_filename (), get_lib_path 
(PACKAGE_NAME));
 }
 }
@@ -286,9 +286,11 @@ namespace Midori {
 return command_line;
 }
 
-public static string get_command_line_str () {
+public static string get_command_line_str (bool for_display) {
 assert (command_line != null);
-return string.joinv ( , command_line).replace 
(Environment.get_home_dir (), ~);
+if (for_display)
+return string.joinv ( , command_line).replace 
(Environment.get_home_dir (), ~);
+return string.joinv ( , command_line).replace (--debug, 
).replace (-g, );
 }
 
 public static string get_lib_path (string package) {
diff --git a/midori/main.c b/midori/main.c
index 9037abd..9c5463f 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -73,6 +73,7 @@ main (intargc,
 gboolean portable;
 gboolean plain;
 gboolean diagnostic_dialog = FALSE;
+gboolean debug = FALSE;
 gboolean run;
 gchar* snapshot;
 gboolean execute;
@@ -97,6 +98,8 @@ main (intargc,
N_(Plain GTK+ window with WebKit, akin to GtkLauncher), NULL },
{ diagnostic-dialog, 'd', 0, G_OPTION_ARG_NONE, diagnostic_dialog,
N_(Show a diagnostic dialog), NULL },
+   { debug, 'g', 0, G_OPTION_ARG_NONE, debug,
+   N_(Run within gdb and save a backtrace on crash), NULL },
{ run, 'r', 0, G_OPTION_ARG_NONE, run,
N_(Run the specified filename as javascript), NULL },
{ snapshot, 's', 0, G_OPTION_ARG_STRING, snapshot,
@@ -135,6 +138,20 @@ main (intargc,
 inactivity_reset = 0;
 midori_app_setup (argc, argv, entries);
 
+if (debug)
+{
+gchar* args = midori_paths_get_command_line_str (FALSE);
+gchar* cmd = g_strdup_printf (
+--batch -ex 'set print thread-events off' -ex run 
+-ex bt -ex 'set logging on %s' --return-child-result 
+--args %s,
+/tmp/midori-gdb.bt, args);
+sokoke_spawn_program (gdb, TRUE, cmd, FALSE, TRUE);
+g_free (cmd);
+g_free (args);
+return 0;
+}
+
 g_set_application_name (_(Midori));
 /* Versioned prgname to override menuproxy blacklist */
 g_set_prgname (PACKAGE_NAME 4);
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 6580533..cc30ae4 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2450,9 +2450,9 @@ midori_browser_subscribe_to_news_feed (MidoriBrowser* 
browser,
 /* Special-case Liferea because a helper script may be required */
 if (g_str_equal (browser-news_aggregator, liferea)
   g_find_program_in_path (liferea-add-feed))
-sokoke_spawn_program (liferea-add-feed, FALSE, feed, TRUE);
+sokoke_spawn_program (liferea-add-feed, FALSE, feed, TRUE, 
FALSE);
 else
-sokoke_spawn_program (browser-news_aggregator, TRUE, feed, TRUE);
+sokoke_spawn_program (browser-news_aggregator, TRUE, feed, TRUE, 
FALSE);
 g_free (feed);
 }
 else
@@ -3397,7 +3397,7 @@ _action_source_view_activate (GtkAction* action,
 }
 

[Xfce4-commits] parole:master Named fullscreen window

[Sean Davis]

Updating branch refs/heads/master
 to cd9401d9499267f6a8f64ea789918681023c4e7d (commit)
   from d07986b982549509531bb09f76a61f2a02061304 (commit)

commit cd9401d9499267f6a8f64ea789918681023c4e7d
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Feb 20 20:17:51 2013 -0500

Named fullscreen window

 src/parole-player.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 898e05d..f71581f 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3130,6 +3130,7 @@ parole_player_init (ParolePlayer *player)
 parole_media_list_set_shuffle_toggled(player-priv-list, shuffle);

 player-priv-fs_window = gtk_window_new (GTK_WINDOW_POPUP);
+gtk_widget_set_name(GTK_WIDGET(player-priv-fs_window), 
ParoleFullscreen);
 
 gtk_window_set_gravity (GTK_WINDOW (player-priv-fs_window), 
GDK_GRAVITY_SOUTH_WEST);
 gtk_window_set_position (GTK_WINDOW (player-priv-fs_window), 
GTK_WIN_POS_NONE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Make fullscreen controls transparent.

[Sean Davis]

Updating branch refs/heads/master
 to bb0cd4eb4389a446f49644cdbacb844554ced8a8 (commit)
   from cd9401d9499267f6a8f64ea789918681023c4e7d (commit)

commit bb0cd4eb4389a446f49644cdbacb844554ced8a8
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Feb 20 21:11:11 2013 -0500

Make fullscreen controls transparent.

 src/parole-player.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index f71581f..c7db6c7 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3132,6 +3132,7 @@ parole_player_init (ParolePlayer *player)
 player-priv-fs_window = gtk_window_new (GTK_WINDOW_POPUP);
 gtk_widget_set_name(GTK_WIDGET(player-priv-fs_window), 
ParoleFullscreen);
 
+gtk_window_set_opacity( GTK_WINDOW(player-priv-fs_window), 0.80 );
 gtk_window_set_gravity (GTK_WINDOW (player-priv-fs_window), 
GDK_GRAVITY_SOUTH_WEST);
 gtk_window_set_position (GTK_WINDOW (player-priv-fs_window), 
GTK_WIN_POS_NONE);
   
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Move history and playlist to .config/xfce4/parole

[Sean Davis]

Updating branch refs/heads/master
 to 4efdfe72d0d5836ca420e0fd079d75246f2529ac (commit)
   from bb0cd4eb4389a446f49644cdbacb844554ced8a8 (commit)

commit 4efdfe72d0d5836ca420e0fd079d75246f2529ac
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Feb 20 21:12:09 2013 -0500

Move history and playlist to .config/xfce4/parole

 src/common/parole-rc-utils.h |2 +-
 src/parole-medialist.c   |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/parole-rc-utils.h b/src/common/parole-rc-utils.h
index fd7c623..51fd572 100644
--- a/src/common/parole-rc-utils.h
+++ b/src/common/parole-rc-utils.h
@@ -24,7 +24,7 @@
 #include libxfce4util/libxfce4util.h
 
 #define PAROLE_RESOURCE_FILE   xfce4/src/misc/parole-media-player.rc
-#define PAROLE_HISTORY_FILExfce4/src/misc/history
+#define PAROLE_HISTORY_FILExfce4/parole/history
 
 #define PAROLE_RC_GROUP_GENERALGeneral
 #define PAROLE_RC_GROUP_PLUGINSPlugins
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index fb2f8b7..227b2f9 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -55,7 +55,7 @@
 
 #include common/parole-common.h
 
-#define PAROLE_AUTO_SAVED_PLAYLIST xfce4/src/misc/auto-saved-playlist.m3u
+#define PAROLE_AUTO_SAVED_PLAYLIST xfce4/parole/auto-saved-playlist.m3u
 
 typedef struct
 {
@@ -1739,7 +1739,7 @@ void parole_media_list_load (ParoleMediaList *list)
 {
gchar *playlist_file;

-   playlist_file = xfce_resource_save_location (XFCE_RESOURCE_DATA, 
+   playlist_file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, 
 
PAROLE_AUTO_SAVED_PLAYLIST, 
 FALSE);
if ( playlist_file )
@@ -2112,7 +2112,7 @@ void parole_media_list_save_list (ParoleMediaList *list)
GSList *fileslist;
gchar *history;
 
-   history = xfce_resource_save_location (XFCE_RESOURCE_DATA, 
PAROLE_AUTO_SAVED_PLAYLIST , TRUE);
+   history = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, 
PAROLE_AUTO_SAVED_PLAYLIST , TRUE);

if ( !history )
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Set transparency to 70%

[Sean Davis]

Updating branch refs/heads/master
 to 948ee77c4fa5f307f21d842002afed3a601bc763 (commit)
   from 4efdfe72d0d5836ca420e0fd079d75246f2529ac (commit)

commit 948ee77c4fa5f307f21d842002afed3a601bc763
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Feb 20 21:15:53 2013 -0500

Set transparency to 70%

 src/parole-player.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index c7db6c7..227060e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3132,7 +3132,7 @@ parole_player_init (ParolePlayer *player)
 player-priv-fs_window = gtk_window_new (GTK_WINDOW_POPUP);
 gtk_widget_set_name(GTK_WIDGET(player-priv-fs_window), 
ParoleFullscreen);
 
-gtk_window_set_opacity( GTK_WINDOW(player-priv-fs_window), 0.80 );
+gtk_window_set_opacity( GTK_WINDOW(player-priv-fs_window), 0.70 );
 gtk_window_set_gravity (GTK_WINDOW (player-priv-fs_window), 
GDK_GRAVITY_SOUTH_WEST);
 gtk_window_set_position (GTK_WINDOW (player-priv-fs_window), 
GTK_WIN_POS_NONE);
   
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Named widget ParoleRange

[Sean Davis]

Updating branch refs/heads/master
 to c9ad16ffedc102deb60547cf4e7e9fb0281a7f8e (commit)
   from 948ee77c4fa5f307f21d842002afed3a601bc763 (commit)

commit c9ad16ffedc102deb60547cf4e7e9fb0281a7f8e
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Feb 20 21:18:08 2013 -0500

Named widget ParoleRange

 src/parole-player.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 227060e..95039e4 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2968,6 +2968,7 @@ parole_player_init (ParolePlayer *player)
 player-priv-seekb = GTK_WIDGET (gtk_builder_get_object (builder, 
back));
  
 player-priv-range = GTK_WIDGET (gtk_builder_get_object (builder, 
scale));
+gtk_widget_set_name( player-priv-range, ParoleScale );
 
 player-priv-volume = GTK_WIDGET (gtk_builder_get_object (builder, 
volume));
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Ship fancy fullscreen gtkrc

[Sean Davis]

Updating branch refs/heads/master
 to 13621798dfb0931f500aa5e5fec6ba5dfe4ced29 (commit)
   from c9ad16ffedc102deb60547cf4e7e9fb0281a7f8e (commit)

commit 13621798dfb0931f500aa5e5fec6ba5dfe4ced29
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Feb 20 23:49:22 2013 -0500

Ship fancy fullscreen gtkrc

 configure.ac.in   |   14 ++
 data/Makefile.am  |1 +
 data/gtk-2.0/Makefile.am  |7 +++
 data/gtk-2.0/parole.gtkrc |   18 ++
 src/parole-player.c   |8 
 5 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index ae8daf4..76a32db 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -144,6 +144,19 @@ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
 
 XDT_CHECK_LIBX11()
 
+#===#
+#  Gtkrc  files#
+#===#
+if test x${prefix} = xNONE; then
+  AC_DEFINE_UNQUOTED(GTKRC_DIR, 
${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0, [gtkrc directory])
+  gtkrcdir=${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0
+else
+  AC_DEFINE_UNQUOTED(GTKRC_DIR, ${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0, 
[pixmaps directory])
+  gtkrcdir=${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0
+fi
+
+AC_SUBST(gtkrcdir)
+
 # Taken from Gnome system tools
 #===#
 #  Pixmaps  files  #
@@ -241,6 +254,7 @@ GTK_DOC_CHECK(1.9)
 AC_OUTPUT([
 Makefile
 data/Makefile
+data/gtk-2.0/Makefile
 data/pixmaps/Makefile
 data/interfaces/Makefile
 data/icons/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 6b0d93e..4a0719d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS =  \
+   gtk-2.0 \
interfaces  \
pixmaps \
icons   \
diff --git a/data/gtk-2.0/Makefile.am b/data/gtk-2.0/Makefile.am
new file mode 100644
index 000..ce7ad47
--- /dev/null
+++ b/data/gtk-2.0/Makefile.am
@@ -0,0 +1,7 @@
+EXTRA_DIST =   \
+   $(gtkrc_DATA)
+
+gtkrcdir = $(datadir)/parole/gtk-2.0
+
+gtkrc_DATA =   \
+   parole.gtkrc
diff --git a/data/gtk-2.0/parole.gtkrc b/data/gtk-2.0/parole.gtkrc
new file mode 100644
index 000..b227904
--- /dev/null
+++ b/data/gtk-2.0/parole.gtkrc
@@ -0,0 +1,18 @@
+style parole-fullscreen
+{
+   fg[NORMAL]  = #FF
+
+   bg[NORMAL]  = #00
+   bg[ACTIVE]  = #6D6D6D
+   bg[PRELIGHT]= #505050
+   bg[SELECTED]= #398EE7
+   bg[INSENSITIVE] = #C4C4C4
+}
+
+style parole-scale = parole-fullscreen
+{
+   bg[NORMAL]  = #CECECE
+}
+
+widget *ParoleFullscreen*style parole-fullscreen
+widget *ParoleFullscreen*ParoleScale*style parole-scale
\ No newline at end of file
diff --git a/src/parole-player.c b/src/parole-player.c
index 95039e4..24fb62d 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -70,6 +70,12 @@
 
 #include common/parole-common.h
 
+#define RC_STYLE \
+  include \ GTKRC_DIR /parole.gtkrc\
+  
+#define RC_STYLE_FILE \
+  GTKRC_DIR /parole.gtkrc
+
 int GTK_ICON_SIZE_ARTWORK_FALLBACK;
 
 static void
@@ -2966,6 +2972,8 @@ parole_player_init (ParolePlayer *player)
 player-priv-play_pause = GTK_WIDGET (gtk_builder_get_object (builder, 
play-pause));
 player-priv-seekf = GTK_WIDGET (gtk_builder_get_object (builder, 
forward));
 player-priv-seekb = GTK_WIDGET (gtk_builder_get_object (builder, 
back));
+
+gtk_rc_parse( RC_STYLE_FILE );
  
 player-priv-range = GTK_WIDGET (gtk_builder_get_object (builder, 
scale));
 gtk_widget_set_name( player-priv-range, ParoleScale );
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits