[Xfce4-commits] garcon:master l10n: AddedPortuguese language
Updating branch refs/heads/master
to b89fec176eea886e25d2510f571c33f1e5a77c69 (commit)
from b58126c9434f91b8fd39a7ec1491ef327cbb3873 (commit)
commit b89fec176eea886e25d2510f571c33f1e5a77c69
Author: Sergio Marques smarque...@gmail.com
Date: Wed Feb 24 12:56:58 2010 +0100
l10n: AddedPortuguese language
New status: 2 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{pt_PT.po = pt.po} |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/po/pt_PT.po b/po/pt.po
similarity index 92%
copy from po/pt_PT.po
copy to po/pt.po
index fdca219..4a030fa 100644
--- a/po/pt_PT.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@
msgid
msgstr
Project-Id-Version: garcon\n
-Report-Msgid-Bugs-To: http://bugzilla.xfce.org\n;
-POT-Creation-Date: 2010-01-06 10:39+\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2010-02-24 11:56+0100\n
PO-Revision-Date: 2010-01-06 13:38-\n
Last-Translator: Sergio Marques smarque...@gmail.com\n
Language-Team: \n
@@ -31,6 +31,6 @@ msgstr Impossível carregar os dados do menu a partir de %s
#, fuzzy
#~ msgid Failed to locate the system menu
#~ msgstr Falha ao localizar o menu principal de aplicações
+
#~ msgid Failed to create the libxfce4menu item cache in %s.
#~ msgstr Falha ao criar o item libxfce4menu de cache em %s
-
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:devel Link to -lm.
Updating branch refs/heads/devel to 774809efbb8cfa9fa55649bebe663ef6fc9d2ac1 (commit) from 308d269b73be0a1e028d3e2615aaf79b27099abc (commit) commit 774809efbb8cfa9fa55649bebe663ef6fc9d2ac1 Author: Nick Schermer n...@xfce.org Date: Wed Feb 24 12:45:39 2010 +0100 Link to -lm. libxfce4panel/Makefile.am |3 ++- panel/Makefile.am |3 ++- plugins/clock/Makefile.am |3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am index 4e12699..5deed3e 100644 --- a/libxfce4panel/Makefile.am +++ b/libxfce4panel/Makefile.am @@ -64,7 +64,8 @@ libxfce4panel_1_0_la_LDFLAGS = \ libxfce4panel_1_0_la_LIBADD = \ $(GTK_LIBS) \ - $(LIBXFCE4UTIL_LIBS) + $(LIBXFCE4UTIL_LIBS) \ + -lm # # Pkg-config file diff --git a/panel/Makefile.am b/panel/Makefile.am index d642f6c..28ee69f 100644 --- a/panel/Makefile.am +++ b/panel/Makefile.am @@ -71,7 +71,8 @@ xfce4_panel_LDADD = \ $(LIBXFCE4UTIL_LIBS) \ $(LIBXFCE4UI_LIBS) \ $(XFCONF_LIBS) \ - $(DBUS_LIBS) + $(DBUS_LIBS) \ + -lm xfce4_panel_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \ diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am index 0d1d1ac..acf364b 100644 --- a/plugins/clock/Makefile.am +++ b/plugins/clock/Makefile.am @@ -51,7 +51,8 @@ libclock_la_LIBADD = \ $(LIBXFCE4UTIL_LIBS) \ $(LIBXFCE4UI_LIBS) \ $(EXO_LIBS) \ - $(XFCONF_LIBS) + $(XFCONF_LIBS) \ + -lm libclock_la_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:devel Hide workspace button if command is not found.
Updating branch refs/heads/devel
to b1330109880bb470ec85892031a94779f249f61c (commit)
from 774809efbb8cfa9fa55649bebe663ef6fc9d2ac1 (commit)
commit b1330109880bb470ec85892031a94779f249f61c
Author: Nick Schermer n...@xfce.org
Date: Wed Feb 24 12:56:00 2010 +0100
Hide workspace button if command is not found.
Also fix some alignments in the glade file.
plugins/pager/pager-dialog.glade | 10 +++---
plugins/pager/pager.c| 16 +++-
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/plugins/pager/pager-dialog.glade b/plugins/pager/pager-dialog.glade
index 9dc1510..3092d12 100644
--- a/plugins/pager/pager-dialog.glade
+++ b/plugins/pager/pager-dialog.glade
@@ -22,19 +22,16 @@
child
object class=GtkFrame id=frame2
property name=visibleTrue/property
-property name=border_width6/property
property name=label_xalign0/property
property name=shadow_typenone/property
child
object class=GtkAlignment id=alignment2
property name=visibleTrue/property
-property name=top_padding6/property
-property name=bottom_padding12/property
-property name=left_padding18/property
-property name=right_padding6/property
+property name=left_padding12/property
child
object class=GtkVBox id=vbox4
property name=visibleTrue/property
+property name=border_width6/property
property name=orientationvertical/property
property name=spacing6/property
child
@@ -127,14 +124,13 @@
child
object class=GtkFrame id=frame3
property name=visibleTrue/property
-property name=border_width6/property
property name=label_xalign0/property
property name=shadow_typenone/property
child
object class=GtkAlignment id=alignment3
property name=visibleTrue/property
property name=top_padding6/property
-property name=bottom_padding12/property
+property name=bottom_padding6/property
property name=left_padding18/property
property name=right_padding6/property
child
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index ddd8751..b2b8163 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -36,6 +36,10 @@
+#define WORKSPACE_SETTINGS_COMMAND xfwm4-workspace-settings
+
+
+
static void pager_plugin_get_property (GObject
*object,
guint
prop_id,
GValue
*value,
@@ -396,7 +400,7 @@ pager_plugin_configure_workspace_settings (GtkWidget
*button)
screen = gdk_screen_get_default ();
/* try to start the settings dialog */
- if (!gdk_spawn_command_line_on_screen (screen, xfwm4-workspace-settings,
error))
+ if (!gdk_spawn_command_line_on_screen (screen, WORKSPACE_SETTINGS_COMMAND,
error))
{
/* show an error dialog */
toplevel = gtk_widget_get_toplevel (button);
@@ -452,6 +456,7 @@ pager_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin)
PagerPlugin *plugin = XFCE_PAGER_PLUGIN (panel_plugin);
GtkBuilder *builder;
GObject *dialog, *object;
+ gchar *path;
panel_return_if_fail (XFCE_IS_PAGER_PLUGIN (plugin));
@@ -470,18 +475,27 @@ pager_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin)
g_object_weak_ref (G_OBJECT (builder), pager_plugin_configure_destroyed,
plugin);
object = gtk_builder_get_object (builder, settings-button);
+ panel_return_if_fail (GTK_IS_BUTTON (object));
g_signal_connect (G_OBJECT (object), clicked,
G_CALLBACK (pager_plugin_configure_workspace_settings), dialog);
+ /* don't show button if xfwm4 is not installed */
+ path = g_find_program_in_path (WORKSPACE_SETTINGS_COMMAND);
+ g_object_set (G_OBJECT (object), visible, path != NULL, NULL);
+ g_free (path);
+
object = gtk_builder_get_object (builder, workspace-scrolling);
+ panel_return_if_fail (GTK_IS_TOGGLE_BUTTON (object));
exo_mutual_binding_new (G_OBJECT (plugin), workspace-scrolling,
G_OBJECT (object), active);
object = gtk_builder_get_object (builder, show-names);
+ panel_return_if_fail (GTK_IS_TOGGLE_BUTTON (object));
exo_mutual_binding_new (G_OBJECT (plugin), show-names,
G_OBJECT (object), active);
object = gtk_builder_get_object (builder, rows);
+ panel_return_if_fail (GTK_IS_ADJUSTMENT (object));
[Xfce4-commits] xfce4-panel:devel Avoid ending with a # in the help uri.
Updating branch refs/heads/devel to 308d269b73be0a1e028d3e2615aaf79b27099abc (commit) from 983aa845a1b949b80b2804df88fe2196953be542 (commit) commit 308d269b73be0a1e028d3e2615aaf79b27099abc Author: Nick Schermer n...@xfce.org Date: Tue Feb 23 21:23:43 2010 +0100 Avoid ending with a # in the help uri. common/panel-utils.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/panel-utils.c b/common/panel-utils.c index 6c95805..9e4f883 100644 --- a/common/panel-utils.c +++ b/common/panel-utils.c @@ -151,7 +151,7 @@ panel_utils_show_help (GtkWindow *parent, } if (G_LIKELY (exists)) -uri = g_strconcat (file://, filename, #, offset, NULL); +uri = g_strconcat (file://, filename, offset != NULL ? # : NULL, offset, NULL); else if (xfce_dialog_confirm (parent, web-browser, _(_Read Online), _(You can read the user manual online. This manual may however not exactly match your panel version.), ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:devel Fix some other paddings in glade files.
Updating branch refs/heads/devel to fe019a3279b8faaa20c9b98fc952a965e026d7cd (commit) from b1330109880bb470ec85892031a94779f249f61c (commit) commit fe019a3279b8faaa20c9b98fc952a965e026d7cd Author: Nick Schermer n...@xfce.org Date: Wed Feb 24 13:00:10 2010 +0100 Fix some other paddings in glade files. panel/panel-preferences-dialog.glade |8 +++- .../applicationsmenu/applicationsmenu-dialog.glade |1 - plugins/clock/clock-dialog.glade |1 - plugins/separator/separator-dialog.glade |6 ++ plugins/systray/systray-dialog.glade |1 - 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade index 59e1db6..65caa61 100644 --- a/panel/panel-preferences-dialog.glade +++ b/panel/panel-preferences-dialog.glade @@ -129,7 +129,6 @@ child object class=GtkAlignment id=alignment1 property name=visibleTrue/property -property name=bottom_padding6/property property name=left_padding12/property child object class=GtkVBox id=vbox3 @@ -393,7 +392,6 @@ child object class=GtkAlignment id=alignment3 property name=visibleTrue/property -property name=bottom_padding6/property property name=left_padding12/property child object class=GtkHBox id=hbox2 @@ -811,15 +809,15 @@ /object object class=GtkSizeGroup id=composing-sizegroup widgets - widget name=label7/ - widget name=label9/ widget name=label10/ + widget name=label9/ + widget name=label7/ /widgets /object object class=GtkSizeGroup id=display-sizegroup widgets - widget name=label1/ widget name=label13/ + widget name=label1/ /widgets /object /interface diff --git a/plugins/applicationsmenu/applicationsmenu-dialog.glade b/plugins/applicationsmenu/applicationsmenu-dialog.glade index 052f926..4cfd02d 100644 --- a/plugins/applicationsmenu/applicationsmenu-dialog.glade +++ b/plugins/applicationsmenu/applicationsmenu-dialog.glade @@ -27,7 +27,6 @@ child object class=GtkAlignment id=alignment3 property name=visibleTrue/property -property name=bottom_padding6/property property name=left_padding12/property child object class=GtkTable id=table1 diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade index b3451eb..3bed302 100644 --- a/plugins/clock/clock-dialog.glade +++ b/plugins/clock/clock-dialog.glade @@ -27,7 +27,6 @@ child object class=GtkAlignment id=alignment3 property name=visibleTrue/property -property name=bottom_padding6/property property name=left_padding12/property child object class=GtkTable id=table2 diff --git a/plugins/separator/separator-dialog.glade b/plugins/separator/separator-dialog.glade index ad19aff..53d5c5e 100644 --- a/plugins/separator/separator-dialog.glade +++ b/plugins/separator/separator-dialog.glade @@ -22,13 +22,11 @@ child object class=GtkAlignment id=alignment1 property name=visibleTrue/property -property name=top_padding6/property -property name=bottom_padding12/property -property name=left_padding18/property -property name=right_padding6/property +property name=left_padding12/property child object class=GtkVBox id=vbox3 property name=visibleTrue/property +property name=border_width6/property property name=orientationvertical/property property name=spacing6/property child diff --git a/plugins/systray/systray-dialog.glade b/plugins/systray/systray-dialog.glade index 851f4c3..8aa42d1 100644 --- a/plugins/systray/systray-dialog.glade +++ b/plugins/systray/systray-dialog.glade @@ -41,7 +41,6 @@ child object class=GtkAlignment id=alignment3 property name=visibleTrue/property -property name=bottom_padding6/property property name=left_padding12/property child object class=GtkVBox id=vbox2 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org
[Xfce4-commits] xfce4-panel:devel l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/devel to 711e7b39dc5fc2d24c194505d8f7b9789997ac3f (commit) from fe019a3279b8faaa20c9b98fc952a965e026d7cd (commit) commit 711e7b39dc5fc2d24c194505d8f7b9789997ac3f Author: Sergio Marques smarque...@gmail.com Date: Wed Feb 24 13:14:46 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 318 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 241 +++--- 1 files changed, 137 insertions(+), 104 deletions(-) diff --git a/po/pt.po b/po/pt.po index 9dae0de..5b81e61 100644 --- a/po/pt.po +++ b/po/pt.po @@ -8,8 +8,8 @@ msgid msgstr Project-Id-Version: xfce4-panel-devel\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-02-23 12:00+0100\n -PO-Revision-Date: 2010-02-23 14:11-\n +POT-Creation-Date: 2010-02-24 11:54+0100\n +PO-Revision-Date: 2010-02-24 12:14-\n Last-Translator: Sérgio Marques smarque...@gmail.com\n Language-Team: \n MIME-Version: 1.0\n @@ -35,20 +35,20 @@ msgstr Personalizar o Painel Xfce msgid Panel Preferences msgstr Preferências do Painel -#: ../common/panel-builder.c:155 +#: ../common/panel-utils.c:155 msgid _Read Online msgstr _Ler Online -#: ../common/panel-builder.c:156 +#: ../common/panel-utils.c:156 msgid You can read the user manual online. This manual may however not exactly match your panel version. msgstr Pode ler o manual de utilizador online. No entanto, este manual pode não concidir com a sua versão. -#: ../common/panel-builder.c:158 +#: ../common/panel-utils.c:158 msgid The Xfce Panel user manual is not installed on your computer msgstr O manual do Painel XFCE não está instalado no computador #. display an error message to the user -#: ../common/panel-builder.c:171 +#: ../common/panel-utils.c:171 msgid Failed to open the documentation browser msgstr Falha ao abrir o navegador de documentação @@ -65,25 +65,25 @@ msgid If you remove the item from the panel, it is permanently lost. msgstr Se remover este item do painel, será perdido para sempre. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:985 +#: ../libxfce4panel/xfce-panel-plugin.c:999 msgid _Move msgstr _Mover #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1023 -#: ../panel/panel-window.c:2067 +#: ../libxfce4panel/xfce-panel-plugin.c:1037 +#: ../panel/panel-window.c:2076 msgid Add _New Items... msgstr Adicionar _Novos Itens... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1034 -#: ../panel/panel-window.c:2078 +#: ../libxfce4panel/xfce-panel-plugin.c:1048 +#: ../panel/panel-window.c:2087 msgid Panel Pr_eferences... msgstr Preferências do Pain_el... #. restart item -#: ../libxfce4panel/xfce-panel-plugin.c:1058 -#: ../panel/panel-window.c:2101 +#: ../libxfce4panel/xfce-panel-plugin.c:1072 +#: ../panel/panel-window.c:2110 msgid _Restart msgstr _Reiniciar @@ -121,6 +121,9 @@ msgid Quit the running panel instance msgstr Fechar o painel em execução #: ../panel/main.c:81 +#: ../plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh:33 +#: ../plugins/directorymenu/xfce4-popup-directorymenu.sh:33 +#: ../plugins/windowmenu/xfce4-popup-windowmenu.sh:33 msgid Print version information and exit msgstr Imprimir informação de versão e sair @@ -134,59 +137,59 @@ msgstr [ARGUMENTOS...] msgid Type \%s --help\ for usage. msgstr Digite \%s --help\ para utilização. -#: ../panel/main.c:171 +#: ../panel/main.c:175 msgid The Xfce development team. All rights reserved. msgstr A equipa de desenvolvimento Xfce. Todos os direitos reservados. -#: ../panel/main.c:172 +#: ../panel/main.c:176 #, c-format msgid Please report bugs to %s. msgstr Por favor, reporte erros para %s. -#: ../panel/main.c:218 +#: ../panel/main.c:222 msgid There is already a running instance msgstr Já existe uma instância em execução #. spawn ourselfs again -#: ../panel/main.c:258 +#: ../panel/main.c:262 msgid Restarting... msgstr Reiniciando... -#: ../panel/main.c:273 +#: ../panel/main.c:277 msgid Failed to show the preferences dialog msgstr Falha ao mostrar o diálogo de preferências -#: ../panel/main.c:275 +#: ../panel/main.c:279 msgid Failed to show the add new items dialog msgstr Falha ao mostrar o diálogo adicionar novos itens -#: ../panel/main.c:277 +#: ../panel/main.c:281 msgid Failed to save the panel configuration msgstr Falha ao gravar a configuração do painel -#: ../panel/main.c:279 +#: ../panel/main.c:283 msgid Failed to add a plugin to the panel msgstr Falha ao adicionar plugin ao painel -#: ../panel/main.c:281 +#: ../panel/main.c:285 msgid Failed to restart the panel msgstr Falha ao reiniciar o painel -#: ../panel/main.c:283 +#: ../panel/main.c:287 msgid Failed to quit the panel msgstr Falha ao fechar o painel -#: ../panel/main.c:285 +#: ../panel/main.c:289 msgid Failed to send D-Bus message msgstr Falha ao enviar a
[Xfce4-commits] exo:master l10n: Updated Finnish (fi) translation to 100%
Updating branch refs/heads/master to 356d0156b8adcde09152069ab6cd328902f1470b (commit) from f0278d7550893d7b3a37bd814c1bdb7c7ecc4b7e (commit) commit 356d0156b8adcde09152069ab6cd328902f1470b Author: Jari Rahkonen jari.rahko...@pp1.inet.fi Date: Wed Feb 24 12:41:23 2010 +0100 l10n: Updated Finnish (fi) translation to 100% New status: 322 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fi.po | 122 +++--- 1 files changed, 69 insertions(+), 53 deletions(-) diff --git a/po/fi.po b/po/fi.po index 323c99b..8a5908b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,8 +7,8 @@ msgid msgstr Project-Id-Version: exo 0.5.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-01-27 18:00+0100\n -PO-Revision-Date: 2010-01-27 23:12+0200\n +POT-Creation-Date: 2010-02-24 12:01+0100\n +PO-Revision-Date: 2010-02-24 13:39+0200\n Last-Translator: Jari Rahkonen jari.rahko...@pp1.inet.fi\n Language-Team: os-cillation i...@os-cillation.com\n MIME-Version: 1.0\n @@ -137,80 +137,89 @@ msgid Cursor item text color msgstr Osoitinkohteen tekstin väri #. EXO_ICON_CHOOSER_CONTEXT_ACTIONS -#: ../exo/exo-icon-chooser-dialog.c:96 +#: ../exo/exo-icon-chooser-dialog.c:109 msgid Action Icons msgstr Toimintokuvakkeet #. EXO_ICON_CHOOSER_CONTEXT_ANIMATIONS -#: ../exo/exo-icon-chooser-dialog.c:98 +#: ../exo/exo-icon-chooser-dialog.c:111 msgid Animations msgstr Animaatiot #. EXO_ICON_CHOOSER_CONTEXT_APPLICATIONS -#: ../exo/exo-icon-chooser-dialog.c:100 +#: ../exo/exo-icon-chooser-dialog.c:113 msgid Application Icons msgstr Sovelluskuvakkeet #. EXO_ICON_CHOOSER_CONTEXT_CATEGORIES -#: ../exo/exo-icon-chooser-dialog.c:102 +#: ../exo/exo-icon-chooser-dialog.c:115 msgid Menu Icons msgstr Valikkokuvakkeet #. EXO_ICON_CHOOSER_CONTEXT_DEVICES -#: ../exo/exo-icon-chooser-dialog.c:104 +#: ../exo/exo-icon-chooser-dialog.c:117 msgid Device Icons msgstr Laitekuvakkeet #. EXO_ICON_CHOOSER_CONTEXT_EMBLEMS -#: ../exo/exo-icon-chooser-dialog.c:106 +#: ../exo/exo-icon-chooser-dialog.c:119 msgid Emblems msgstr Tunnuskuvat #. EXO_ICON_CHOOSER_CONTEXT_EMOTES -#: ../exo/exo-icon-chooser-dialog.c:108 +#: ../exo/exo-icon-chooser-dialog.c:121 msgid Emoticons msgstr Hymiöt #. EXO_ICON_CHOOSER_CONTEXT_INTERNATIONAL -#: ../exo/exo-icon-chooser-dialog.c:110 +#: ../exo/exo-icon-chooser-dialog.c:123 msgid International Denominations msgstr Kansainväliset merkit #. EXO_ICON_CHOOSER_CONTEXT_MIME_TYPES -#: ../exo/exo-icon-chooser-dialog.c:112 +#: ../exo/exo-icon-chooser-dialog.c:125 msgid File Type Icons msgstr Tiedostotyyppikuvakkeet #. EXO_ICON_CHOOSER_CONTEXT_PLACES -#: ../exo/exo-icon-chooser-dialog.c:114 +#: ../exo/exo-icon-chooser-dialog.c:127 msgid Location Icons msgstr Sijaintikuvakkeet #. EXO_ICON_CHOOSER_CONTEXT_STATUS -#: ../exo/exo-icon-chooser-dialog.c:116 +#: ../exo/exo-icon-chooser-dialog.c:129 msgid Status Icons msgstr Tilakuvakkeet #. EXO_ICON_CHOOSER_CONTEXT_OTHER -#: ../exo/exo-icon-chooser-dialog.c:118 +#: ../exo/exo-icon-chooser-dialog.c:131 msgid Uncategorized Icons msgstr Luokittelemattomat kuvakkeet #. EXO_ICON_CHOOSER_CONTEXT_ALL -#: ../exo/exo-icon-chooser-dialog.c:122 +#: ../exo/exo-icon-chooser-dialog.c:135 msgid All Icons msgstr Kaikki kuvakkeet #. EXO_ICON_CHOOSER_CONTEXT_FILE -#: ../exo/exo-icon-chooser-dialog.c:126 ../exo/exo-icon-chooser-dialog.c:250 +#: ../exo/exo-icon-chooser-dialog.c:139 ../exo/exo-icon-chooser-dialog.c:285 msgid Image Files msgstr Kuvatiedostot -#. setup the header label -#: ../exo/exo-icon-chooser-dialog.c:193 +#. setup the context combo box +#: ../exo/exo-icon-chooser-dialog.c:210 msgid Select _icon from: msgstr Valitse _kuvake kohteesta: +#. search filter +#: ../exo/exo-icon-chooser-dialog.c:225 +msgid _Search icon: +msgstr _Etsi kuvaketta: + +#: ../exo/exo-icon-chooser-dialog.c:236 +msgid Clear search field +msgstr Tyhjennä hakukenttä + #: ../exo/exo-icon-view.c:644 msgid Column Spacing msgstr Sarakkeiden välit @@ -229,11 +238,11 @@ msgstr Näytettävien sarakkeiden määrä #: ../exo/exo-icon-view.c:676 msgid Enable Search -msgstr Käytä hakua +msgstr Salli haku #: ../exo/exo-icon-view.c:677 msgid View allows user to search through columns interactively -msgstr Näkymä sallii käyttäjän hakea sarakkeista interaktiivisesti +msgstr Käyttäjä voi hakea näkymän sarakkeista interaktiivisesti #: ../exo/exo-icon-view.c:694 msgid Width for each item @@ -521,7 +530,7 @@ msgstr --strip-comments Poista kommentit XML-tiedostoista\n msgid --strip-content Remove node contents from XML files\n msgstr --strip-content Poista noodien sisältö XML-tiedostoista\n -#: ../exo-csource/main.c:304 ../exo-desktop-item-edit/main.c:155 +#: ../exo-csource/main.c:304 ../exo-desktop-item-edit/main.c:177 #: ../exo-mount/main.c:263 ../exo-mount-notify/main.c:169 #: ../exo-open/main.c:258 #,
[Xfce4-commits] xfmpc:master l10n: Updated Slovenian (sl) translation to 98%
Updating branch refs/heads/master to 71df8020b685944d9ab10cb8ba1da872d771456f (commit) from 887e6f7fc35d6efbe0ce481fd248861e9f531199 (commit) commit 71df8020b685944d9ab10cb8ba1da872d771456f Author: Alan Pepelko alan.pepe...@gmail.com Date: Wed Feb 24 12:39:31 2010 +0100 l10n: Updated Slovenian (sl) translation to 98% New status: 55 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/sl.po b/po/sl.po index 2afdf20..19d846f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -97,9 +97,8 @@ msgid Failed to connect to MPD msgstr Povezava z MPD-jem ni uspela #: ../src/mpdclient.c:353 -#, fuzzy msgid Connected to MPD -msgstr Povezava +msgstr Povezan z MPD-jem #: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614 msgid n/a @@ -142,7 +141,6 @@ msgid Statusbar msgstr Vrstica stanja #: ../src/preferences-dialog.c:423 -#, fuzzy msgid Show _stastusbar msgstr Pokaži vrstico _stanja ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfmpc:master l10n: Updated Slovenian (sl) translation to 94%
Updating branch refs/heads/master to 887e6f7fc35d6efbe0ce481fd248861e9f531199 (commit) from 63280ba4df1f3fa54c5331d4a8f915dbf167f74f (commit) commit 887e6f7fc35d6efbe0ce481fd248861e9f531199 Author: Alan Pepelko alan.pepe...@gmail.com Date: Wed Feb 24 12:38:43 2010 +0100 l10n: Updated Slovenian (sl) translation to 94% New status: 53 messages complete with 2 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sl.po | 33 - 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/po/sl.po b/po/sl.po index 132445a..2afdf20 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3,7 +3,7 @@ # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Xfmpc package. # Alan Pepelko alan.pepe...@gmail.com, 2009. -# +# msgid msgstr Project-Id-Version: Xfmpc\n @@ -15,21 +15,18 @@ msgstr MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n -%100==4 ? 2 : 3);\n +Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n X-Poedit-Language: Slovenian\n -X-Poedit-Country: SLOVENIA\n X-Poedit-SourceCharset: utf-8\n +X-Poedit-Country: SLOVENIA\n #: ../src/dbbrowser.c:913 -#, fuzzy msgid Replace -msgstr _Zamenjaj +msgstr Zamenjaj #: ../src/dbbrowser.c:919 ../src/playlist.c:884 -#, fuzzy msgid Browse -msgstr _Prebrskaj +msgstr Brskaj #: ../src/extended-interface.c:288 msgid Repeat @@ -67,11 +64,10 @@ msgstr Trenutni seznam predvajanja msgid Browse database msgstr Prebrskaj podatkovno zbirko -#. #. // write private function in case it is wished to avoid the #. // n/a values, but no big deal IMO #. text = get_subtitle (interface); -#. +#. #. TRANSLATORS: subtitle by \artist\ from \album\ (year) #: ../src/interface.c:263 #, c-format @@ -89,16 +85,16 @@ msgstr Ni povezave #: ../src/main-window.c:383 #, c-format msgid %d songs, %d hours and %d minutes -msgstr +msgstr %d skladb, %d ur in %d minut #: ../src/main-window.c:385 #, c-format msgid %d songs, %d minutes -msgstr +msgstr %d skladb, %d minut #: ../src/mpdclient.c:348 msgid Failed to connect to MPD -msgstr +msgstr Povezava z MPD-jem ni uspela #: ../src/mpdclient.c:353 #, fuzzy @@ -122,12 +118,8 @@ msgid Use _default system settings msgstr Uporabi _privzete nastavitve za sistem #: ../src/preferences-dialog.c:367 -msgid -If checked, Xfmpc will try to read the environment variables MPD_HOST and -MPD_PORT otherwise it will use localhost -msgstr -Če je označeno, bo Xfmpc poskusil prebrati spremenljivke okolja MPD_HOST in -MPD_PORT, sicer bo uporabil localhost. +msgid If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost +msgstr Če je označeno, bo Xfmpc poskusil prebrati spremenljivke okolja MPD_HOST in MPD_PORT, sicer bo uporabil localhost. #: ../src/preferences-dialog.c:378 msgid Hostname: @@ -159,9 +151,8 @@ msgid Song Format msgstr Oblika skladbe #: ../src/preferences-dialog.c:436 -#, fuzzy msgid Song Format: -msgstr Oblika skladbe +msgstr Oblika skladbe: #: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139 msgid Title ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] eatmonkey:aria2-xml-rpc l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/aria2-xml-rpc to 04fe8a7daa290e8f09e42d0a14c79d94decb9537 (commit) from 7cd2e87642e75c893eff60b313366e4bf48a5671 (commit) commit 04fe8a7daa290e8f09e42d0a14c79d94decb9537 Author: Mike Massonnet mmasson...@gmail.com Date: Wed Feb 24 12:49:26 2010 +0100 l10n: Updated French (fr) translation to 100% New status: 52 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 24 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4774d81..3d004a1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ # Copyright (C) 2010 THE Eatmonkey'S COPYRIGHT HOLDER # This file is distributed under the same license as the Eatmonkey package. # Mike Massonnet mmasson...@gmail.com, 2010. -# +# msgid msgstr Project-Id-Version: Eatmonkey 0.1.0git-f205c3f\n @@ -151,9 +151,7 @@ msgstr Se connecter à un serveur personnalisé #: ../src/settings.ui.h:10 msgid Distributed Hash Table allows to use torrents without a working tracker -msgstr -La table de hash distributé (DHT) permet l'usage de torrents sans tracker -fonctionnel +msgstr La table de hashage distribuée permet l'usage de torrents sans tracker fonctionnel #: ../src/settings.ui.h:13 msgid Edit configuration @@ -161,7 +159,7 @@ msgstr Editer la configuration #: ../src/settings.ui.h:14 msgid Enable DHT (Distributed Hash Table) -msgstr Activer DHT (table de hash distribué) +msgstr Activer DHT (table de hashage distribuée) #: ../src/settings.ui.h:15 msgid Enable PEX (Peer Exchange) @@ -176,10 +174,8 @@ msgid Host: msgstr Hôte : #: ../src/settings.ui.h:19 -msgid -List of country codes separated by commas like JP,US to use for Metalink -msgstr -Liste des codes de pays séparés par des virgules tel que JP,US pour Metalink +msgid List of country codes separated by commas like JP,US to use for Metalink +msgstr Liste des codes de pays séparés par des virgules tel que JP,US pour Metalink #: ../src/settings.ui.h:20 msgid Listen port: @@ -198,10 +194,8 @@ msgid Network msgstr Réseau #: ../src/settings.ui.h:26 -msgid -Number of connections to open for one file to download (only for HTTP(s)/FTP) -msgstr -Nombre de connections à ouvrir pour un fichier à télécharger (uniquement pour HTTP(s)/FTP +msgid Number of connections to open for one file to download (only for HTTP(s)/FTP) +msgstr Nombre de connections à ouvrir pour un fichier à télécharger (uniquement pour HTTP(s)/FTP) #: ../src/settings.ui.h:28 msgid Password: @@ -209,9 +203,7 @@ msgstr Mot de passe : #: ../src/settings.ui.h:29 msgid Peer Exchange helps finding more peers through connected peers -msgstr -L'échange de pair (PEX) aide a trouver de nouveaux pairs via les pairs -connectés +msgstr L'échange de pair aide à trouver de nouveaux pairs via les pairs connectés #: ../src/settings.ui.h:30 msgid Preferred locations: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:danielm/port-to-gio Minor sintax tweaking.
Updating branch refs/heads/danielm/port-to-gio
to 4f6bc3bb4691003b9a79d2525443d4432a2757ad (commit)
from 37f058c45e528656b737e259ca91c2f4f88dcca3 (commit)
commit 4f6bc3bb4691003b9a79d2525443d4432a2757ad
Author: Daniel Morales dan...@daniel.com.uy
Date: Wed Feb 24 10:33:02 2010 -0200
Minor sintax tweaking.
src/xfdesktop-file-utils.c | 56 ++--
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 47c41f0..4d8ebfe 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -517,9 +517,12 @@ gboolean
xfdesktop_file_utils_launch_icon(const XfdesktopFileIcon *file_icon)
{
DBusGProxy *thunar_proxy;
-GtkWidget *icon_view, *toplevel;
-GdkScreen *gscreen;
-gboolean success = FALSE;
+GtkWidget *icon_view, *toplevel;
+GdkScreen *gscreen;
+GError *error = NULL;
+gbooleansuccess = FALSE;
+gchar *display_name;
+gchar *uri;
g_return_val_if_fail(XFDESKTOP_IS_FILE_ICON(file_icon), FALSE);
g_return_val_if_fail(G_IS_FILE(file_icon-gfile), FALSE);
@@ -531,34 +534,31 @@ xfdesktop_file_utils_launch_icon(const XfdesktopFileIcon
*file_icon)
/* use thunar D-BUS API */
thunar_proxy = xfdesktop_file_utils_peek_filemanager_proxy();
-if(thunar_proxy) {
- GError *error = NULL;
-gchar *display_name;
-gchar *uri;
-
-uri = g_file_get_uri(file_icon-gfile);
-display_name = gdk_screen_make_display_name(gscreen);
-
-success = org_xfce_FileManager_launch(thunar_proxy,
- uri,
- display_name,
- error);
-
-if(!success) {
-gchar *primary = g_markup_printf_escaped(_(Unable to launch
\%s\:),
-
g_file_info_get_display_name(file_icon-info));
-xfce_message_dialog(GTK_WINDOW(toplevel), _(Launch Error),
-GTK_STOCK_DIALOG_ERROR, primary,
-error-message,
-GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
-g_error_free(error);
-g_free(primary);
-}
+if(!thunar_proxy)
+return FALSE;
+
+uri = g_file_get_uri(file_icon-gfile);
+display_name = gdk_screen_make_display_name(gscreen);
+
+success = org_xfce_FileManager_launch(thunar_proxy,
+ uri,
+ display_name,
+ error);
-g_free(uri);
-g_free(display_name);
+if(!success) {
+gchar *primary = g_markup_printf_escaped(_(Unable to launch \%s\:),
+
g_file_info_get_display_name(file_icon-info));
+xfce_message_dialog(GTK_WINDOW(toplevel), _(Launch Error),
+GTK_STOCK_DIALOG_ERROR, primary,
+error-message,
+GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+g_error_free(error);
+g_free(primary);
}
+g_free(uri);
+g_free(display_name);
+
return success;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:danielm/port-to-gio Check proxy connection before use it.
Updating branch refs/heads/danielm/port-to-gio to 37f058c45e528656b737e259ca91c2f4f88dcca3 (commit) from f7002f6a055f742714b0e68840ac594d06c868ac (commit) commit 37f058c45e528656b737e259ca91c2f4f88dcca3 Author: Daniel Morales dan...@daniel.com.uy Date: Wed Feb 24 10:20:08 2010 -0200 Check proxy connection before use it. src/xfdesktop-regular-file-icon.c |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c index 5767bf2..2b0bd9a 100644 --- a/src/xfdesktop-regular-file-icon.c +++ b/src/xfdesktop-regular-file-icon.c @@ -369,6 +369,10 @@ xfdesktop_regular_file_icon_do_drop_dest(XfdesktopIcon *icon, gchar *dest_uri; gchar *name; +thunar_proxy = xfdesktop_file_utils_peek_thunar_proxy(); +if(!thunar_proxy) +return FALSE; + if(xfdesktop_file_utils_is_root(src_file_icon)) return FALSE; @@ -383,8 +387,6 @@ xfdesktop_regular_file_icon_do_drop_dest(XfdesktopIcon *icon, if(!dest_path) return FALSE; -thunar_proxy = xfdesktop_file_utils_peek_thunar_proxy(); - /* only one file, but null terminated */ filenames = g_new(gchar *, 2); filenames[0] = g_file_get_uri(file_icon-gfile); @@ -515,6 +517,8 @@ xfdesktop_regular_file_icon_delete_file(XfdesktopFileIcon *icon) g_return_val_if_fail(G_IS_FILE_INFO(file_icon-info), FALSE); thunar_proxy = xfdesktop_file_utils_peek_thunar_proxy(); +if(!thunar_proxy) +return FALSE; /* only one file, but null terminated */ filenames = g_new(gchar *, 2); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 8dc0647047ad704b902679df628eed1517d584c7 (commit) from 9afd270e2ce312dc574721a2f083f7a2e4def5bc (commit) commit 8dc0647047ad704b902679df628eed1517d584c7 Author: Cristian Marchi cri.pe...@gmail.com Date: Wed Feb 24 14:03:54 2010 +0100 l10n: Updated Italian (it) translation to 100% New status: 231 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 169 +++--- 1 files changed, 107 insertions(+), 62 deletions(-) diff --git a/po/it.po b/po/it.po index 7ddc12e..b291101 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-session 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-01-30 12:04+0100\n +POT-Creation-Date: 2010-02-24 11:59+0100\n PO-Revision-Date: 2010-01-28 15:03+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n Language-Team: Italian xfce-it-translat...@googlegroups.com\n @@ -251,16 +251,16 @@ msgstr Informazioni di versione msgid Type '%s --help' for usage. msgstr Digitare \%s --help\ per le modalità d'uso -#: ../settings/main.c:85 +#: ../settings/main.c:85 ../xfce4-session/main.c:226 msgid The Xfce development team. All rights reserved. msgstr Il gruppo di sviluppo di Xfce. Tutti i diritti riservati. -#: ../settings/main.c:86 +#: ../settings/main.c:86 ../xfce4-session/main.c:232 #, c-format msgid Please report bugs to %s. msgstr Segnalare i problemi a %s. -#: ../settings/main.c:95 ../xfce4-session/main.c:281 +#: ../settings/main.c:95 ../xfce4-session/main.c:238 ../xfce4-tips/main.c:270 msgid Unable to contact settings server msgstr Impossibile contattare il server delle impostazioni @@ -301,24 +301,24 @@ msgstr Impossibile salvare la sessione msgid Are you sure you want to terminate \%s\? msgstr Terminare davvero \%s\? -#: ../settings/session-editor.c:186 -#, c-format -msgid Terminate \%s\ -msgstr Termina \%s\ - -#: ../settings/session-editor.c:188 ../settings/session-editor.c:216 +#: ../settings/session-editor.c:187 ../settings/session-editor.c:215 msgid Terminate Program msgstr Termina programma -#: ../settings/session-editor.c:190 +#: ../settings/session-editor.c:189 msgid The application will lose any unsaved state and will not be restarted in your next session. msgstr L'applicazione perderà qualsiasi stato non salvato e non verrà riavviata nella prossima sessione. -#: ../settings/session-editor.c:217 +#: ../settings/session-editor.c:191 +#: ../settings/xfce4-session-settings.glade.h:35 +msgid _Quit Program +msgstr _Esci dal programma + +#: ../settings/session-editor.c:216 msgid Unable to terminate program. msgstr Impossibile terminare il programma. -#: ../settings/session-editor.c:396 +#: ../settings/session-editor.c:394 msgid (Unknown program) msgstr (Programma sconosciuto) @@ -344,80 +344,123 @@ msgstr Stile di riavvio msgid None msgstr Nessuno -#: ../settings/xfae-dialog.c:99 +#: ../settings/xfae-dialog.c:78 msgid Add application msgstr Aggiungi applicazione -#: ../settings/xfae-dialog.c:113 +#: ../settings/xfae-dialog.c:92 msgid Name: msgstr Nome: -#: ../settings/xfae-dialog.c:130 +#: ../settings/xfae-dialog.c:109 msgid Description: msgstr Descrizione: -#: ../settings/xfae-dialog.c:145 +#: ../settings/xfae-dialog.c:124 msgid Command: msgstr Comando: -#: ../settings/xfae-dialog.c:205 +#: ../settings/xfae-dialog.c:184 msgid Select a command msgstr Selezionare un comando +#: ../settings/xfae-dialog.c:233 +msgid Edit application +msgstr Modifica applicazione + #: ../settings/xfae-model.c:562 #, c-format msgid Failed to unlink %s: %s msgstr Scollegamento di «%s» non riuscito: %s -#: ../settings/xfae-model.c:650 +#: ../settings/xfae-model.c:651 #, c-format msgid Failed to create file %s msgstr Creazione del file «%s» non riuscita -#: ../settings/xfae-model.c:672 +#: ../settings/xfae-model.c:673 #, c-format msgid Failed to write file %s msgstr Scrittura del file «%s» non riuscita -#: ../settings/xfae-model.c:771 +#: ../settings/xfae-model.c:732 +#, c-format +msgid Failed to open %s for reading +msgstr Apertura di «%s» in scrittura non riuscita + +#: ../settings/xfae-model.c:841 ../settings/xfae-model.c:898 #, c-format msgid Failed to open %s for writing msgstr Apertura di «%s» in scrittura non riuscita -#: ../settings/xfae-window.c:100 +#: ../settings/xfae-window.c:101 msgid Below is the list of applications that will be started automatically when you login to your Xfce desktop, in addition to the applications that were saved when you logged out last time: msgstr Questo è l'elenco delle applicazioni che saranno avviate automaticamente all'accesso nell'ambiente Xfce, in aggiunta a quelle salvate all'uscita della sessione precedente: -#: ../settings/xfae-window.c:277 +#: ../settings/xfae-window.c:289 #, c-format msgid Failed adding \%s\
[Xfce4-commits] xfce4-panel:master Link directly to libm (bug #6233).
Updating branch refs/heads/master to 2904023c00e0d315c6b5f86ccfd44a474ee7f98a (commit) from e3aba8a99c9b62ffb4e7cfaf4389cdc8ce727875 (commit) commit 2904023c00e0d315c6b5f86ccfd44a474ee7f98a Author: Nick Schermer n...@xfce.org Date: Wed Feb 24 14:41:45 2010 +0100 Link directly to libm (bug #6233). panel/Makefile.am |3 ++- plugins/clock/Makefile.am |3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/panel/Makefile.am b/panel/Makefile.am index 8fe2f8a..293fb5e 100644 --- a/panel/Makefile.am +++ b/panel/Makefile.am @@ -54,7 +54,8 @@ xfce4_panel_LDADD = \ $(LIBXFCEGUI4_LIBS) \ $(LIBSTARTUP_NOTIFICATION_LIBS) \ $(GMODULE_LIBS) \ - $(LIBX11_LIBS) + $(LIBX11_LIBS) \ + -lm xfce4_panel_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel.la diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am index 12f3216..324e9d1 100644 --- a/plugins/clock/Makefile.am +++ b/plugins/clock/Makefile.am @@ -48,7 +48,8 @@ libclock_la_LIBADD = \ $(GTK_LIBS) \ $(CAIRO_LIBS) \ $(LIBXFCE4UTIL_LIBS)\ - $(LIBXFCEGUI4_LIBS) + $(LIBXFCEGUI4_LIBS) \ + -lm libclock_la_DEPENDENCIES = \ $(top_builddir)/libxfce4panel/libxfce4panel.la ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 434382a1a99527cbde8213cdc032fa8e5299347f (commit) from 19afb2dcc3b0fb7474441a11513e3f0c8c1a520f (commit) commit 434382a1a99527cbde8213cdc032fa8e5299347f Author: Sergio Marques smarque...@gmail.com Date: Wed Feb 24 15:19:14 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 268 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 339 +++--- 1 files changed, 125 insertions(+), 214 deletions(-) diff --git a/po/pt.po b/po/pt.po index 05dbc63..30edc1d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,8 +7,8 @@ msgid msgstr Project-Id-Version: Terminal 0.4.3\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-02-07 19:21+0100\n -PO-Revision-Date: 2009-12-16 11:30-\n +POT-Creation-Date: 2010-02-24 11:55+0100\n +PO-Revision-Date: 2010-02-24 13:30-\n Last-Translator: Sérgio Marques smarque...@gmail.com\n Language-Team: \n MIME-Version: 1.0\n @@ -31,13 +31,15 @@ msgstr Opções Gerais #. parameter of --default-display #. parameter of --display -#: ../terminal/main.c:59 ../terminal/main.c:85 +#: ../terminal/main.c:59 +#: ../terminal/main.c:85 msgid display msgstr mostrar #. parameter of --default-working-directory #. parameter of --working-directory -#: ../terminal/main.c:61 ../terminal/main.c:76 +#: ../terminal/main.c:61 +#: ../terminal/main.c:76 msgid directory msgstr directório @@ -86,16 +88,16 @@ msgstr ícone #: ../terminal/main.c:95 #, c-format msgid See the %s man page for full explanation of the options above. -msgstr -Veja o manual de %s para uma explicação completa sobre as opções acima -indicadas. +msgstr Veja o manual do %s para uma explicação completa sobre as opções indicadas. -#: ../terminal/main.c:125 ../terminal/terminal-preferences.c:1262 -#: ../terminal/terminal-shortcut-editor.c:119 ../Terminal.desktop.in.in.h:1 +#: ../terminal/main.c:126 +#: ../terminal/terminal-preferences.c:1262 +#: ../terminal/terminal-shortcut-editor.c:119 +#: ../Terminal.desktop.in.in.h:1 msgid Terminal msgstr Terminal -#: ../terminal/main.c:143 +#: ../terminal/main.c:144 #, c-format msgid %s %s (Xfce %s)\n @@ -120,7 +122,7 @@ msgstr \n Por favor, relate problemas para %s.\n -#: ../terminal/main.c:249 +#: ../terminal/main.c:250 #, c-format msgid Unable to register terminal service: %s\n msgstr Incapaz de registar o serviço de terminal: %s\n @@ -144,66 +146,66 @@ msgstr Bus de mensagem D-BUS desligado, a sair...\n msgid Unable to register object %s msgstr Incapaz de registar o objecto %s -#: ../terminal/terminal-dialogs.c:90 ../Terminal-default-apps.xml.in.in.h:1 +#: ../terminal/terminal-dialogs.c:95 +#: ../Terminal-default-apps.xml.in.in.h:1 msgid Xfce Terminal Emulator -msgstr Emulador de Terminal do Xfce +msgstr Emulador de Terminal Xfce -#: ../terminal/terminal-dialogs.c:97 +#: ../terminal/terminal-dialogs.c:102 msgid translator-credits msgstr Nuno Miguel nu...@netcabo.pt -#: ../terminal/terminal-dialogs.c:100 +#: ../terminal/terminal-dialogs.c:105 msgid Visit Terminal website msgstr Visite o sítio web do Terminal +#: ../terminal/terminal-dialogs.c:215 +#, c-format +msgid The %s user manual is not installed on your computer +msgstr O manual de utilizador do %s não está instalado + +#: ../terminal/terminal-dialogs.c:218 +#, c-format +msgid You can read the user manual online. This manual may however not exactly match your %s version. +msgstr Pode ler o manual online. No entanto, este manual pode não corresponder à sua versão do %s. + +#: ../terminal/terminal-dialogs.c:220 +msgid User manual is missing +msgstr Manual de utilizador em falta + +#: ../terminal/terminal-dialogs.c:222 +msgid _Read Online +msgstr _Ler Online + #. display an error message to the user -#: ../terminal/terminal-dialogs.c:269 +#: ../terminal/terminal-dialogs.c:302 msgid Failed to open the documentation browser -msgstr Falhou ao abrir o navegador da documentação +msgstr Falha ao abrir o navegador da documentação #: ../terminal/terminal-options.c:210 #, c-format -msgid -Option \--default-display\ requires specifying the default X display as -its parameter -msgstr -Opção \--default-display\ requer especificar o ecrã por omissão do X como -parâmetro +msgid Option \--default-display\ requires specifying the default X display as its parameter +msgstr Opção \--default-display\ requer especificar o ecrã por omissão do X como parâmetro #: ../terminal/terminal-options.c:225 #, c-format -msgid -Option \--default-working-directory\ requires specifying the default -working directory as its parameter -msgstr -Opção \--default-working-directory\ requer especificar o directório de -trabalho por omissão como parâmetro +msgid Option \--default-working-directory\ requires specifying the default working directory as its parameter +msgstr Opção
[Xfce4-commits] thunar:master Create status icon when we're actually going to display it.
Updating branch refs/heads/master
to eb89a0fdc3b7823ac7e0e630d2db98b2230f6954 (commit)
from ee62db374dd3ff5e8896e7188640378f991615fc (commit)
commit eb89a0fdc3b7823ac7e0e630d2db98b2230f6954
Author: Nick Schermer n...@xfce.org
Date: Wed Feb 24 16:20:21 2010 +0100
Create status icon when we're actually going to display it.
The show/hide in status icons emits a critical warning (in the
plug window) because of the quick hide we do after creating in
status icon. This crashes the status icon in the panel.
Although this is a problem in Gtk, it is also better to delay
creating the status icon until we actually show it.
thunar/thunar-progress-dialog.c | 30 +-
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index 30ad94b..ab8155c 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -112,13 +112,6 @@ thunar_progress_dialog_init (ThunarProgressDialog *dialog)
gtk_container_set_border_width (GTK_CONTAINER (dialog-content_box), 8);
gtk_container_add (GTK_CONTAINER (dialog-vbox), dialog-content_box);
gtk_widget_show (dialog-content_box);
-
- dialog-status_icon = gtk_status_icon_new_from_icon_name
(stock_folder-copy);
- gtk_status_icon_set_visible (dialog-status_icon, FALSE);
-
- g_signal_connect_swapped (dialog-status_icon, button-press-event,
-G_CALLBACK (thunar_progress_dialog_toggled),
-GTK_WIDGET (dialog));
}
@@ -137,7 +130,8 @@ thunar_progress_dialog_finalize (GObject *object)
ThunarProgressDialog *dialog = THUNAR_PROGRESS_DIALOG (object);
/* destroy the status icon */
- g_object_unref (dialog-status_icon);
+ if (dialog-status_icon != NULL)
+g_object_unref (dialog-status_icon);
/* free the view list */
g_list_free (dialog-views);
@@ -153,7 +147,14 @@ thunar_progress_dialog_shown (ThunarProgressDialog *dialog)
_thunar_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
/* show the status icon */
- gtk_status_icon_set_visible (dialog-status_icon, TRUE);
+ if (dialog-status_icon == NULL)
+{
+ dialog-status_icon = gtk_status_icon_new_from_icon_name
(stock_folder-copy);
+ thunar_progress_dialog_update_status_icon (dialog);
+ g_signal_connect_swapped (dialog-status_icon, button-press-event,
+G_CALLBACK (thunar_progress_dialog_toggled),
+GTK_WIDGET (dialog));
+}
}
@@ -267,7 +268,8 @@ thunar_progress_dialog_job_finished (ThunarProgressDialog
*dialog,
if (dialog-views != NULL)
{
/* update the status icon */
- thunar_progress_dialog_update_status_icon (dialog);
+ if (dialog-status_icon != NULL)
+thunar_progress_dialog_update_status_icon (dialog);
}
else
{
@@ -285,7 +287,8 @@ thunar_progress_dialog_update_status_icon
(ThunarProgressDialog *dialog)
guint n_views;
_thunar_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
-
+ _thunar_return_if_fail (GTK_IS_STATUS_ICON (dialog-status_icon));
+
/* determine the number of views now being active */
n_views = g_list_length (dialog-views);
@@ -293,7 +296,7 @@ thunar_progress_dialog_update_status_icon
(ThunarProgressDialog *dialog)
tooltip_text = g_strdup_printf (ngettext (%d file operation running,
%d file operations running,
n_views),
- n_views);
+n_views);
/* update the tooltip */
#if GTK_CHECK_VERSION (2, 16, 0)
@@ -369,7 +372,8 @@ thunar_progress_dialog_add_job (ThunarProgressDialog
*dialog,
g_signal_connect_swapped (view, finished,
G_CALLBACK (thunar_progress_dialog_job_finished),
dialog);
- thunar_progress_dialog_update_status_icon (dialog);
+ if (dialog-status_icon != NULL)
+thunar_progress_dialog_update_status_icon (dialog);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Treat utility and dialog windows with an invalid window for transient as transients for group
Updating branch refs/heads/master
to 6b385d5f53ce84fa05ba66955be0b3f5b7d794e4 (commit)
from c09471fa5f99207d8356357d63b8da9afcf2f9be (commit)
commit 6b385d5f53ce84fa05ba66955be0b3f5b7d794e4
Author: Olivier Fourdan four...@xfce.org
Date: Wed Feb 24 14:04:55 2010 +0100
Treat utility and dialog windows with an invalid window for transient as
transients for group
src/netwm.c |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/netwm.c b/src/netwm.c
index e9cf071..0a42f02 100644
--- a/src/netwm.c
+++ b/src/netwm.c
@@ -1248,8 +1248,10 @@ clientWindowType (Client * c)
c-type = WINDOW_DIALOG;
c-initial_layer = WIN_LAYER_NORMAL;
/* Treat DIALOG without transient_for set as transient for group */
-if (c-transient_for == None)
+if ((c-transient_for == None) || (!clientGetTransient (c)))
{
+TRACE (Invalid transient 0x%lx specified for dialog window
0x%lx (%s),
+ c-transient_for, c-window, c-name);
c-transient_for = c-screen_info-xroot;
}
}
@@ -1267,8 +1269,10 @@ clientWindowType (Client * c)
c-type = WINDOW_UTILITY;
c-initial_layer = WIN_LAYER_NORMAL;
/* Treat UTILITY without transient_for set as transient for group
*/
-if (c-transient_for == None)
+if ((c-transient_for == None) || (!clientGetTransient (c)))
{
+TRACE (Invalid transient 0x%lx specified for utility window
0x%lx (%s),
+ c-transient_for, c-window, c-name);
c-transient_for = c-screen_info-xroot;
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Use explicit message when actual type of option does not match the expected type (so the warning can be useful)
Updating branch refs/heads/master
to 88b0f9105f8a8a688a72743ccf75907f2fed2497 (commit)
from 6b385d5f53ce84fa05ba66955be0b3f5b7d794e4 (commit)
commit 88b0f9105f8a8a688a72743ccf75907f2fed2497
Author: Olivier Fourdan four...@xfce.org
Date: Wed Feb 24 14:24:27 2010 +0100
Use explicit message when actual type of option does not match the expected
type (so the warning can be useful)
src/parserc.c | 18 +++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/parserc.c b/src/parserc.c
index 132ecaa..ac1e0fc 100644
--- a/src/parserc.c
+++ b/src/parserc.c
@@ -300,7 +300,11 @@ getStringValue (const gchar *option, Settings *rc)
{
if (rc[i].value == NULL)
return NULL;
-g_return_val_if_fail(G_VALUE_TYPE(rc[i].value) == G_TYPE_STRING,
NULL);
+if (G_VALUE_TYPE(rc[i].value) != G_TYPE_STRING)
+{
+g_warning (Option \%s\ in not of expected type string,
option);
+return NULL;
+}
return g_value_get_string(rc[i].value);
}
}
@@ -322,7 +326,11 @@ getIntValue (const gchar *option, Settings *rc)
{
if (rc[i].value == NULL)
return 0;
-g_return_val_if_fail(G_VALUE_TYPE(rc[i].value) == G_TYPE_INT, 0);
+if (G_VALUE_TYPE(rc[i].value) != G_TYPE_INT)
+{
+g_warning (Option \%s\ in not of expected type int,
option);
+return 0;
+}
return g_value_get_int(rc[i].value);
}
}
@@ -344,7 +352,11 @@ getBoolValue (const gchar *option, Settings *rc)
{
if (rc[i].value == NULL)
return FALSE;
-g_return_val_if_fail(G_VALUE_TYPE(rc[i].value) == G_TYPE_BOOLEAN,
FALSE);
+if (G_VALUE_TYPE(rc[i].value) != G_TYPE_BOOLEAN)
+{
+g_warning (Option \%s\ in not of expected type boolean,
option);
+return FALSE;
+}
return g_value_get_boolean(rc[i].value);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Missing setting for cycle_apps_only cycle_apps_only defaults to false as it might be confusing at times
Updating branch refs/heads/master
to c09471fa5f99207d8356357d63b8da9afcf2f9be (commit)
from 62b44d6241a2a88a32b26e0908b350971892ce3a (commit)
commit c09471fa5f99207d8356357d63b8da9afcf2f9be
Author: Olivier Fourdan four...@xfce.org
Date: Wed Feb 24 09:44:17 2010 +0100
Missing setting for cycle_apps_only
cycle_apps_only defaults to false as it might be confusing at times
defaults/defaults |2 +-
src/settings.c| 10 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/defaults/defaults b/defaults/defaults
index 9b1f892..fca5077 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -7,7 +7,7 @@ button_offset=0
button_spacing=0
click_to_focus=true
cycle_draw_frame=true
-cycle_apps_only=true
+cycle_apps_only=false
cycle_hidden=true
cycle_minimum=true
cycle_workspaces=false
diff --git a/src/settings.c b/src/settings.c
index 0e5bd47..ca0cd7a 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1103,7 +1103,7 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel,
const gchar *property_
}
else
{
-g_warning(The property '%s' is not supported,
property_name);
+g_warning(The property '%s' of type string is not
supported, property_name);
}
break;
case G_TYPE_INT:
@@ -1188,7 +1188,7 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel,
const gchar *property_
}
else
{
-g_warning(The property '%s' is not supported,
property_name);
+g_warning(The property '%s' of type int is not
supported, property_name);
}
break;
case G_TYPE_BOOLEAN:
@@ -1264,6 +1264,10 @@ cb_xfwm4_channel_property_changed(XfconfChannel
*channel, const gchar *property_
{
screen_info-params-cycle_workspaces =
g_value_get_boolean (value);
}
+else if (!strcmp (name, cycle_apps_only))
+{
+screen_info-params-cycle_apps_only = g_value_get_boolean
(value);
+}
else if (!strcmp (name, focus_hint))
{
screen_info-params-focus_hint = g_value_get_boolean
(value);
@@ -1333,7 +1337,7 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel,
const gchar *property_
}
else
{
-g_warning(The property '%s' is not supported,
property_name);
+g_warning(The property '%s' of type boolean is not
supported, property_name);
}
break;
default:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Allow only regular windows to be placed either above or below.
Updating branch refs/heads/master
to 98561a5d1f99212eb5be60a71cf9f36f4959686f (commit)
from 88b0f9105f8a8a688a72743ccf75907f2fed2497 (commit)
commit 98561a5d1f99212eb5be60a71cf9f36f4959686f
Author: Olivier Fourdan four...@xfce.org
Date: Wed Feb 24 20:26:52 2010 +0100
Allow only regular windows to be placed either above or below.
src/client.c |6 --
src/client.h |4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/client.c b/src/client.c
index ea26f70..c603d96 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3087,7 +3087,8 @@ void clientToggleLayerAbove (Client * c)
g_return_if_fail (c != NULL);
TRACE (entering clientToggleAbove);
-if (!clientIsTransientOrModal (c)
+if ((c-type WINDOW_REGULAR_FOCUSABLE)
+!clientIsTransientOrModal (c)
!FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREEN))
{
FLAG_UNSET (c-flags, CLIENT_FLAG_BELOW);
@@ -3101,7 +3102,8 @@ void clientToggleLayerBelow (Client * c)
g_return_if_fail (c != NULL);
TRACE (entering clientToggleBelow);
-if (!clientIsTransientOrModal (c)
+if ((c-type WINDOW_REGULAR_FOCUSABLE)
+!clientIsTransientOrModal (c)
!FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREEN))
{
FLAG_UNSET (c-flags, CLIENT_FLAG_ABOVE);
diff --git a/src/client.h b/src/client.h
index fdb59fa..acba0c4 100644
--- a/src/client.h
+++ b/src/client.h
@@ -193,8 +193,8 @@
WINDOW_UTILITY | \
WINDOW_SPLASHSCREEN)
#define WINDOW_REGULAR_FOCUSABLE(WINDOW_NORMAL | \
- WINDOW_DIALOG | \
- WINDOW_MODAL_DIALOG)
+ WINDOW_TYPE_DIALOG | \
+ WINDOW_UTILITY)
#define WINDOW_TYPE_DONT_FOCUS (WINDOW_SPLASHSCREEN | \
WINDOW_DOCK)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:xfce-4.6 Allow only regular windows to be placed either above or below.
Updating branch refs/heads/xfce-4.6
to 06046f1723eba7a90e53bdba8a2af4a51fd03db6 (commit)
from bc9e8203b9438dc0066e622d79526e7e854b95cf (commit)
commit 06046f1723eba7a90e53bdba8a2af4a51fd03db6
Author: Olivier Fourdan four...@xfce.org
Date: Wed Feb 24 20:26:52 2010 +0100
Allow only regular windows to be placed either above or below.
src/client.c |6 --
src/client.h |4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/client.c b/src/client.c
index 2e6342a..8986384 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3078,7 +3078,8 @@ void clientToggleLayerAbove (Client * c)
g_return_if_fail (c != NULL);
TRACE (entering clientToggleAbove);
-if (!clientIsTransientOrModal (c)
+if ((c-type WINDOW_REGULAR_FOCUSABLE)
+!clientIsTransientOrModal (c)
!FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREEN))
{
FLAG_UNSET (c-flags, CLIENT_FLAG_BELOW);
@@ -3092,7 +3093,8 @@ void clientToggleLayerBelow (Client * c)
g_return_if_fail (c != NULL);
TRACE (entering clientToggleBelow);
-if (!clientIsTransientOrModal (c)
+if ((c-type WINDOW_REGULAR_FOCUSABLE)
+!clientIsTransientOrModal (c)
!FLAG_TEST (c-flags, CLIENT_FLAG_FULLSCREEN))
{
FLAG_UNSET (c-flags, CLIENT_FLAG_ABOVE);
diff --git a/src/client.h b/src/client.h
index 1c6c032..7ad3f29 100644
--- a/src/client.h
+++ b/src/client.h
@@ -191,8 +191,8 @@
WINDOW_UTILITY | \
WINDOW_SPLASHSCREEN)
#define WINDOW_REGULAR_FOCUSABLE(WINDOW_NORMAL | \
- WINDOW_DIALOG | \
- WINDOW_MODAL_DIALOG)
+ WINDOW_TYPE_DIALOG | \
+ WINDOW_UTILITY)
#define WINDOW_TYPE_DONT_FOCUS (WINDOW_SPLASHSCREEN | \
WINDOW_DOCK)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Store searches and completion search in the location
Updating branch refs/heads/master
to de89bcd2dca283e0e93b0d5fe1ce6d881c7b42cc (commit)
from 705d2b7627826c6f6c7ac0f6aab242b5963df2fe (commit)
commit de89bcd2dca283e0e93b0d5fe1ce6d881c7b42cc
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Feb 22 23:49:27 2010 +0100
Store searches and completion search in the location
midori/main.c | 12 +++--
midori/midori-browser.c| 28 ++
midori/midori-locationaction.c | 51 +++
3 files changed, 72 insertions(+), 19 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index eed1713..70eb1b0 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -368,9 +368,15 @@ midori_history_initialize (KatzeArray* array,
}
if (sqlite3_exec (db,
- CREATE TABLE IF NOT EXISTS
- history(uri text, title text, date integer, day integer),
- NULL, NULL, errmsg) != SQLITE_OK)
+ CREATE TABLE IF NOT EXISTS
+ history (uri text, title text, date integer, day
integer);
+ CREATE TABLE IF NOT EXISTS
+ search (keywords text, uri text, day integer);
+ CREATE TEMP VIEW history_view AS SELECT
+ 1 AS type, uri, title FROM history;
+ CREATE TEMP VIEW search_view AS SELECT
+ 2 AS type, uri, keywords AS title FROM search;,
+ NULL, NULL, errmsg) != SQLITE_OK)
return NULL;
sqlite3_prepare_v2 (db, SELECT day FROM history LIMIT 1, -1, stmt,
NULL);
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index f5906e2..f5c41d6 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3853,6 +3853,12 @@ _action_location_submit_uri (GtkAction* action,
gchar** parts;
gchar* keywords = NULL;
const gchar* search_uri = NULL;
+#if HAVE_SQLITE
+time_t now;
+gint64 day;
+sqlite3* db;
+static sqlite3_stmt* statement = NULL;
+#endif
/* Do we have a keyword and a string? */
parts = g_strsplit (stripped_uri, , 2);
@@ -3876,6 +3882,28 @@ _action_location_submit_uri (GtkAction* action,
}
new_uri = sokoke_search_uri (search_uri, keywords);
+#if HAVE_SQLITE
+now = time (NULL);
+day = sokoke_time_t_to_julian (now);
+
+db = g_object_get_data (G_OBJECT (browser-history), db);
+if (!statement)
+{
+const gchar* sqlcmd;
+sqlcmd = INSERT INTO search (keywords, uri, day) VALUES (?,?,?);
+sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, statement,
NULL);
+}
+sqlite3_bind_text (statement, 1, keywords, -1, 0);
+sqlite3_bind_text (statement, 2, search_uri, -1, 0);
+sqlite3_bind_int64 (statement, 3, day);
+
+if (sqlite3_step (statement) != SQLITE_DONE)
+g_printerr (_(Failed to insert new history item: %s\n),
+sqlite3_errmsg (db));
+sqlite3_reset (statement);
+sqlite3_clear_bindings (statement);
+#endif
+
g_free (keywords);
}
else
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 1ab63c7..b10a9fc 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -87,6 +87,7 @@ enum
VISIBLE_COL,
YALIGN_COL,
BACKGROUND_COL,
+STYLE_COL,
N_COLS
};
@@ -268,7 +269,8 @@ midori_location_action_create_model (void)
{
GtkTreeModel* model = (GtkTreeModel*) gtk_list_store_new (N_COLS,
GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,
-G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_FLOAT, GDK_TYPE_COLOR);
+G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_FLOAT,
+GDK_TYPE_COLOR, G_TYPE_BOOLEAN);
return model;
}
@@ -341,6 +343,7 @@ midori_location_action_popup_timeout_cb (gpointer data)
static sqlite3_stmt* stmt;
const gchar* sqlcmd;
gint matches, searches, height, screen_height, sep;
+GtkStyle* style;
if (!gtk_widget_has_focus (action-entry) || !action-history)
return FALSE;
@@ -355,13 +358,16 @@ midori_location_action_popup_timeout_cb (gpointer data)
{
sqlite3* db;
db = g_object_get_data (G_OBJECT (action-history), db);
-sqlcmd = SELECT uri, title FROM history WHERE uri LIKE ? OR title
LIKE ?
- GROUP BY uri ORDER BY count() DESC LIMIT ?;
-sqlite3_prepare_v2 (db, sqlcmd, -1, stmt, NULL);
+sqlcmd = SELECT type, uri, title, count() AS ct FROM history_view
+ WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri
+ UNION ALL
+ SELECT type, uri, title, count() AS ct FROM search_view
+ WHERE title LIKE ?1 GROUP BY uri
+ ORDER BY ct DESC LIMIT ?2;
+
