[Xfce4-commits] Creating annotated tag xfce4-dict-0.7.0
Updating annotated tag refs/tags/xfce4-dict-0.7.0 as new annotated tag to 942f56dd4cb44c6073b5e601ff54ebb0f379564f (tag) succeeds xfce4-dict-0.6.0-250-gfd98dd4 tagged by Enrico Tröger on 2013-05-20 16:25 +0200 Enrico Tröger (1): Fix package name ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix package name
Updating branch refs/heads/master to babd4c7bd281bf7dc87211617dafce7490ab650c (commit) from fd98dd4cc350065ec435382bd68268a8f2652686 (commit) commit babd4c7bd281bf7dc87211617dafce7490ab650c Author: Enrico Tröger Date: Mon May 20 16:23:14 2013 +0200 Fix package name configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index c01ab0f..afc21ec 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -12,7 +12,7 @@ dnl *** dnl *** Initialize autoconf *** dnl *** AC_COPYRIGHT([Copyright (c) 2006-2012 Enrico Tröger. All rights reserved.]) -AC_INIT([xfce4-dict-plugin], [xfce4_dict_version], [http://bugzilla.xfce.org/], [xfce4-dict-plugin]) +AC_INIT([xfce4-dict], [xfce4_dict_version], [http://bugzilla.xfce.org/], [xfce4-dict]) AC_PREREQ([2.50]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix make distcheck
Updating branch refs/heads/master to fd98dd4cc350065ec435382bd68268a8f2652686 (commit) from f3d541ff7408695b1f147beaa5b2401ba8d53fc0 (commit) commit fd98dd4cc350065ec435382bd68268a8f2652686 Author: Enrico Tröger Date: Mon May 20 16:23:03 2013 +0200 Fix make distcheck Makefile.am |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7986d0d..ec0b7ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,11 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor man_MANS=xfce4-dict.1 -install-data-hook: +install-data-hook: update-icon-cache + +uninstall-hook: update-icon-cache + +update-icon-cache: @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ @@ -47,4 +51,3 @@ sign: gpg --detach-sign --digest-algo SHA512 $(PACKAGE)-$(VERSION).tar.gz; fi if test -f $(PACKAGE)-$(VERSION).tar.bz2; then \ gpg --detach-sign --digest-algo SHA512 $(PACKAGE)-$(VERSION).tar.bz2; fi - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Version bump
Updating branch refs/heads/master
to f3d541ff7408695b1f147beaa5b2401ba8d53fc0 (commit)
from 64378690e53090696fc8cb3572b54bba246c9b5c (commit)
commit f3d541ff7408695b1f147beaa5b2401ba8d53fc0
Author: Enrico Tröger
Date: Mon May 20 16:11:01 2013 +0200
Version bump
configure.ac.in |2 +-
lib/gui.c |2 +-
xfce4-dict.1|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index a6937ee..c01ab0f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -2,7 +2,7 @@ dnl ***
dnl *** Version information ***
dnl ***
m4_define([xfce4_dict_version_major], [0])
-m4_define([xfce4_dict_version_minor], [6])
+m4_define([xfce4_dict_version_minor], [7])
m4_define([xfce4_dict_version_micro], [0])
m4_define([xfce4_dict_version_build], [r@REVISION@])
m4_define([xfce4_dict_version_tag], [])
diff --git a/lib/gui.c b/lib/gui.c
index 6ffb2f7..c733665 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -960,7 +960,7 @@ void dict_gui_about_dialog(GtkWidget *widget, DictData *dd)
"destroy-with-parent", TRUE,
"authors", authors,
"comments", _("A client program to query different
dictionaries."),
- "copyright", _("Copyright \302\251 2006-2012 Enrico Tröger"),
+ "copyright", _("Copyright \302\251 2006-2013 Enrico Tröger"),
"website",
"http://goodies.xfce.org/projects/applications/xfce4-dict";,
"logo", logo,
"translator-credits", _("translator-credits"),
diff --git a/xfce4-dict.1 b/xfce4-dict.1
index be4ae74..f27e44e 100644
--- a/xfce4-dict.1
+++ b/xfce4-dict.1
@@ -1,4 +1,4 @@
-.TH "XFCE4-DICT" "1" "December 31, 2009" "xfce4-dict 0.6.0" ""
+.TH "XFCE4-DICT" "1" "May 20, 2013" "xfce4-dict 0.7.0" ""
.SH "NAME"
xfce4-dict \(em a client program to query different dictionaries
.SH "SYNOPSIS"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Replace AM_CONFIG_HEADER macro by AC_CONFIG_HEADERS
Updating branch refs/heads/master to 3f4c07138192a3d79e7d44930460af258ea5603a (commit) from 9c7ea8858e8ae81a124e9730de7b58784cef9ab1 (commit) commit 3f4c07138192a3d79e7d44930460af258ea5603a Author: Enrico Tröger Date: Mon May 20 14:34:00 2013 +0200 Replace AM_CONFIG_HEADER macro by AC_CONFIG_HEADERS configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 391d48b..a6937ee 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -19,7 +19,7 @@ dnl *** dnl *** Initialize automake *** dnl *** AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE() m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] After clearing the query_buffer, set it to NULL (bug #10101)
Updating branch refs/heads/master
to 9c7ea8858e8ae81a124e9730de7b58784cef9ab1 (commit)
from 04f4fed48ce7ef80db04c9c5a21a9235ee366f7e (commit)
commit 9c7ea8858e8ae81a124e9730de7b58784cef9ab1
Author: Enrico Tröger
Date: Mon May 20 14:33:04 2013 +0200
After clearing the query_buffer, set it to NULL (bug #10101)
This is a very weak and not really sufficient fix for concurrent code
execution.
lib/dictd.c | 21 ++---
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/lib/dictd.c b/lib/dictd.c
index 8610fda..e97a5d6 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -363,6 +363,13 @@ static gint process_response_content(DictData *dd, gchar
**lines, gint line_no,
}
+static void clear_query_buffer(DictData *dd)
+{
+ g_free(dd->query_buffer);
+ dd->query_buffer = NULL;
+}
+
+
static gboolean process_server_response(DictData *dd)
{
gint max_lines, i;
@@ -383,14 +390,14 @@ static gboolean process_server_response(DictData *dd)
case SERVER_NOT_READY:
{
dict_gui_status_add(dd, _("The server is not ready."));
- g_free(dd->query_buffer);
+ clear_query_buffer(dd);
return FALSE;
}
case UNKNOWN_DATABASE:
{
dict_gui_status_add(dd,
_("Invalid dictionary specified. Please check
your preferences."));
- g_free(dd->query_buffer);
+ clear_query_buffer(dd);
return FALSE;
}
}
@@ -398,7 +405,7 @@ static gboolean process_server_response(DictData *dd)
if (! NZV(dd->query_buffer))
{
dict_gui_status_add(dd, _("Unknown error while querying the
server."));
- g_free(dd->query_buffer);
+ clear_query_buffer(dd);
return FALSE;
}
@@ -421,7 +428,7 @@ static gboolean process_server_response(DictData *dd)
TAG_ERROR, TAG_BOLD, NULL);
dict_gui_status_add(dd, "%s", tmp);
g_free(tmp);
- g_free(dd->query_buffer);
+ clear_query_buffer(dd);
/* if we had no luck searching a word, maybe we have a typo so
try searching with
* spell check and offer a Web search*/
@@ -454,7 +461,7 @@ static gboolean process_server_response(DictData *dd)
else if (strncmp("150", answer, 3) != 0 && dd->query_status !=
NOTHING_FOUND)
{
dict_gui_status_add(dd, _("Unknown error while querying the
server."));
- g_free(dd->query_buffer);
+ clear_query_buffer(dd);
return FALSE;
}
defs_found = atoi(answer + 4);
@@ -472,7 +479,7 @@ static gboolean process_server_response(DictData *dd)
max_lines = g_strv_length(lines);
if (lines == NULL || max_lines == 0)
{
- g_free(dd->query_buffer);
+ clear_query_buffer(dd);
return FALSE;
}
@@ -485,7 +492,7 @@ static gboolean process_server_response(DictData *dd)
i = process_response_content(dd, lines, i, max_lines, header,
body);
}
g_strfreev(lines);
- g_free(dd->query_buffer);
+ clear_query_buffer(dd);
g_string_free(header, TRUE);
g_string_free(body, TRUE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Initialise variable
Updating branch refs/heads/master to ff4f53e490976c6b708ba9df3f484282c8a068b9 (commit) from a54a8a0d2d9b6ef26c7986b9bdc4c09cd23b6965 (commit) commit ff4f53e490976c6b708ba9df3f484282c8a068b9 Author: Enrico Tröger Date: Sun Nov 18 15:16:26 2012 +0100 Initialise variable lib/dictd.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/dictd.c b/lib/dictd.c index 9929812..8610fda 100644 --- a/lib/dictd.c +++ b/lib/dictd.c @@ -502,7 +502,7 @@ static gint get_answer(gint fd, gchar **buffer) GString *str; gchar c; gchar ec[3]; - gint query_status; + gint query_status = NO_ERROR; if (buffer != NULL) str = g_string_sized_new(100); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix wrong header name
Updating branch refs/heads/master to a54a8a0d2d9b6ef26c7986b9bdc4c09cd23b6965 (commit) from 89698927704ff74f24ceb9e0e968190e849df8d1 (commit) commit a54a8a0d2d9b6ef26c7986b9bdc4c09cd23b6965 Author: Enrico Tröger Date: Sun Nov 18 15:16:07 2012 +0100 Fix wrong header name lib/prefs.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/prefs.c b/lib/prefs.c index 238aed4..0d95ad6 100644 --- a/lib/prefs.c +++ b/lib/prefs.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "common.h" #include "prefs.h" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] cleanup
Updating branch refs/heads/master to c071c1284c88fa4fc4f71169ca7d9e8a8a7f5912 (commit) from ee529bd9394ddb0d210c7477e9ed794eb825ab7f (commit) commit c071c1284c88fa4fc4f71169ca7d9e8a8a7f5912 Author: Enrico Tröger Date: Fri Nov 2 17:04:18 2012 +0100 cleanup Makefile.am |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 15a06e4..d24d776 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,6 @@ SUBDIRS = src po EXTRA_DIST = \ autogen.sh \ - wscript \ - waf \ README.I18N \ gigolo.desktop.in \ intltool-extract.in \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Drop Waf build system support and just use autotools
Updating branch refs/heads/master
to ee529bd9394ddb0d210c7477e9ed794eb825ab7f (commit)
from c80f3c0d55d7cec4c591ce8c98f05f19c8c3c48c (commit)
commit ee529bd9394ddb0d210c7477e9ed794eb825ab7f
Author: Enrico Tröger
Date: Fri Nov 2 17:01:28 2012 +0100
Drop Waf build system support and just use autotools
Let's call this 'happy distro packagers day'...
README| 24 ++-
configure | 103 --
waf | Bin 76329 -> 0 bytes
wscript | 237 -
4 files changed, 5 insertions(+), 359 deletions(-)
diff --git a/README b/README
index 3fc03a4..9947523 100644
--- a/README
+++ b/README
@@ -22,7 +22,6 @@ For compiling Gigolo, you will need the GTK (>= 2.12.0)
libraries
and header files. You will also need its dependency libraries and header
files, such as Pango, Cairo, Glib and ATK. All these files are available at
http://www.gtk.org.
-You also need Python for the included Waf build system.
Furthermore you need, of course, a C compiler as well as the intltool package.
@@ -34,27 +33,16 @@ building the code is easy:
Run the following commands::
-$ ./waf configure
-$ ./waf build
+$ ./configure
+$ make
(maybe as root)
-% ./waf install
+% make install
-To get a list of available options to customize your build, enable debugging
-or to use a different installation prefix, run::
-
-$ ./waf help
-
-
-Alternative installation using autotools
-
-
-You can use the usual autotools chain to configure, compile and install
-the sources by running::
+If there is no configure script, you probably need to run::
$ ./autogen.sh
-in the source directory.
-This is mainly intended for distro packagers and people with special needs.
+in the source directory before
Usage
@@ -83,8 +71,6 @@ Gigolo is distributed under the terms of the GNU General
Public License
as published by the Free Software Foundation; version 2 of the license.
A copy of this license can be found in the file COPYING included with
the source code of this program.
-The included Waf build system ("waf") is licensed under the
-New BSD License (http://www.opensource.org/licenses/bsd-license.php).
Ideas, questions, patches and bug reports
diff --git a/configure b/configure
deleted file mode 100755
index 929335c..000
--- a/configure
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# waf configure wrapper
-
-EXIT_FAILURE=1
-
-
-# Checks for Python interpreter. Honours $PYTHON if set. Stores path to
-# interpreter in $PYTHON.
-checkPython()
-{
- if [ -z "$PYTHON" ] ; then
- PYTHON="python"
- fi
- printf "Checking for Python\t\t\t : "
- ("$PYTHON" --version) < /dev/null > /dev/null 2>&1 || {
- printf "not found!\n"
- echo "Please make sure that the Python interpreter is available
in your PATH"
- echo "or invoke configure using the PYTHON flag, e.g."
- echo "$ PYTHON=/usr/local/bin/python ./waf configure "$@
- echo "Alternatively, you can run ./autogen.sh to use the
autotools chain"
- echo "to build and install the sources."
- exit $EXIT_FAILURE
- }
- printf "ok\n"
-}
-
-# Generates a Makefile.
-generateMakefile()
-{
- cat > Makefile << EOF
-#!/usr/bin/make -f
-# Waf Makefile wrapper
-
-all:
- @./waf build
-
-all-debug:
- @./waf -v build
-
-all-progress:
- @./waf -p build
-
-install:
- @if test -n "\$(DESTDIR)"; then \\
- ./waf install --destdir="\$(DESTDIR)"; \\
- else \\
- ./waf install; \\
- fi;
-
-uninstall:
- @if test -n "\$(DESTDIR)"; then \\
- ./waf uninstall --destdir="\$(DESTDIR)"; \\
- else \\
- ./waf uninstall; \\
- fi;
-
-clean:
- @./waf clean
-
-distclean:
- @./waf distclean
- @-rm -rf _build_
- @-rm -f Makefile
-
-distcheck:
- @./waf distcheck
-
-check:
- @./waf check
-
-dist:
- @./waf dist
-
-sign:
- @./waf --sign
-
-.PHONY: clean dist distclean check uninstall install all
-
-EOF
-
- cat > src/Makefile << EOF
-#!/usr/bin/make -f
-# Waf Makefile wrapper
-
-all:
- cd .. && ./waf build
-
-all-debug:
- cd .. && ./waf -v build
-
-clean:
- cd .. && ./waf clean
-
-EOF
-}
-
-checkPython $@
-generateMakefile
-
-./waf configure $@
-
-exit $?
diff --git a/waf b/waf
deleted file mode 100755
index 95ffdf3..000
Binary files a/waf and /dev/null differ
diff --git a/wscript b/wscript
deleted file mode 100644
index b7fa147..000
--- a/wscript
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/us
[Xfce4-commits] Use IT_PROG_INTLTOOL macro later so that --disable-nls option is considered properly
Updating branch refs/heads/master to c80f3c0d55d7cec4c591ce8c98f05f19c8c3c48c (commit) from 6d3364160fde466f0e7f6542197b3a5cc6de709f (commit) commit c80f3c0d55d7cec4c591ce8c98f05f19c8c3c48c Author: Enrico Tröger Date: Fri Nov 2 16:57:06 2012 +0100 Use IT_PROG_INTLTOOL macro later so that --disable-nls option is considered properly configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index ee77170..eecbbc0 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,6 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S -IT_PROG_INTLTOOL # GTK checks @@ -47,6 +46,7 @@ else fi AM_GLIB_GNU_GETTEXT +IT_PROG_INTLTOOL # workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) if test "x$MSGFMT" = "xno"; then AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix test expression
Updating branch refs/heads/master
to 6d3364160fde466f0e7f6542197b3a5cc6de709f (commit)
from b2f575463c8609d8d54f6e15945ea8059032194c (commit)
commit 6d3364160fde466f0e7f6542197b3a5cc6de709f
Author: Enrico Tröger
Date: Fri Nov 2 16:55:00 2012 +0100
Fix test expression
configure.ac |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2f5a659..ee77170 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,8 +37,7 @@ GETTEXT_PACKAGE=gigolo
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package.])
-if [ "${LINGUAS}" ]
-then
+if test "${LINGUAS}"; then
ALL_LINGUAS="${LINGUAS}"
else
if test -z "$conf_dir" ; then
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add new command-line option to auto connect bookmarks
Updating branch refs/heads/master
to 4dfba2d40e3d5bd287fa472908484b5727b4131a (commit)
from e800fd648fa1def4e8d0c5bf91bc6912699b28e0 (commit)
commit 4dfba2d40e3d5bd287fa472908484b5727b4131a
Author: Enrico Tröger
Date: Sun May 6 16:43:03 2012 +0200
Add new command-line option to auto connect bookmarks
gigolo.1.in |2 ++
src/main.c | 40
2 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/gigolo.1.in b/gigolo.1.in
index e5efe6b..01a2da5 100644
--- a/gigolo.1.in
+++ b/gigolo.1.in
@@ -13,6 +13,8 @@ bookmarks to such.
Homepage: http://www.uvena.de/gigolo/
.SH "OPTIONS"
If called without any arguments, the Gigolo main window is shown.
+.IP "\fB-a\fP, \fB\-\-auto\-connect\fP " 10
+Connect all bookmarks which are marked as 'auto connect' and exit.
.IP "\fB-i\fP, \fB\-\-new-instance\fP " 10
Don't find and show an already running instance of Gigolo, instead
force opening a new instance.
diff --git a/src/main.c b/src/main.c
index 903ebae..3a3b705 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,10 +39,12 @@
static gboolean show_version = FALSE;
static gboolean list_schemes = FALSE;
static gboolean new_instance = FALSE;
+static gboolean auto_connect = FALSE;
extern gboolean verbose_mode;
static GOptionEntry cli_options[] =
{
+ { "auto-connect", 'a', 0, G_OPTION_ARG_NONE, &auto_connect, N_("Connect
all bookmarks marked as 'auto connect' and exit"), NULL },
{ "new-instance", 'i', 0, G_OPTION_ARG_NONE, &new_instance, N_("Ignore
running instances, enforce opening a new instance"), NULL },
{ "list-schemes", 'l', 0, G_OPTION_ARG_NONE, &list_schemes, N_("Print a
list of supported URI schemes"), NULL },
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose_mode, N_("Be
verbose"), NULL },
@@ -51,6 +53,37 @@ static GOptionEntry cli_options[] =
};
+static gboolean auto_connect_bookmarks(void)
+{
+ GigoloBackendGVFS *backend_gvfs;
+ GigoloSettings *settings;
+ GigoloBookmarkList *bookmarks;
+ GigoloBookmark *bm;
+ guint i;
+ gchar *uri;
+
+ backend_gvfs = gigolo_backend_gvfs_new();
+ settings = gigolo_settings_new();
+ bookmarks = gigolo_settings_get_bookmarks(settings);
+
+ for (i = 0; i < bookmarks->len; i++)
+ {
+ bm = g_ptr_array_index(bookmarks, i);
+ if (gigolo_bookmark_get_autoconnect(bm) && !
gigolo_bookmark_get_should_not_autoconnect(bm))
+ {
+ uri = gigolo_bookmark_get_uri_escaped(bm);
+ /* Mounting happens asynchronously here and so we don't
wait until it is finished
+* nor de we get any feedback or errors.
+* TODO make this synchronous(looping and checking) and
check for errors */
+ gigolo_backend_gvfs_mount_uri(backend_gvfs, uri, NULL,
NULL, FALSE);
+ g_free(uri);
+ }
+ }
+
+ return TRUE;
+}
+
+
static void print_supported_schemes(void)
{
const gchar* const *supported;
@@ -102,6 +135,13 @@ gint main(gint argc, gchar** argv)
return EXIT_SUCCESS;
}
+ if (auto_connect)
+ {
+ gboolean ret = auto_connect_bookmarks();
+
+ return ret ? EXIT_SUCCESS : EXIT_FAILURE;
+ }
+
if (! new_instance)
{
gis = gigolo_single_instance_new();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix name of panel plugin desktop file
Updating branch refs/heads/master to bc209b1c3fca21c6d764c956ceeb21241689a5f1 (commit) from 68c07f6e6965740dc4fb3717fede8962f299aa45 (commit) commit bc209b1c3fca21c6d764c956ceeb21241689a5f1 Author: Enrico Tröger Date: Sun May 6 11:16:13 2012 +0200 Fix name of panel plugin desktop file po/POTFILES.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index db8a5e5..f4caeaa 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ -panel-plugin/xfce4-dict-plugin.desktop.in.in +panel-plugin/xfce4-dict-plugin.desktop.in panel-plugin/xfce4-dict-plugin.c src/popup_plugin.c src/xfce4-dict.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix panel plugin build
Updating branch refs/heads/master to 68c07f6e6965740dc4fb3717fede8962f299aa45 (commit) from 509f8c0e2878a9ac169fe84b75dbfb3004b0b319 (commit) commit 68c07f6e6965740dc4fb3717fede8962f299aa45 Author: Enrico Tröger Date: Sat May 5 18:41:05 2012 +0200 Fix panel plugin build - Don't use a versioned library. - Build as a module. - Only export needed symbols. (shamelessly copied from xfce4-screenshooter, thanks Samuli and Jérôme) panel-plugin/Makefile.am |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 0eac716..452cd2c 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -15,6 +15,13 @@ libxfce4dict_la_CFLAGS = \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @GTHREAD_CFLAGS@ +libxfce4dict_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ + $(PLATFORM_LDFLAGS) + libxfce4dict_la_LIBADD = \ $(LIBXFCE4PANEL_LIBS) \ $(LIBXFCE4UI_LIBS) \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Drop SexyIconEntry and use the icon features of GtkEntry directly
Updating branch refs/heads/master
to 509f8c0e2878a9ac169fe84b75dbfb3004b0b319 (commit)
from 2bc550388cf3bcee3d67a7fcd423457fa2b24419 (commit)
commit 509f8c0e2878a9ac169fe84b75dbfb3004b0b319
Author: Enrico Tröger
Date: Sat May 5 01:19:42 2012 +0200
Drop SexyIconEntry and use the icon features of GtkEntry directly
Also drop XfdSearchEntry which is now also obsolete when using the icon
features of GtkEntry.
lib/Makefile.am |4 -
lib/common.c |3 +-
lib/gui.c| 31 +-
lib/searchentry.c| 147 --
lib/searchentry.h| 56 ---
lib/sexy-icon-entry.c| 967 --
lib/sexy-icon-entry.h| 100
panel-plugin/xfce4-dict-plugin.c | 17 +-
8 files changed, 28 insertions(+), 1297 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5eac26f..15e26f9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,10 +13,6 @@ libdict_la_SOURCES =
\
libdict.h
\
prefs.c
\
prefs.h
\
- sexy-icon-entry.c
\
- sexy-icon-entry.h
\
- searchentry.c
\
- searchentry.h
\
speedreader.c
\
speedreader.h
\
spell.c
\
diff --git a/lib/common.c b/lib/common.c
index 2a2967e..6154ec8 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -40,7 +40,6 @@
#include "spell.h"
#include "dictd.h"
#include "gui.h"
-#include "searchentry.h"
@@ -245,7 +244,7 @@ void dict_search_word(DictData *dd, const gchar *word)
}
/* remove leading and trailing spaces */
g_strstrip(dd->searched_word);
- xfd_search_entry_prepend_text(XFD_SEARCH_ENTRY(dd->main_combo),
dd->searched_word);
+ gtk_combo_box_prepend_text(GTK_COMBO_BOX(dd->main_combo),
dd->searched_word);
dict_gui_clear_text_buffer(dd);
diff --git a/lib/gui.c b/lib/gui.c
index 75c3a2c..6ffb2f7 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -34,8 +34,6 @@
#include "common.h"
#include "gui.h"
-#include "sexy-icon-entry.h"
-#include "searchentry.h"
#include "inline-icon.h"
#include "speedreader.h"
@@ -499,17 +497,18 @@ static void entry_activate_cb(GtkEntry *entry, DictData
*dd)
}
-static void entry_icon_pressed_cb(SexyIconEntry *entry, gint icon_pos, gint
button, DictData *dd)
+static void entry_icon_release_cb(GtkEntry *entry, GtkEntryIconPosition
icon_pos,
+ GdkEventButton *event, DictData *dd)
{
- if (button != 1)
+ if (event->button != 1)
return;
- if (icon_pos == SEXY_ICON_ENTRY_PRIMARY)
+ if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
{
entry_activate_cb(NULL, dd);
gtk_widget_grab_focus(dd->main_entry);
}
- else if (icon_pos == SEXY_ICON_ENTRY_SECONDARY)
+ else if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
{
dict_gui_clear_text_buffer(dd);
gtk_entry_set_text(GTK_ENTRY(dd->main_entry), "");
@@ -521,11 +520,14 @@ static void entry_icon_pressed_cb(SexyIconEntry *entry,
gint icon_pos, gint butt
static void combo_changed_cb(GtkComboBox *combo, DictData *dd)
{
- gchar *text = gtk_combo_box_get_active_text(combo);
-
- dict_search_word(dd, text);
+ GtkTreeIter iter;
- g_free(text);
+ if (gtk_combo_box_get_active_iter(combo, &iter))
+ {
+ gchar *text = gtk_combo_box_get_active_text(combo);
+ dict_search_word(dd, text);
+ g_free(text);
+ }
}
@@ -755,15 +757,18 @@ void dict_gui_create_main_window(DictData *dd)
gtk_widget_show(label_box);
gtk_box_pack_start(GTK_BOX(entry_box), label_box, TRUE, TRUE, 5);
- dd->main_combo = xfd_search_entry_new(_("Search term"));
+ dd->main_combo = gtk_combo_box_entry_new_text();
gtk_widget_show(dd->main_combo);
gtk_box_pack_start(GTK_BOX(label_box), dd->main_combo, TRUE, TRUE, 0);
- g_signal_connect(dd->main_combo, "active-changed",
G_CALLBACK(combo_changed_cb), dd);
+ g_signal_connect(dd->main_
[Xfce4-commits] Depend on Xfce 4.10 and its GTK/GLib requirements
Updating branch refs/heads/master to 2bc550388cf3bcee3d67a7fcd423457fa2b24419 (commit) from a0e823bdf7df494f2806ec3d369b5c3114ba777e (commit) commit 2bc550388cf3bcee3d67a7fcd423457fa2b24419 Author: Enrico Tröger Date: Sat May 5 00:33:37 2012 +0200 Depend on Xfce 4.10 and its GTK/GLib requirements configure.ac.in | 11 +-- 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 3bf62b7..391d48b 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -52,12 +52,11 @@ XDT_I18N([@LINGUAS@]) dnl *** dnl *** Check for required packages *** dnl *** -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0.0]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0]) +XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) XDT_CHECK_PACKAGE([X11], [x11]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update copyright years
Updating branch refs/heads/master
to a0e823bdf7df494f2806ec3d369b5c3114ba777e (commit)
from b8779cc8caff8fe28480f8c31188d880fd4b9247 (commit)
commit a0e823bdf7df494f2806ec3d369b5c3114ba777e
Author: Enrico Tröger
Date: Sat May 5 00:18:07 2012 +0200
Update copyright years
lib/gui.c|4 ++--
src/xfce4-dict.c |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index 485c110..75c3a2c 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2011 Enrico Tröger
+ * Copyright 2006-2012 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -955,7 +955,7 @@ void dict_gui_about_dialog(GtkWidget *widget, DictData *dd)
"destroy-with-parent", TRUE,
"authors", authors,
"comments", _("A client program to query different
dictionaries."),
- "copyright", _("Copyright \302\251 2006-2011 Enrico Tröger"),
+ "copyright", _("Copyright \302\251 2006-2012 Enrico Tröger"),
"website",
"http://goodies.xfce.org/projects/applications/xfce4-dict";,
"logo", logo,
"translator-credits", _("translator-credits"),
diff --git a/src/xfce4-dict.c b/src/xfce4-dict.c
index f39bec6..6285c35 100644
--- a/src/xfce4-dict.c
+++ b/src/xfce4-dict.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2011 Enrico Tröger
+ * Copyright 2006-2012 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -142,7 +142,7 @@ gint main(gint argc, gchar *argv[])
if (show_version)
{
g_print("%s %s (Xfce %s)\n\n", PACKAGE, PACKAGE_VERSION,
xfce_version_string());
- g_print("%s\n", "Copyright (c) 2006-2011");
+ g_print("%s\n", "Copyright (c) 2006-2012");
g_print("\tEnrico Tröger \n\n");
g_print(_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print("\n");
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Replace libxfcegui4 by libxfce4ui
Updating branch refs/heads/master to b8779cc8caff8fe28480f8c31188d880fd4b9247 (commit) from cb916736731da50ee3c8bdf5087e708d3f4e5841 (commit) commit b8779cc8caff8fe28480f8c31188d880fd4b9247 Author: Enrico Tröger Date: Sat May 5 00:14:53 2012 +0200 Replace libxfcegui4 by libxfce4ui configure.ac.in |1 + lib/Makefile.am |4 ++-- panel-plugin/Makefile.am |4 ++-- panel-plugin/xfce4-dict-plugin.c |3 +-- panel-plugin/xfce4-dict-plugin.desktop.in.in |7 --- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index a9162ba..3bf62b7 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -55,6 +55,7 @@ dnl *** XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0.0]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0]) XDT_CHECK_PACKAGE([X11], [x11]) diff --git a/lib/Makefile.am b/lib/Makefile.am index ccb68ae..5eac26f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -26,14 +26,14 @@ libdict_la_SOURCES = \ libdict_la_CFLAGS = \ -I$(top_srcdir) \ - $(LIBXFCEGUI4_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS)\ $(LIBXFCE4PANEL_CFLAGS) \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @GTHREAD_CFLAGS@ libdict_la_LIBADD = \ $(LIBXFCE4PANEL_LIBS) \ - $(LIBXFCEGUI4_LIBS) \ + $(LIBXFCE4UI_LIBS) \ @GTHREAD_LIBS@ diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 02d6315..0eac716 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -9,7 +9,7 @@ libxfce4dict_la_SOURCES = \ libxfce4dict_la_CFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ - $(LIBXFCEGUI4_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS)\ $(LIBXFCE4PANEL_CFLAGS) \ -DG_LOG_DOMAIN=\"xfce4-dict-plugin\"\ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @@ -17,7 +17,7 @@ libxfce4dict_la_CFLAGS = \ libxfce4dict_la_LIBADD = \ $(LIBXFCE4PANEL_LIBS) \ - $(LIBXFCEGUI4_LIBS) \ + $(LIBXFCE4UI_LIBS) \ @GTHREAD_LIBS@ \ @X11_LIBS@ \ $(top_builddir)/lib/libdict.la diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c index 4f6fb30..1b3198b 100644 --- a/panel-plugin/xfce4-dict-plugin.c +++ b/panel-plugin/xfce4-dict-plugin.c @@ -24,9 +24,8 @@ #include #include -#include +#include #include -#include #include #include diff --git a/panel-plugin/xfce4-dict-plugin.desktop.in.in b/panel-plugin/xfce4-dict-plugin.desktop.in.in deleted file mode 100644 index 75a9433..000 --- a/panel-plugin/xfce4-dict-plugin.desktop.in.in +++ /dev/null @@ -1,7 +0,0 @@ -[Xfce Panel] -Type=X-XFCE-PanelPlugin -Encoding=UTF-8 -_Name=Dictionary -_Comment=A plugin to query different dictionaries. -Icon=xfce4-dict -X-XFCE-Exec=@PLUGIN_PATH@/xfce4-dict-plugin ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Renew build system and build panel plugin as library
Updating branch refs/heads/master
to cb916736731da50ee3c8bdf5087e708d3f4e5841 (commit)
from 32741dd842130cbf3f31bc3b57c4eae4d3ff8689 (commit)
commit cb916736731da50ee3c8bdf5087e708d3f4e5841
Author: Enrico Tröger
Date: Sat May 5 00:06:24 2012 +0200
Renew build system and build panel plugin as library
autogen.sh |2 +-
configure.ac.in| 87
panel-plugin/Makefile.am | 38 -
panel-plugin/xfce4-dict-plugin.c |2 +-
desktop.in.in => xfce4-dict-plugin.desktop.in} |4 +-
5 files changed, 75 insertions(+), 58 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 5564b30..ed264be 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@
# Written for Xfce by Benedikt Meurer .
#
-XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
+XDT_AUTOGEN_REQUIRED_VERSION="4.9.0"
export XDT_AUTOGEN_REQUIRED_VERSION
(type xdt-autogen) >/dev/null 2>&1 || {
diff --git a/configure.ac.in b/configure.ac.in
index baec65c..a9162ba 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,37 +1,57 @@
-dnl configure.ac.in
-dnl
-dnl xfce4-dict
-dnl
+dnl ***
+dnl *** Version information ***
+dnl ***
+m4_define([xfce4_dict_version_major], [0])
+m4_define([xfce4_dict_version_minor], [6])
+m4_define([xfce4_dict_version_micro], [0])
+m4_define([xfce4_dict_version_build], [r@REVISION@])
+m4_define([xfce4_dict_version_tag], [])
+m4_define([xfce4_dict_version],
[xfce4_dict_version_major().xfce4_dict_version_minor().xfce4_dict_version_micro()ifelse(xfce4_dict_version_tag(),
[git], [xfce4_dict_version_tag()-xfce4_dict_version_build()],
[xfce4_dict_version_tag()])])
-dnl version info
-m4_define([dict_version], [0.6.0])
+dnl ***
+dnl *** Initialize autoconf ***
+dnl ***
+AC_COPYRIGHT([Copyright (c) 2006-2012 Enrico Tröger. All rights reserved.])
+AC_INIT([xfce4-dict-plugin], [xfce4_dict_version],
[http://bugzilla.xfce.org/], [xfce4-dict-plugin])
+AC_PREREQ([2.50])
-dnl init autoconf
-AC_INIT([xfce4-dict], [dict_version], [http://bugzilla.xfce.org/])
-AC_PREREQ([2.53])
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-dnl init automake
-DICT_VERSION=dict_version
-AM_INIT_AUTOMAKE([xfce4-dict], [$DICT_VERSION])
+dnl ***
+dnl *** Initialize automake ***
+dnl ***
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-dnl check for basic programs
-AC_PROG_CC
+dnl
+dnl *** Check for basic programs ***
+dnl
+AC_PROG_CC()
AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_INTLTOOL
+AC_PROG_LD()
+AC_PROG_INSTALL()
+AC_PROG_INTLTOOL()
-dnl check for standard header files
-AC_HEADER_STDC
+dnl ***
+dnl *** Disable static libs ***
+dnl ***
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
-dnl check for i18n support
+dnl **
+dnl *** Check for standard headers ***
+dnl **
+AC_HEADER_STDC()
+AC_SEARCH_LIBS(floor, m)
+
+dnl **
+dnl *** Check for i18n support ***
+dnl **
XDT_I18N([@LINGUAS@])
-dnl check for required packages
+dnl ***
+dnl *** Check for required packages ***
+dnl ***
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0.0])
@@ -39,15 +59,16 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],
[4.4.0.0])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0])
XDT_CHECK_PACKAGE([X11], [x11])
-AC_SEARCH_LIBS(floor, m)
-
-dnl check for debugging support
+dnl ***
+dnl *** Check for debugging support ***
+dnl ***
XDT_FEATURE_DEBUG()
+
AC_OUTPUT([
-Makefile
-lib/Makefile
-panel-plugin/Makefile
-src/Makefile
-po/Makefile.in
+ Makefile
+ lib/Makefile
+ panel-plugin/Makefile
+ src/Makefile
+ po/Makefile.in
])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 9b83fc9..02d6315 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,19 +1,21 @@
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-dict-plugin
+plugindir = $(libdir)/xfce4/panel/plugins
+plugin_LTLIBRARIES = libxfce4dict.la
-xfce4_dict_plugin_SOURCES =\
+
+libxfce4dict_la_SOURCES = \
xfce4-dict-plu
[Xfce4-commits] Properly skip leading slashes when validating path and share fields
Updating branch refs/heads/master
to aff81c5c36e233d58671663634f35f03fc76b22c (commit)
from 78c0bf1f89da169a3aa6c8999d002fc216870957 (commit)
commit aff81c5c36e233d58671663634f35f03fc76b22c
Author: Enrico Tröger
Date: Sun Apr 22 21:58:59 2012 +0200
Properly skip leading slashes when validating path and share fields
src/bookmarkeditdialog.c |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 3158606..16b1cf4 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -294,7 +294,9 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
tmp =
gtk_entry_get_text(GTK_ENTRY(priv->path_entry));
if (tmp[0] == '/')
{ /* remove leading slashes */
-
gtk_entry_set_text(GTK_ENTRY(priv->path_entry), tmp + 1);
+ gchar *path = g_strdup(tmp);
+
gtk_entry_set_text(GTK_ENTRY(priv->path_entry), path + 1);
+ g_free(path);
}
}
if (! error && gtk_widget_get_parent(priv->share_entry)
!= NULL)
@@ -302,7 +304,9 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
tmp =
gtk_entry_get_text(GTK_ENTRY(priv->share_entry));
if (tmp[0] == '/')
{ /* remove leading slashes */
-
gtk_entry_set_text(GTK_ENTRY(priv->share_entry), tmp + 1);
+ gchar *share = g_strdup(tmp);
+
gtk_entry_set_text(GTK_ENTRY(priv->share_entry), share + 1);
+ g_free(share);
}
}
if (! error)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix WebDav path parsing when there is no path
Updating branch refs/heads/master
to 78c0bf1f89da169a3aa6c8999d002fc216870957 (commit)
from 3ecf7dd04e9a755fa8f1e675653e6145a07366b2 (commit)
commit 78c0bf1f89da169a3aa6c8999d002fc216870957
Author: Enrico Tröger
Date: Sun Apr 22 21:51:05 2012 +0200
Fix WebDav path parsing when there is no path
src/bookmark.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bookmark.c b/src/bookmark.c
index 42874b9..bfc2ec3 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -236,12 +236,12 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
/* remove trailing slashes */
l = strlen(end);
- while (end[l-1] == '/')
+ while (*end != '\0' && end[l-1] == '/')
{
l--;
}
-
- priv->path = g_strndup(end, l);
+ if (l > 0)
+ priv->path = g_strndup(end, l);
}
return TRUE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Tests should fail if URI details won't match
Updating branch refs/heads/master to 3ecf7dd04e9a755fa8f1e675653e6145a07366b2 (commit) from bafaa0dd0e4978f51f65acafb61cd1f279b5b674 (commit) commit 3ecf7dd04e9a755fa8f1e675653e6145a07366b2 Author: Enrico Tröger Date: Sun Apr 22 21:49:02 2012 +0200 Tests should fail if URI details won't match tests/uri_parsing.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/uri_parsing.c b/tests/uri_parsing.c index e9cd493..68852dc 100644 --- a/tests/uri_parsing.c +++ b/tests/uri_parsing.c @@ -131,7 +131,8 @@ gint main(gint argc, gchar **argv) } if (! gigolo_str_equal(tests[i].output, new_uri)) return 1; - check_if_details_equal(bm, &tests[i]); + if (! check_if_details_equal(bm, &tests[i])) + return 1; g_free(new_uri); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] WebDav path is not the same as a Samba share, so treat them differently
Updating branch refs/heads/master
to bafaa0dd0e4978f51f65acafb61cd1f279b5b674 (commit)
from aa724c66c62ed53d32243a8f8f71d9a85e80bdd4 (commit)
commit bafaa0dd0e4978f51f65acafb61cd1f279b5b674
Author: Enrico Tröger
Date: Sun Apr 22 21:48:10 2012 +0200
WebDav path is not the same as a Samba share, so treat them differently
tests/uri_parsing.c | 39 ++-
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/tests/uri_parsing.c b/tests/uri_parsing.c
index 612cad1..e9cd493 100644
--- a/tests/uri_parsing.c
+++ b/tests/uri_parsing.c
@@ -36,6 +36,7 @@ typedef struct
const gchar *host;
const gchar *domain;
const gchar *share;
+ const gchar *path;
const guint port;
const gchar *user;
} TestURI;
@@ -65,6 +66,10 @@ static gboolean check_if_details_equal(GigoloBookmark *bm,
const TestURI *tu)
if (! gigolo_str_equal(val, tu->share))
return report_fail(tu, "share", val, tu->share);
+ val = gigolo_bookmark_get_path(bm);
+ if (! gigolo_str_equal(val, tu->path))
+ return report_fail(tu, "path", val, tu->path);
+
val = gigolo_bookmark_get_domain(bm);
if (! gigolo_str_equal(val, tu->domain))
return report_fail(tu, "domain", val, tu->domain);
@@ -88,23 +93,23 @@ gint main(gint argc, gchar **argv)
{
const TestURI tests[] =
{
- { "http://localhost";, "http://localhost/";, "http", "localhost",
NULL, NULL, 0, NULL },
- { "http://localhost:8080/";, "http://localhost:8080/";, "http",
"localhost", NULL, NULL, 8080, NULL },
- { "sftp://user@localhost:22";, "sftp://user@localhost/";, "sftp",
"localhost", NULL, NULL, 22, "user" },
- { "sftp://user@localhost:8022";, "sftp://user@localhost:8022/";,
"sftp", "localhost", NULL, NULL, 8022, "user" },
- { "ftp://localhost";, "ftp://localhost/";, "ftp", "localhost",
NULL, NULL, 0, NULL },
- { "ftp://user@localhost:21/a";, "ftp://user@localhost/";, "ftp",
"localhost", NULL, NULL, 21, "user" },
- { "ftp://user@usershost@localhost:8021/a";,
"ftp://user@usershost@localhost:8021/";, "ftp", "localhost", NULL, NULL, 8021,
"user@usershost" },
- { "smb://user@localhost", "smb://user@localhost/", "smb",
"localhost", NULL, NULL, 0, "user"},
- { "smb://user@localhost/share", "smb://user@localhost/share/",
"smb", "localhost", NULL, "share", 0, "user"},
- { "smb://user@localhost/share/", "smb://user@localhost/share/",
"smb", "localhost", NULL, "share", 0, "user"},
- { "smb://user@name@localhost/share/and/",
"smb://user@name@localhost/share/", "smb", "localhost", NULL, "share", 0,
"user@name"},
- { "smb://domain;user@localhost/share/and/more",
"smb://domain;user@localhost/share/", "smb", "localhost", "domain", "share", 0,
"user"},
- { "dav://localhost.localdomain/",
"dav://localhost.localdomain/", "dav", "localhost.localdomain", NULL, NULL, 0,
NULL},
- { "dav://localhost.localdomain",
"dav://localhost.localdomain/", "dav", "localhost.localdomain", NULL, NULL, 0,
NULL},
- { "dav://u...@dav.domain.tld/owncloud/files/webdav.php",
"dav://u...@dav.domain.tld/owncloud/files/webdav.php", "dav", "dav.domain.tld",
NULL, "owncloud/files/webdav.php", 0, "user"},
- { "davs://user@localhost.localdomain/path/path2/more//",
"davs://user@localhost.localdomain/path/path2/more/", "davs",
"localhost.locaaldomain", NULL, "path/path2/more", 0, "user"},
- { NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL }
+ { "http://localhost";, "http://localhost/";, "http", "localhost",
NULL, NULL, NULL, 0, NULL },
+ { "http://localhost:8080/";, "http://localhost:8080/";, "http",
"localhost", NULL, NULL, NULL, 8080, NULL },
+ { "sftp://user@localhost:22";,
[Xfce4-commits] Add a tooltip for the folder field in the bookmark create dialog to make clear for what it is used
Updating branch refs/heads/master
to aa724c66c62ed53d32243a8f8f71d9a85e80bdd4 (commit)
from 175425f853a3e2066f283fa9d82357280fa53930 (commit)
commit aa724c66c62ed53d32243a8f8f71d9a85e80bdd4
Author: Enrico Tröger
Date: Sun Apr 22 19:34:09 2012 +0200
Add a tooltip for the folder field in the bookmark create dialog to make
clear for what it is used
src/bookmarkeditdialog.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index c25f051..3158606 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -1085,6 +1085,8 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
priv->port_spin = gtk_spin_button_new_with_range(0, 65535, 1);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->port_spin), 0.0);
gtk_widget_set_tooltip_text(priv->port_spin, _("Set the port to 0 to
use the default port"));
+ gtk_widget_set_tooltip_text(priv->folder_entry,
+ _("This is not used for the actual mount, only necessary for
opening the mount point in a file browser"));
priv->user_entry = gtk_entry_new();
priv->domain_entry = gtk_entry_new();
priv->share_combo = gtk_combo_box_entry_new_text();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] After creating/editing a bookmark, update the list of mounts
Updating branch refs/heads/master
to 175425f853a3e2066f283fa9d82357280fa53930 (commit)
from 6e35cd6300593669ba9194329592566992d17d8d (commit)
commit 175425f853a3e2066f283fa9d82357280fa53930
Author: Enrico Tröger
Date: Sun Apr 22 19:30:38 2012 +0200
After creating/editing a bookmark, update the list of mounts
Since we display bookmark names for matching mounts, we should update
the list in case the bookmark name changed.
src/backendgvfs.c |9 +
src/backendgvfs.h |2 ++
src/window.c |2 ++
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/backendgvfs.c b/src/backendgvfs.c
index 98d75fa..f52dce9 100644
--- a/src/backendgvfs.c
+++ b/src/backendgvfs.c
@@ -545,6 +545,15 @@ void gigolo_backend_gvfs_unmount_mount(GigoloBackendGVFS
*backend, gpointer moun
}
+void gigolo_backend_gvfs_update_mounts_and_volumes(GigoloBackendGVFS *backend)
+{
+ GVolumeMonitor *gvm;
+
+ gvm = g_volume_monitor_get();
+ mount_volume_changed_cb(gvm, NULL, backend);
+}
+
+
static void mount_ready_cb(GFile *location, GAsyncResult *res, MountInfo *mi)
{
gchar *uri;
diff --git a/src/backendgvfs.h b/src/backendgvfs.h
index ada2431..33466ac 100644
--- a/src/backendgvfs.h
+++ b/src/backendgvfs.h
@@ -94,6 +94,8 @@ void
gigolo_backend_gvfs_get_name_and_uri_from_mount (gpointer mount, gchar *
gboolean gigolo_backend_gvfs_mount_volume
(GigoloBackendGVFS *backend, GtkWindow *window, gpointer vol);
void gigolo_backend_gvfs_unmount_mount
(GigoloBackendGVFS *backend, gpointer mount, GtkWindow *parent);
+void gigolo_backend_gvfs_update_mounts_and_volumes
(GigoloBackendGVFS *backend);
+
void gigolo_backend_gvfs_mount_uri
(GigoloBackendGVFS *backend,
const gchar *uri,
GtkWindow *parent,
diff --git a/src/window.c b/src/window.c
index b678c75..43e2004 100644
--- a/src/window.c
+++ b/src/window.c
@@ -920,6 +920,8 @@ void gigolo_window_update_bookmarks(GigoloWindow *window)
/* update the popup menu items */
tree_selection_changed_cb(NULL, window);
+
+ gigolo_backend_gvfs_update_mounts_and_volumes(priv->backend_gvfs);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Rename gigolo_bookmark_bookmark_clear into gigolo_bookmark_clear
Updating branch refs/heads/master
to 6e35cd6300593669ba9194329592566992d17d8d (commit)
from 4df08a88b727d3ff827d6cfb3b2da9cee9ce41d2 (commit)
commit 6e35cd6300593669ba9194329592566992d17d8d
Author: Enrico Tröger
Date: Sun Apr 22 19:24:24 2012 +0200
Rename gigolo_bookmark_bookmark_clear into gigolo_bookmark_clear
tests/uri_parsing.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tests/uri_parsing.c b/tests/uri_parsing.c
index eec492d..612cad1 100644
--- a/tests/uri_parsing.c
+++ b/tests/uri_parsing.c
@@ -116,7 +116,7 @@ gint main(gint argc, gchar **argv)
for (i = 0; tests[i].input != NULL; i++)
{
- gigolo_bookmark_bookmark_clear(bm);
+ gigolo_bookmark_clear(bm);
gigolo_bookmark_parse_uri(bm, tests[i].input);
new_uri = gigolo_bookmark_get_uri(bm);
if (! gigolo_str_equal(tests[i].output, new_uri))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Rename gigolo_bookmark_bookmark_clear into gigolo_bookmark_clear
Updating branch refs/heads/master
to 4df08a88b727d3ff827d6cfb3b2da9cee9ce41d2 (commit)
from ef9b15151046c73f2f8895724bc7aff70afa26e5 (commit)
commit 4df08a88b727d3ff827d6cfb3b2da9cee9ce41d2
Author: Enrico Tröger
Date: Sun Apr 22 19:23:52 2012 +0200
Rename gigolo_bookmark_bookmark_clear into gigolo_bookmark_clear
src/bookmark.c | 14 +++---
src/bookmark.h |2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/bookmark.c b/src/bookmark.c
index d8c2341..42874b9 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -55,7 +55,7 @@ static void gigolo_bookmark_finalize
(GObject *object);
G_DEFINE_TYPE(GigoloBookmark, gigolo_bookmark, G_TYPE_OBJECT);
-void gigolo_bookmark_bookmark_clear(GigoloBookmark *bookmark)
+void gigolo_bookmark_clear(GigoloBookmark *bookmark)
{
GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark);
@@ -96,7 +96,7 @@ static void gigolo_bookmark_class_init(GigoloBookmarkClass
*klass)
static void gigolo_bookmark_finalize(GObject *object)
{
- gigolo_bookmark_bookmark_clear(GIGOLO_BOOKMARK(object));
+ gigolo_bookmark_clear(GIGOLO_BOOKMARK(object));
G_OBJECT_CLASS(gigolo_bookmark_parent_class)->finalize(object);
}
@@ -115,7 +115,7 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
if (priv->scheme == NULL || s == NULL)
{
verbose("Error parsing URI '%s' at reading URI scheme", uri);
- gigolo_bookmark_bookmark_clear(bookmark);
+ gigolo_bookmark_clear(bookmark);
return FALSE;
}
s += 3;
@@ -143,7 +143,7 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
if (l == 0)
{
verbose("Error parsing URI '%s' at reading username",
uri);
- gigolo_bookmark_bookmark_clear(bookmark);
+ gigolo_bookmark_clear(bookmark);
return FALSE;
}
tmp = g_strndup(s, l);
@@ -171,7 +171,7 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
if (! hostend || hostend > end)
{
verbose("Error parsing URI '%s', missing ']'", uri);
- gigolo_bookmark_bookmark_clear(bookmark);
+ gigolo_bookmark_clear(bookmark);
return FALSE;
}
l = 0;
@@ -250,7 +250,7 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
static void gigolo_bookmark_init(GigoloBookmark *self)
{
- gigolo_bookmark_bookmark_clear(self);
+ gigolo_bookmark_clear(self);
}
@@ -286,7 +286,7 @@ void gigolo_bookmark_clone(GigoloBookmark *dst, const
GigoloBookmark *src)
priv_src = GIGOLO_BOOKMARK_GET_PRIVATE(src);
/* free existing strings and data */
- gigolo_bookmark_bookmark_clear(dst);
+ gigolo_bookmark_clear(dst);
/* copy from src to dst */
priv_dst->name = g_strdup(priv_src->name);
diff --git a/src/bookmark.h b/src/bookmark.h
index a9e3dc0..9cecaa2 100644
--- a/src/bookmark.h
+++ b/src/bookmark.h
@@ -93,7 +93,7 @@ void
gigolo_bookmark_set_should_not_autoconnect (GigoloBookmark *bookmark, gb
gboolean gigolo_bookmark_parse_uri
(GigoloBookmark *bookmark, const gchar *uri);
-void gigolo_bookmark_bookmark_clear (GigoloBookmark
*bookmark);
+void gigolo_bookmark_clear
(GigoloBookmark *bookmark);
const gchar* gigolo_bookmark_get_color (GigoloBookmark
*bookmark);
void gigolo_bookmark_set_color
(GigoloBookmark *bookmark, const gchar *color);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Validate an entered custom URI by trying to parse it
Updating branch refs/heads/master
to ef9b15151046c73f2f8895724bc7aff70afa26e5 (commit)
from a0b7fa48913515b7e9d006b1988e079ea8ed2a88 (commit)
commit ef9b15151046c73f2f8895724bc7aff70afa26e5
Author: Enrico Tröger
Date: Sun Apr 22 19:21:03 2012 +0200
Validate an entered custom URI by trying to parse it
src/bookmarkeditdialog.c | 15 ++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index a1016cc..c25f051 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -194,6 +194,19 @@ static void gigolo_bookmark_edit_dialog_destroy(GtkObject
*object)
}
+static gboolean check_custom_uri(const gchar *uri)
+{
+ GigoloBookmark *bm;
+ gboolean result;
+
+ bm = gigolo_bookmark_new_from_uri("(validation)", uri);
+ result = gigolo_bookmark_is_valid(bm);
+ g_object_unref(bm);
+
+ return result;
+}
+
+
gint gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
{
gint res;
@@ -268,7 +281,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! error && gtk_widget_get_parent(priv->uri_entry)
!= NULL)
{
tmp =
gtk_entry_get_text(GTK_ENTRY(priv->uri_entry));
- if (! *tmp)
+ if (! *tmp || ! check_custom_uri(tmp))
{
error = TRUE;
gigolo_message_dialog(dialog,
GTK_MESSAGE_ERROR, _("Error"),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Improve WebDav URI handling
Updating branch refs/heads/master
to a0b7fa48913515b7e9d006b1988e079ea8ed2a88 (commit)
from 567eadbc5873ba149fbedddf1be8e1016da87907 (commit)
commit a0b7fa48913515b7e9d006b1988e079ea8ed2a88
Author: Enrico Tröger
Date: Sun Apr 22 01:10:50 2012 +0200
Improve WebDav URI handling
We remove trailing slashes from the path of WebDav URIs and we do
not automatically append a trailing slash when generating WebDav
URIs.
src/bookmark.c | 12 +---
tests/uri_parsing.c |2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/bookmark.c b/src/bookmark.c
index b517845..d8c2341 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -234,7 +234,14 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
{
end++; /* skip the slash */
- priv->path = g_strdup(end);
+ /* remove trailing slashes */
+ l = strlen(end);
+ while (end[l-1] == '/')
+ {
+ l--;
+ }
+
+ priv->path = g_strndup(end, l);
}
return TRUE;
@@ -317,7 +324,7 @@ static gchar *gigolo_bookmark_get_uri_real(GigoloBookmark
*bookmark, gboolean es
domain = gigolo_bookmark_get_domain(bookmark);
- result = g_strdup_printf("%s://%s%s%s%s%s%s/%s%s%s%s",
+ result = g_strdup_printf("%s://%s%s%s%s%s%s/%s%s%s",
priv->scheme,
(NZV(domain)) ? domain : "",
(NZV(domain)) ? ";" : "",
@@ -326,7 +333,6 @@ static gchar *gigolo_bookmark_get_uri_real(GigoloBookmark
*bookmark, gboolean es
priv->host,
(port) ? port : "",
(NZV(priv->path)) ? priv->path : "",
- (NZV(priv->path)) ? "/" : "",
(NZV(priv->share)) ? priv->share : "",
(NZV(priv->share)) ? "/" : "");
diff --git a/tests/uri_parsing.c b/tests/uri_parsing.c
index ac94e0a..eec492d 100644
--- a/tests/uri_parsing.c
+++ b/tests/uri_parsing.c
@@ -103,7 +103,7 @@ gint main(gint argc, gchar **argv)
{ "dav://localhost.localdomain/",
"dav://localhost.localdomain/", "dav", "localhost.localdomain", NULL, NULL, 0,
NULL},
{ "dav://localhost.localdomain",
"dav://localhost.localdomain/", "dav", "localhost.localdomain", NULL, NULL, 0,
NULL},
{ "dav://u...@dav.domain.tld/owncloud/files/webdav.php",
"dav://u...@dav.domain.tld/owncloud/files/webdav.php", "dav", "dav.domain.tld",
NULL, "owncloud/files/webdav.php", 0, "user"},
- { "davs://user@localhost.localdomain/path/path2/more",
"davs://user@localhost.localdomain/path/path2/more", "davs",
"localhost.locaaldomain", NULL, "path/path2/more", 0, "user"},
+ { "davs://user@localhost.localdomain/path/path2/more//",
"davs://user@localhost.localdomain/path/path2/more/", "davs",
"localhost.locaaldomain", NULL, "path/path2/more", 0, "user"},
{ NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL }
};
GigoloBookmark *bm;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add missing tests for WebDav URLs
Updating branch refs/heads/master
to ea9a59932bf57c4a9b86d7fe6af762ada5d76a24 (commit)
from 32bdab5745c2ce23f040700021e9de1e9b5e5dcd (commit)
commit ea9a59932bf57c4a9b86d7fe6af762ada5d76a24
Author: Enrico Tröger
Date: Sun Apr 22 00:15:51 2012 +0200
Add missing tests for WebDav URLs
tests/uri_parsing.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/uri_parsing.c b/tests/uri_parsing.c
index ae7131e..ac94e0a 100644
--- a/tests/uri_parsing.c
+++ b/tests/uri_parsing.c
@@ -100,6 +100,10 @@ gint main(gint argc, gchar **argv)
{ "smb://user@localhost/share/", "smb://user@localhost/share/",
"smb", "localhost", NULL, "share", 0, "user"},
{ "smb://user@name@localhost/share/and/",
"smb://user@name@localhost/share/", "smb", "localhost", NULL, "share", 0,
"user@name"},
{ "smb://domain;user@localhost/share/and/more",
"smb://domain;user@localhost/share/", "smb", "localhost", "domain", "share", 0,
"user"},
+ { "dav://localhost.localdomain/",
"dav://localhost.localdomain/", "dav", "localhost.localdomain", NULL, NULL, 0,
NULL},
+ { "dav://localhost.localdomain",
"dav://localhost.localdomain/", "dav", "localhost.localdomain", NULL, NULL, 0,
NULL},
+ { "dav://u...@dav.domain.tld/owncloud/files/webdav.php",
"dav://u...@dav.domain.tld/owncloud/files/webdav.php", "dav", "dav.domain.tld",
NULL, "owncloud/files/webdav.php", 0, "user"},
+ { "davs://user@localhost.localdomain/path/path2/more",
"davs://user@localhost.localdomain/path/path2/more", "davs",
"localhost.locaaldomain", NULL, "path/path2/more", 0, "user"},
{ NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL }
};
GigoloBookmark *bm;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Handle WebDAV path parts when parsing URLs
Updating branch refs/heads/master
to 567eadbc5873ba149fbedddf1be8e1016da87907 (commit)
from ea9a59932bf57c4a9b86d7fe6af762ada5d76a24 (commit)
commit 567eadbc5873ba149fbedddf1be8e1016da87907
Author: Enrico Tröger
Date: Sun Apr 22 00:16:38 2012 +0200
Handle WebDAV path parts when parsing URLs
src/bookmark.c |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/bookmark.c b/src/bookmark.c
index ffe18bb..b517845 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -106,6 +106,7 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
{
gchar *s, *t, *x, *end, *tmp;
guint l;
+ gboolean is_uri_dav;
GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark);
priv->scheme = g_uri_parse_scheme(uri);
@@ -215,7 +216,6 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
priv->port = (guint) atoi(tmp);
g_free(tmp);
}
- /* TODO handle WebDav path parts */
if (NZV(end) && *end == '/' && gigolo_str_equal("smb", priv->scheme))
{
end++; /* skip the slash */
@@ -229,6 +229,13 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
}
priv->share = g_strndup(end, l);
}
+ is_uri_dav = gigolo_str_equal("dav", priv->scheme) ||
gigolo_str_equal("davs", priv->scheme);
+ if (NZV(end) && *end == '/' && is_uri_dav)
+ {
+ end++; /* skip the slash */
+
+ priv->path = g_strdup(end);
+ }
return TRUE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Plug memory leak
Updating branch refs/heads/master
to 32bdab5745c2ce23f040700021e9de1e9b5e5dcd (commit)
from 17d9037e528cf2542ad441626dc1d1cd0ff679a3 (commit)
commit 32bdab5745c2ce23f040700021e9de1e9b5e5dcd
Author: Enrico Tröger
Date: Sat Apr 21 23:57:42 2012 +0200
Plug memory leak
While at it, fix wording on some verbose messages.
src/bookmark.c |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bookmark.c b/src/bookmark.c
index 73cb2f2..ffe18bb 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -113,7 +113,7 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
s = strstr(uri, "://");
if (priv->scheme == NULL || s == NULL)
{
- verbose("Error parsing URI '%s' while reading URI scheme", uri);
+ verbose("Error parsing URI '%s' at reading URI scheme", uri);
gigolo_bookmark_bookmark_clear(bookmark);
return FALSE;
}
@@ -141,7 +141,7 @@ gboolean gigolo_bookmark_parse_uri(GigoloBookmark
*bookmark, const gchar *uri)
}
if (l == 0)
{
- verbose("Error parsing URI '%s' while reading
username", uri);
+ verbose("Error parsing URI '%s' at reading username",
uri);
gigolo_bookmark_bookmark_clear(bookmark);
return FALSE;
}
@@ -354,6 +354,8 @@ void gigolo_bookmark_set_uri(GigoloBookmark *bookmark,
const gchar *uri)
tmp = gigolo_bookmark_new_from_uri(priv->name, uri);
if (gigolo_bookmark_is_valid(tmp))
gigolo_bookmark_clone(bookmark, tmp);
+
+ g_object_unref(tmp);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Adjust code style
Updating branch refs/heads/master
to e58c5230e3ecb6d726fea25b41d6d3cb9eb482ae (commit)
from 336b0b9a3001bf75803a042b080f3eb845bfff5a (commit)
commit e58c5230e3ecb6d726fea25b41d6d3cb9eb482ae
Author: Enrico Tröger
Date: Sat Mar 3 16:44:51 2012 +0100
Adjust code style
panel-plugin/xfce4-dict-plugin.c | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index c52a449..7b56501 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -85,7 +85,7 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin
*plugin, gint wsize,
gint size;
gint bsize = wsize;
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+#if defined(LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION(4,9,0)
bsize /= xfce_panel_plugin_get_nrows(plugin);
#endif
@@ -96,11 +96,11 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin
*plugin, gint wsize,
gtk_image_set_from_pixbuf(GTK_IMAGE(dpd->panel_button_image),
dpd->dd->icon);
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+#if defined(LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION(4,9,0)
if (dpd->dd->show_panel_entry &&
xfce_panel_plugin_get_mode(dpd->plugin) !=
XFCE_PANEL_PLUGIN_MODE_VERTICAL)
{
- xfce_panel_plugin_set_small (plugin, FALSE);
+ xfce_panel_plugin_set_small(plugin, FALSE);
if (xfce_panel_plugin_get_mode(dpd->plugin) ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
gtk_widget_set_size_request(dpd->dd->panel_entry,
dpd->dd->panel_entry_size, -1);
else
@@ -111,7 +111,7 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin
*plugin, gint wsize,
else
{
gtk_widget_hide(dpd->dd->panel_entry);
- xfce_panel_plugin_set_small (plugin, TRUE);
+ xfce_panel_plugin_set_small(plugin, TRUE);
}
#else
if (dpd->dd->show_panel_entry &&
@@ -276,7 +276,7 @@ static void dict_plugin_free_data(XfcePanelPlugin *plugin,
DictPanelData *dpd)
}
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+#if defined(LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION(4,9,0)
static void dict_plugin_panel_change_mode(XfcePanelPlugin *plugin,
XfcePanelPluginMode mode, DictPanelData *dpd)
{
@@ -444,8 +444,8 @@ static void dict_plugin_construct(XfcePanelPlugin *plugin)
g_signal_connect(dpd->dd->close_button, "clicked",
G_CALLBACK(dict_plugin_close_button_clicked), dpd);
g_signal_connect(plugin, "free-data",
G_CALLBACK(dict_plugin_free_data), dpd);
g_signal_connect(plugin, "size-changed",
G_CALLBACK(dict_plugin_panel_set_size), dpd);
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
- g_signal_connect(plugin, "mode-changed", G_CALLBACK
(dict_plugin_panel_change_mode), dpd);
+#if defined(LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION(4,9,0)
+ g_signal_connect(plugin, "mode-changed",
G_CALLBACK(dict_plugin_panel_change_mode), dpd);
#else
g_signal_connect(plugin, "orientation-changed",
G_CALLBACK(dict_plugin_panel_change_orientation), dpd);
#endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Adapting the plugin to panel version 4.9+
Updating branch refs/heads/master
to 336b0b9a3001bf75803a042b080f3eb845bfff5a (commit)
from 133ce7045b9ec45421a397fe9ac17eb3e288d21d (commit)
commit 336b0b9a3001bf75803a042b080f3eb845bfff5a
Author: Andrzej
Date: Fri Feb 24 15:33:33 2012 +0900
Adapting the plugin to panel version 4.9+
Signed-off-by: Enrico Tröger
panel-plugin/xfce4-dict-plugin.c | 83 +++--
1 files changed, 51 insertions(+), 32 deletions(-)
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 332f6ca..c52a449 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -51,6 +51,7 @@ typedef struct
GtkWidget *panel_button;
GtkWidget *panel_button_image;
+ GtkWidget *box;
} DictPanelData;
@@ -81,28 +82,49 @@ static GdkPixbuf *dict_plugin_load_and_scale(const guint8
*data, gint dstw, gint
static gboolean dict_plugin_panel_set_size(XfcePanelPlugin *plugin, gint
wsize, DictPanelData *dpd)
{
- gint width;
- gint height = wsize;
- gint size = wsize - 2 - (2 * MAX(dpd->panel_button->style->xthickness,
+ gint size;
+ gint bsize = wsize;
+
+#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+ bsize /= xfce_panel_plugin_get_nrows(plugin);
+#endif
+
+ size = bsize - 2 - (2 * MAX(dpd->panel_button->style->xthickness,
dpd->panel_button->style->ythickness));
dpd->dd->icon = dict_plugin_load_and_scale(dict_gui_get_icon_data(),
size, -1);
gtk_image_set_from_pixbuf(GTK_IMAGE(dpd->panel_button_image),
dpd->dd->icon);
+#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+ if (dpd->dd->show_panel_entry &&
+ xfce_panel_plugin_get_mode(dpd->plugin) !=
XFCE_PANEL_PLUGIN_MODE_VERTICAL)
+ {
+ xfce_panel_plugin_set_small (plugin, FALSE);
+ if (xfce_panel_plugin_get_mode(dpd->plugin) ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+ gtk_widget_set_size_request(dpd->dd->panel_entry,
dpd->dd->panel_entry_size, -1);
+ else
+ gtk_widget_set_size_request(dpd->dd->panel_entry, -1,
-1);
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(dpd->box),
xfce_panel_plugin_get_orientation(dpd->plugin));
+ gtk_widget_show(dpd->dd->panel_entry);
+ }
+ else
+ {
+ gtk_widget_hide(dpd->dd->panel_entry);
+ xfce_panel_plugin_set_small (plugin, TRUE);
+ }
+#else
if (dpd->dd->show_panel_entry &&
xfce_panel_plugin_get_orientation(plugin) ==
GTK_ORIENTATION_HORIZONTAL)
{
- width = size + dpd->dd->panel_entry_size;
+ gtk_widget_show(dpd->dd->panel_entry);
gtk_widget_set_size_request(dpd->dd->panel_entry,
dpd->dd->panel_entry_size, -1);
}
else
- width = size;
-
- if (xfce_panel_plugin_get_orientation(plugin) ==
GTK_ORIENTATION_VERTICAL)
- height -= 4; /* reduce some of the height because it creates
too much space otherwise */
+ gtk_widget_hide(dpd->dd->panel_entry);
+#endif
- gtk_widget_set_size_request(dpd->panel_button, wsize, height);
+ gtk_widget_set_size_request(dpd->panel_button, bsize, bsize);
return TRUE;
}
@@ -254,14 +276,20 @@ static void dict_plugin_free_data(XfcePanelPlugin
*plugin, DictPanelData *dpd)
}
+#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+static void dict_plugin_panel_change_mode(XfcePanelPlugin *plugin,
+
XfcePanelPluginMode mode, DictPanelData *dpd)
+{
+ dict_plugin_panel_set_size(plugin, xfce_panel_plugin_get_size(plugin),
dpd);
+}
+
+#else
static void dict_plugin_panel_change_orientation(XfcePanelPlugin *plugin,
GtkOrientation orientation, DictPanelData *dpd)
{
- if (! dpd->dd->show_panel_entry || orientation ==
GTK_ORIENTATION_VERTICAL)
- gtk_widget_hide(dpd->dd->panel_entry);
- else
- gtk_widget_show(dpd->dd->panel_entry);
+ dict_plugin_panel_set_size(plugin, xfce_panel_plugin_get_size(plugin),
dpd);
}
+#endif
static void dict_plugin_style_set(XfcePanelPlugin *plugin, gpointer unused,
DictPanelData *dpd)
@@ -278,14 +306,6 @@ static void dict_plugin_write_rc_file(XfcePanelPlugin
*plugin, DictPanelData *dp
static void dict_plugin_panel_save_settings(DictPanelData *dpd
[Xfce4-commits] Do not make the Connect button insensitive, never (bug #8103)
Updating branch refs/heads/master to 7d8ce9f9c541ae0268760f2e55728ec180611c17 (commit) from 1fdf693894288250ffb4dde270f5de130e25a134 (commit) commit 7d8ce9f9c541ae0268760f2e55728ec180611c17 Author: Enrico Tröger Date: Sat Nov 5 19:55:22 2011 +0100 Do not make the Connect button insensitive, never (bug #8103) src/window.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/window.c b/src/window.c index 9bfa14e..b678c75 100644 --- a/src/window.c +++ b/src/window.c @@ -722,7 +722,7 @@ static void update_sensitive_buttons(GigoloWindow *window, GtkTreeModel *model, open_possible = is_mount && gigolo_settings_has_file_manager(priv->settings); open_terminal_possible = is_mount && gigolo_settings_has_terminal(priv->settings); - gtk_action_set_sensitive(priv->action_connect, (ref_type != GIGOLO_WINDOW_REF_TYPE_MOUNT)); + /* gtk_action_set_sensitive(priv->action_connect, (ref_type != GIGOLO_WINDOW_REF_TYPE_MOUNT));*/ gtk_action_set_sensitive(priv->action_disconnect, (ref_type == GIGOLO_WINDOW_REF_TYPE_MOUNT)); update_create_edit_bookmark_action_label(priv->action_bookmark_create, is_bookmark); gtk_action_set_sensitive(priv->action_open, open_possible); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/apps/gigolo
Updating branch refs/heads/master to 1fdf693894288250ffb4dde270f5de130e25a134 (commit) from 1720fd3f59a7e86a2cab71f1d66528220aa131a5 (commit) commit 1fdf693894288250ffb4dde270f5de130e25a134 Merge: 1720fd3 a0815fa Author: Enrico Tröger Date: Sat Nov 5 18:35:12 2011 +0100 Merge branch 'master' of ssh://git.xfce.org/git/apps/gigolo commit a0815fa02b9445f8ab8bbe8a18fec9bfb7c2ff90 Author: Gabor Kelemen Date: Sat Nov 5 00:52:31 2011 +0100 l10n: Updated Hungarian (hu) translation to 100% New status: 139 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hu.po | 242 ++--- 1 files changed, 151 insertions(+), 91 deletions(-) diff --git a/po/hu.po b/po/hu.po index d1f8717..61294af 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-15 05:05+\n" +"POT-Creation-Date: 2011-11-04 23:06+\n" "PO-Revision-Date: 2009-07-24 03:02+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -36,7 +36,8 @@ msgstr "Verzióinformációk megjelenítése" #: ../src/main.c:79 msgid "- a simple frontend to easily connect to remote filesystems" -msgstr "– egyszerű felület távoli fájlrendszerekhez való egyszerű csatlakozáshoz" +msgstr "" +"– egyszerű felület távoli fájlrendszerekhez való egyszerű csatlakozáshoz" #: ../src/common.c:77 msgid "Unix Device" @@ -70,7 +71,7 @@ msgstr "WebDAV" msgid "WebDAV (secure)" msgstr "WebDAV (biztonságos)" -#: ../src/common.c:93 ../src/window.c:1395 +#: ../src/common.c:93 ../src/window.c:1506 msgid "Network" msgstr "Hálózat" @@ -86,161 +87,191 @@ msgstr "Fényképek" msgid "Custom Location" msgstr "Egyéni hely" -#: ../src/window.c:261 +#: ../src/window.c:262 #, c-format msgid "Connecting to \"%s\"" msgstr "Csatlakozás ehhez: „%s”" -#: ../src/window.c:429 -msgid "A simple frontend to easily connect/mount to local and remote filesystems" -msgstr "Egyszerű felület távoli fájlrendszerekhez való csatlakozáshoz vagy azok csatolásához" - #: ../src/window.c:430 +msgid "" +"A simple frontend to easily connect/mount to local and remote filesystems" +msgstr "" +"Egyszerű felület távoli fájlrendszerekhez való csatlakozáshoz vagy azok " +"csatolásához" + +#: ../src/window.c:431 msgid "Copyright 2008-2011 Enrico Tröger" msgstr "Copyright 2008-2011 Enrico Tröger" -#: ../src/window.c:433 +#: ../src/window.c:434 msgid "translator-credits" msgstr "Kelemen Gábor " -#: ../src/window.c:465 +#: ../src/window.c:466 msgid "Gigolo can use the following protocols provided by GVfs:" -msgstr "A Gigolo a következő, a GVFS által biztosított protokollokat képes használni:" +msgstr "" +"A Gigolo a következő, a GVFS által biztosított protokollokat képes használni:" -#: ../src/window.c:562 +#: ../src/window.c:579 ../src/window.c:638 #, c-format msgid "The command '%s' failed" msgstr "A(z) „%s” parancs meghiúsult" -#: ../src/window.c:563 ../src/window.c:700 ../src/bookmarkeditdialog.c:220 +#: ../src/window.c:580 ../src/window.c:613 ../src/window.c:626 +#: ../src/window.c:639 ../src/window.c:797 ../src/bookmarkeditdialog.c:220 #: ../src/bookmarkeditdialog.c:239 ../src/bookmarkeditdialog.c:252 #: ../src/bookmarkeditdialog.c:263 ../src/bookmarkeditdialog.c:274 msgid "Error" msgstr "Hiba" #: ../src/window.c:613 +msgid "Invalid terminal command" +msgstr "Érvénytelen terminálparancs" + +#: ../src/window.c:625 +#, c-format +msgid "No default location available for \"%s\"" +msgstr "Nem érhető el alapértelmezett hely a következőhöz: „%s”" + +#: ../src/window.c:705 msgid "Edit _Bookmark" msgstr "Könyvjelző s_zerkesztése" -#: ../src/window.c:615 ../src/window.c:1189 ../src/browsenetworkpanel.c:453 +#: ../src/window.c:707 ../src/window.c:1287 ../src/browsenetworkpanel.c:453 #: ../src/browsenetworkpanel.c:497 msgid "Create _Bookmark" msgstr "Kö_nyvjelző létrehozása" -#: ../src/window.c:1181 +#: ../src/window.c:1279 msgid "_File" msgstr "_Fájl" -#: ../src/window.c:1182 +#: ../src/window.c:1280 msgid "_Edit" msgstr "S_zerkesztés" -#: ../src/window.c:1183 +#: ../src/window.c:1281 msgid "_Actions" msgstr "_Műveletek" -#: ../src/window.c:1184 +#: ../src/window.c:1282 msgid &q
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/apps/gigolo
Updating branch refs/heads/master to 1720fd3f59a7e86a2cab71f1d66528220aa131a5 (commit) from 9c168aecd44bb33e79d228a24e94d1e7bc9ae625 (commit) commit 1720fd3f59a7e86a2cab71f1d66528220aa131a5 Merge: 9c168ae c0ddd86 Author: Enrico Tröger Date: Sun Oct 30 17:11:44 2011 +0100 Merge branch 'master' of ssh://git.xfce.org/git/apps/gigolo commit c0ddd86791509aeaff4cb7d48fa086c850b2189c Author: Aleksandr Ponomarenko Date: Sat Oct 29 12:20:04 2011 +0200 l10n: Updated Russian (ru) translation to 100% New status: 139 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 220 ++ 1 files changed, 134 insertions(+), 86 deletions(-) diff --git a/po/ru.po b/po/ru.po index f9fb500..05b27df 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-15 05:05+\n" +"POT-Creation-Date: 2011-10-29 10:06+\n" "PO-Revision-Date: \n" "Last-Translator: Urmas \n" "Language-Team: None <->\n" @@ -66,7 +66,7 @@ msgstr "WebDAV" msgid "WebDAV (secure)" msgstr "WebDAV (поддержка безопасности)" -#: ../src/common.c:93 ../src/window.c:1395 +#: ../src/common.c:93 ../src/window.c:1506 msgid "Network" msgstr "Сеть" @@ -82,161 +82,185 @@ msgstr "Фотографии" msgid "Custom Location" msgstr "Другой тип" -#: ../src/window.c:261 +#: ../src/window.c:262 #, c-format msgid "Connecting to \"%s\"" msgstr "Подключение к «%s»" -#: ../src/window.c:429 -msgid "A simple frontend to easily connect/mount to local and remote filesystems" -msgstr "Простой интерфейс для подключения локальных и удаленных файловых систем" - #: ../src/window.c:430 +msgid "" +"A simple frontend to easily connect/mount to local and remote filesystems" +msgstr "" +"Простой интерфейс для подключения локальных и удаленных файловых систем" + +#: ../src/window.c:431 msgid "Copyright 2008-2011 Enrico Tröger" msgstr "Copyright 2008-2011 Энрико Трёгер" -#: ../src/window.c:433 +#: ../src/window.c:434 msgid "translator-credits" msgstr "Alexandr Ponomarenko, 2009" -#: ../src/window.c:465 +#: ../src/window.c:466 msgid "Gigolo can use the following protocols provided by GVfs:" msgstr "Gigolo может использовать следующие предоставляемые GVfs протоколы:" -#: ../src/window.c:562 +#: ../src/window.c:579 ../src/window.c:638 #, c-format msgid "The command '%s' failed" msgstr "При выполнении команды '%s' произошел сбой" -#: ../src/window.c:563 ../src/window.c:700 ../src/bookmarkeditdialog.c:220 +#: ../src/window.c:580 ../src/window.c:613 ../src/window.c:626 +#: ../src/window.c:639 ../src/window.c:797 ../src/bookmarkeditdialog.c:220 #: ../src/bookmarkeditdialog.c:239 ../src/bookmarkeditdialog.c:252 #: ../src/bookmarkeditdialog.c:263 ../src/bookmarkeditdialog.c:274 msgid "Error" msgstr "Ошибка" #: ../src/window.c:613 +msgid "Invalid terminal command" +msgstr "Неверная команда-терминал" + +#: ../src/window.c:625 +#, c-format +msgid "No default location available for \"%s\"" +msgstr "Для «%s» нет местонахождения по умолчанию" + +#: ../src/window.c:705 msgid "Edit _Bookmark" msgstr "Редактировать закладку" -#: ../src/window.c:615 ../src/window.c:1189 ../src/browsenetworkpanel.c:453 +#: ../src/window.c:707 ../src/window.c:1287 ../src/browsenetworkpanel.c:453 #: ../src/browsenetworkpanel.c:497 msgid "Create _Bookmark" msgstr "Создать _закладку" -#: ../src/window.c:1181 +#: ../src/window.c:1279 msgid "_File" msgstr "_Файл" -#: ../src/window.c:1182 +#: ../src/window.c:1280 msgid "_Edit" msgstr "_Правка" -#: ../src/window.c:1183 +#: ../src/window.c:1281 msgid "_Actions" msgstr "_Действия" -#: ../src/window.c:1184 +#: ../src/window.c:1282 msgid "_View" msgstr "_Вид" -#: ../src/window.c:1185 +#: ../src/window.c:1283 msgid "_Help" msgstr "_Справка" -#: ../src/window.c:1191 +#: ../src/window.c:1289 msgid "_Edit Bookmarks" msgstr "П_равка закладок" -#: ../src/window.c:1192 +#: ../src/window.c:1290 msgid "Open the bookmark manager to add, edit or delete bookmarks" msgstr "Открывает Менеджер закладок для их добавления, изменения или удаления" -#: ../src/window.c:1196 +#: ../src/window.c:1294 msgid "Disconnect the selected resource&quo
[Xfce4-commits] Display bookmark name in the connection list if the connection has a bookmark
Updating branch refs/heads/master
to 9c168aecd44bb33e79d228a24e94d1e7bc9ae625 (commit)
from 0e53ec5c0e6202a3eebfe8f986cdff845c6e37e3 (commit)
commit 9c168aecd44bb33e79d228a24e94d1e7bc9ae625
Author: Enrico Tröger
Date: Thu Oct 27 23:19:54 2011 +0200
Display bookmark name in the connection list if the connection has a
bookmark
src/backendgvfs.c | 26 --
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/backendgvfs.c b/src/backendgvfs.c
index 0513210..98d75fa 100644
--- a/src/backendgvfs.c
+++ b/src/backendgvfs.c
@@ -218,6 +218,7 @@ static gchar *get_tooltip_text(GigoloBackendGVFS *backend,
gpointer ref, gint re
case GIGOLO_WINDOW_REF_TYPE_MOUNT:
{
gchar *uri, *name, *clean_uri;
+ const gchar *bookmark_name = _("No bookmark");
GigoloBookmark *b;
GigoloSettings *settings;
@@ -231,10 +232,12 @@ static gchar *get_tooltip_text(GigoloBackendGVFS
*backend, gpointer ref, gint re
const gchar *folder =
gigolo_bookmark_get_folder(b);
if (NZV(folder))
setptr(clean_uri,
g_build_filename(clean_uri, folder, NULL));
+ bookmark_name = gigolo_bookmark_get_name(b);
}
result = g_strdup_printf(
- _("%s\n\nURI: %s\nConnected:
Yes\nService Type: %s"), name, clean_uri, type);
+ _("%s\n\nURI: %s\nConnected:
Yes\nService Type: %s\nBookmark: %s"),
+ name, clean_uri, type, bookmark_name);
g_free(clean_uri);
g_free(uri);
@@ -265,9 +268,11 @@ static void mount_volume_changed_cb(GVolumeMonitor *vm,
G_GNUC_UNUSED GMount *mn
GVolume *volume;
GIcon *icon;
GtkTreeIter iter;
- gchar *vol_name, *scheme, *uri, *tooltip_text;
+ gchar *vol_name, *mount_name, *display_name, *scheme, *uri,
*tooltip_text;
const gchar *scheme_name;
GigoloBackendGVFSPrivate *priv =
GIGOLO_BACKEND_GVFS_GET_PRIVATE(backend);
+ GigoloBookmark *bookmark;
+ GigoloSettings *settings =
gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent));
gtk_list_store_clear(priv->store);
@@ -275,13 +280,14 @@ static void mount_volume_changed_cb(GVolumeMonitor *vm,
G_GNUC_UNUSED GMount *mn
mounts = g_volume_monitor_get_mounts(vm);
for (item = mounts; item != NULL; item = g_list_next(item))
{
+ display_name = NULL;
mount = G_MOUNT(item->data);
- vol_name = g_mount_get_name(mount);
+ mount_name = g_mount_get_name(mount);
file = g_mount_get_root(mount);
scheme = g_file_get_uri_scheme(file);
if (gigolo_str_equal(scheme, "burn"))
{ /* ignore empty CDs which are listed as mounted to
burn:// */
- g_free(vol_name);
+ g_free(mount_name);
g_free(scheme);
g_object_unref(file);
continue;
@@ -291,9 +297,16 @@ static void mount_volume_changed_cb(GVolumeMonitor *vm,
G_GNUC_UNUSED GMount *mn
icon = g_mount_get_icon(mount);
tooltip_text = get_tooltip_text(backend, mount,
GIGOLO_WINDOW_REF_TYPE_MOUNT, scheme_name);
+ bookmark = gigolo_settings_get_bookmark_by_uri(settings, uri);
+ if (bookmark != NULL)
+ {
+ display_name = g_strdup_printf("%s (%s)",
+ gigolo_bookmark_get_name(bookmark), mount_name);
+ }
+
gtk_list_store_insert_with_values(priv->store, &iter, -1,
GIGOLO_WINDOW_COL_IS_MOUNTED, TRUE,
- GIGOLO_WINDOW_COL_NAME, vol_name,
+ GIGOLO_WINDOW_COL_NAME, display_name ?
display_name : mount_name,
GIGOLO_WINDOW_COL_SCHEME, scheme_name,
GIGOLO_WINDOW_COL_REF, mount,
GIGOLO_WINDOW_COL_REF_TYPE,
GIGOLO_WINDOW_REF_TYPE_MOUNT,
@@ -301,7 +314,8 @@ static void mount_volume_changed_cb(GVolumeMonitor *vm,
G_GNUC_UNUSED GMount *mn
GIGOLO_WINDOW_COL_ICON_NAME, "folder-remote",
GIGOLO_WINDOW_COL_TOOLTIP, tooltip_text,
-1);
- g_free(vol_name);
+ g_free(mount_name);
+ g_free(display_name);
g_free(scheme);
g_free(uri);
g_free(tooltip_text);
[Xfce4-commits] Just unref the toolbar widget instead of explicitly destroying it.
Updating branch refs/heads/master to 0e53ec5c0e6202a3eebfe8f986cdff845c6e37e3 (commit) from 4f2ee4f1786e90dfdac1ace99819f52b421bfc3f (commit) commit 0e53ec5c0e6202a3eebfe8f986cdff845c6e37e3 Author: Enrico Tröger Date: Sun Oct 23 23:34:33 2011 +0200 Just unref the toolbar widget instead of explicitly destroying it. This fixes crashing with GTK 2.24.7 on exit though not exactly sure why it happens. But unref'ing helps and the toolbar widget is destroyed together with the main window afterwards. src/window.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/window.c b/src/window.c index bede8f4..9bfa14e 100644 --- a/src/window.c +++ b/src/window.c @@ -145,7 +145,7 @@ static void gigolo_window_destroy(GigoloWindow *window) gtk_widget_destroy(priv->systray_icon_popup_menu); gtk_widget_destroy(priv->swin_treeview); gtk_widget_destroy(priv->swin_iconview); - gtk_widget_destroy(priv->toolbar); + g_object_unref(priv->toolbar); g_object_unref(priv->action_group); g_object_unref(priv->systray_icon); g_object_unref(priv->systray_icon_popup_menu); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Explicitly link against libm.
Updating branch refs/heads/master to bf2a1dd4fcbad99e2de50c55f07c9c76e09805ed (commit) from 7bf27e8bca4df0fa0d44235b7b6425a5e45d9529 (commit) commit bf2a1dd4fcbad99e2de50c55f07c9c76e09805ed Author: Guido Berhoerster Date: Mon Sep 19 23:37:51 2011 +0200 Explicitly link against libm. configure.ac.in |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 0c4ea81..baec65c 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -39,6 +39,8 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0.0]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0]) XDT_CHECK_PACKAGE([X11], [x11]) +AC_SEARCH_LIBS(floor, m) + dnl check for debugging support XDT_FEATURE_DEBUG() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add 'Open in Terminal' command
Updating branch refs/heads/master
to acd2f122aefbed9558a2d034c1947fbaa3bc8ca1 (commit)
from 2400de30a0157949f2c393cbccf13028d7551080 (commit)
commit acd2f122aefbed9558a2d034c1947fbaa3bc8ca1
Author: Enrico Tröger
Date: Sat Sep 17 14:23:07 2011 +0200
Add 'Open in Terminal' command
src/backendgvfs.c | 17
src/backendgvfs.h |2 +
src/preferencesdialog.c | 17
src/settings.c | 35 +-
src/settings.h |1 +
src/window.c| 188 +--
6 files changed, 221 insertions(+), 39 deletions(-)
diff --git a/src/backendgvfs.c b/src/backendgvfs.c
index 303ed9d..0d74d96 100644
--- a/src/backendgvfs.c
+++ b/src/backendgvfs.c
@@ -598,6 +598,23 @@ gchar *gigolo_backend_gvfs_get_volume_identifier(gpointer
volume)
}
+gchar *gigolo_backend_gvfs_get_mount_path(gpointer mount)
+{
+ GFile *file;
+ gchar *path = NULL;
+
+ g_return_val_if_fail(mount != NULL, NULL);
+
+ file = g_mount_get_default_location(G_MOUNT(mount));
+ if (file != NULL)
+ {
+ path = g_file_get_path(file);
+ g_object_unref(file);
+ }
+ return path;
+}
+
+
static gboolean browse_network_ready_cb(gpointer backend)
{
GigoloBackendGVFSPrivate *priv;
diff --git a/src/backendgvfs.h b/src/backendgvfs.h
index ed5b17e..ada2431 100644
--- a/src/backendgvfs.h
+++ b/src/backendgvfs.h
@@ -114,6 +114,8 @@ const gchar *const*
gigolo_backend_gvfs_get_supported_uri_schemes (void);
gboolean gigolo_backend_gvfs_is_scheme_supported
(const gchar *scheme);
+gchar* gigolo_backend_gvfs_get_mount_path
(gpointer mount);
+
G_END_DECLS
#endif /* __BACKENDGVFS_H__ */
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index e16950d..c9747d9 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -352,6 +352,23 @@ static void set_settings(GigoloPreferencesDialog *dialog,
GigoloSettings *settin
hbox = gtk_hbox_new(FALSE, 6);
gtk_box_pack_start(GTK_BOX(frame_vbox), hbox, FALSE, FALSE, 0);
+ label1 = gtk_label_new_with_mnemonic(_("_Terminal"));
+ gtk_misc_set_alignment(GTK_MISC(label1), 0.0f, 0.5f);
+ gtk_box_pack_start(GTK_BOX(hbox), label1, FALSE, FALSE, 0);
+
+ image = gtk_image_new();
+ gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 3);
+
+ entry = add_program_entry(settings, "terminal");
+ gtk_widget_set_tooltip_text(entry, _("Enter the name of a program to
open mount points in a terminal"));
+ g_object_set_data(G_OBJECT(entry), "image", image);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label1), entry);
+ gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0);
+ entry_check_input(GTK_ENTRY(entry));
+
+ hbox = gtk_hbox_new(FALSE, 6);
+ gtk_box_pack_start(GTK_BOX(frame_vbox), hbox, FALSE, FALSE, 0);
+
label1 = gtk_label_new_with_mnemonic(_("_Bookmark Auto-Connect
Interval"));
gtk_misc_set_alignment(GTK_MISC(label1), 0.0f, 0.5f);
gtk_box_pack_start(GTK_BOX(hbox), label1, FALSE, FALSE, 0);
diff --git a/src/settings.c b/src/settings.c
index 70ab252..91641ee 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -56,6 +56,7 @@ struct _GigoloSettingsPrivate
gbooleanshow_autoconnect_errors;
gchar *file_manager;
+ gchar *terminal;
gint autoconnect_interval;
gint*geometry; /* window size and position, field 4 is a
flag for maximized state */
@@ -77,6 +78,7 @@ enum
PROP_0,
PROP_FILE_MANAGER,
+ PROP_TERMINAL,
PROP_AUTOCONNECT_INTERVAL,
PROP_SAVE_GEOMETRY,
@@ -127,6 +129,10 @@ static void gigolo_settings_set_property(GObject *object,
guint prop_id, const G
g_free(priv->file_manager);
priv->file_manager = g_value_dup_string(value);
break;
+ case PROP_TERMINAL:
+ g_free(priv->terminal);
+ priv->terminal = g_value_dup_string(value);
+ break;
case PROP_AUTOCONNECT_INTERVAL:
priv->autoconnect_interval = g_value_get_int(value);
break;
@@ -179,6 +185,9 @@ static void gigolo_settings_get_property(GObject *object,
guint prop_id, GValue
case PROP_FILE_MANAGER:
g_value_set_string(value, priv->file_manager);
break;
+ case PROP_TERMINAL:
+ g_value_set_string(value, priv->terminal);
+ break;
case PROP_AUTOCONNECT_INTERVAL:
if (priv->autoconnect_interval < 0)
g_object_set(object, "autoconnect-interval",
DEFAULT_AUTOCONNECT_INTERVA
[Xfce4-commits] Remove some set but unused variables
Updating branch refs/heads/master
to e7c1943f998b198012547f07016ed6c4e3a06ecf (commit)
from acd2f122aefbed9558a2d034c1947fbaa3bc8ca1 (commit)
commit e7c1943f998b198012547f07016ed6c4e3a06ecf
Author: Enrico Tröger
Date: Sat Sep 17 14:24:57 2011 +0200
Remove some set but unused variables
src/backendgvfs.c | 10 ++
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/backendgvfs.c b/src/backendgvfs.c
index 0d74d96..0513210 100644
--- a/src/backendgvfs.c
+++ b/src/backendgvfs.c
@@ -205,10 +205,6 @@ static void
gigolo_backend_gvfs_class_init(GigoloBackendGVFSClass *klass)
static void gigolo_backend_gvfs_finalize(GObject *object)
{
- GigoloBackendGVFS *self;
-
- self = GIGOLO_BACKEND_GVFS(object);
-
G_OBJECT_CLASS(gigolo_backend_gvfs_parent_class)->finalize(object);
}
@@ -538,11 +534,10 @@ void gigolo_backend_gvfs_unmount_mount(GigoloBackendGVFS
*backend, gpointer moun
static void mount_ready_cb(GFile *location, GAsyncResult *res, MountInfo *mi)
{
gchar *uri;
- gboolean success;
GError *error = NULL;
uri = g_file_get_uri(location);
- success = g_file_mount_enclosing_volume_finish(location, res, &error);
+ g_file_mount_enclosing_volume_finish(location, res, &error);
if (error != NULL && ! g_error_matches(error, G_IO_ERROR,
G_IO_ERROR_ALREADY_MOUNTED))
{
@@ -634,14 +629,13 @@ static gboolean browse_network_ready_cb(gpointer backend)
static void browse_network_mount_ready_cb(GFile *location, GAsyncResult *res,
BrowseData *bd)
{
- gboolean success;
GError *error = NULL;
GigoloBackendGVFSPrivate *priv;
g_return_if_fail(bd != NULL);
g_return_if_fail(bd->self != NULL);
- success = g_file_mount_enclosing_volume_finish(location, res, &error);
+ g_file_mount_enclosing_volume_finish(location, res, &error);
priv = GIGOLO_BACKEND_GVFS_GET_PRIVATE(bd->self);
priv->browse_counter--;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Automatically choose the first Samba share if any were found
Updating branch refs/heads/master
to 2400de30a0157949f2c393cbccf13028d7551080 (commit)
from 7fec2746f95ac521b94e50e86e251de345263f02 (commit)
commit 2400de30a0157949f2c393cbccf13028d7551080
Author: Enrico Tröger
Date: Fri Sep 16 17:35:54 2011 +0200
Automatically choose the first Samba share if any were found
src/bookmarkeditdialog.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 446efaf..a1016cc 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -932,6 +932,8 @@ static void browse_host_finished_cb(G_GNUC_UNUSED
GigoloBackendGVFS *bnd, GSList
{
gtk_combo_box_append_text(GTK_COMBO_BOX(priv->share_combo), node->data);
}
+ gtk_combo_box_set_active(GTK_COMBO_BOX(priv->share_combo), 0);
+
}
gtk_widget_set_sensitive(priv->share_button, TRUE);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Render the Find menu item in the textview popup menu insensitive when there is no text to search
Updating branch refs/heads/master
to e9ca8d69ee6af4d8d46702150a62ab56722d3ce3 (commit)
from 1639ea66b46164409902354c6ba9458bd9798789 (commit)
commit e9ca8d69ee6af4d8d46702150a62ab56722d3ce3
Author: Enrico Tröger
Date: Fri Sep 16 13:41:16 2011 +0200
Render the Find menu item in the textview popup menu insensitive when there
is no text to search
lib/gui.c | 42 --
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index efed441..485c110 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -242,7 +242,7 @@ static gboolean textview_visibility_notify_event(GtkWidget
*text_view, GdkEventV
}
-static void textview_popup_search_item_cb(GtkWidget *widget, DictData *dd)
+static gchar *textview_get_text_at_cursor(DictData *dd)
{
gchar *word;
GtkTextIter start, end;
@@ -268,11 +268,40 @@ static void textview_popup_search_item_cb(GtkWidget
*widget, DictData *dd)
word = gtk_text_buffer_get_text(dd->main_textbuffer, &start, &end,
FALSE);
- gtk_entry_set_text(GTK_ENTRY(dd->main_entry), word);
- dict_search_word(dd, word);
- gtk_widget_grab_focus(dd->main_entry);
+ return word;
+}
+
+
+static void textview_popup_search_item_cb(GtkWidget *widget, DictData *dd)
+{
+ gchar *word;
+
+ word = textview_get_text_at_cursor(dd);
+
+ if (word != NULL)
+ {
+ gtk_entry_set_text(GTK_ENTRY(dd->main_entry), word);
+ dict_search_word(dd, word);
+ gtk_widget_grab_focus(dd->main_entry);
- g_free(word);
+ g_free(word);
+ }
+}
+
+
+static gboolean textview_is_text_at_cursor(DictData *dd)
+{
+ gchar *text;
+
+ text = textview_get_text_at_cursor(dd);
+ if (text != NULL)
+ {
+ gboolean non_empty_text = NZV(text);
+ g_free(text);
+ return non_empty_text;
+ }
+ else
+ return FALSE;
}
@@ -321,10 +350,11 @@ static void textview_populate_popup_cb(GtkTextView
*textview, GtkMenu *menu, Dic
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy_link),
copy_link_image);
gtk_widget_show(copy_link);
- gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), copy_link);
gtk_widget_set_sensitive(GTK_WIDGET(copy_link),
textview_is_hyperlink_at_cursor(dd));
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), copy_link);
gtk_widget_show(search);
+ gtk_widget_set_sensitive(GTK_WIDGET(search),
textview_is_text_at_cursor(dd));
gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), search);
g_signal_connect(search, "activate",
G_CALLBACK(textview_popup_search_item_cb), dd);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add a 'Copy Link' menu item to the text view popup menu
Updating branch refs/heads/master
to 1639ea66b46164409902354c6ba9458bd9798789 (commit)
from e54dc7685d61a2149202a930db0cb25532d076f8 (commit)
commit 1639ea66b46164409902354c6ba9458bd9798789
Author: Enrico Tröger
Date: Fri Sep 16 13:25:22 2011 +0200
Add a 'Copy Link' menu item to the text view popup menu
lib/gui.c | 82 ++--
1 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index 70ee1a1..efed441 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -48,6 +48,41 @@ static gboolean entry_is_dirty = FALSE;
/* all textview_* functions are from the gtk-demo app to get links in the
textview working */
+static gchar *textview_get_hyperlink_at_iter(GtkWidget *text_view, GtkTextIter
*iter, DictData *dd)
+{
+ GSList *tags = NULL, *tagp = NULL;
+ gchar *found_link = NULL;
+ gchar *result = NULL;
+
+ tags = gtk_text_iter_get_tags(iter);
+ for (tagp = tags; tagp != NULL; tagp = tagp->next)
+ {
+ GtkTextTag *tag = tagp->data;
+
+ found_link = g_object_get_data(G_OBJECT(tag), "link");
+ if (found_link != NULL)
+ {
+ result = g_strdup(found_link);
+ break;
+ }
+ g_object_get(G_OBJECT(tag), "name", &found_link, NULL);
+ if (found_link != NULL)
+ {
+ if (strcmp("link", found_link) == 0)
+ {
+ result = dict_get_web_query_uri(dd,
dd->searched_word);
+ break;
+ }
+ g_free(found_link);
+ }
+ }
+ if (tags)
+ g_slist_free(tags);
+
+ return result;
+}
+
+
static void textview_follow_if_link(GtkWidget *text_view, GtkTextIter *iter,
DictData *dd)
{
GSList *tags = NULL, *tagp = NULL;
@@ -207,7 +242,7 @@ static gboolean textview_visibility_notify_event(GtkWidget
*text_view, GdkEventV
}
-static void textview_popup_item_cb(GtkWidget *widget, DictData *dd)
+static void textview_popup_search_item_cb(GtkWidget *widget, DictData *dd)
{
gchar *word;
GtkTextIter start, end;
@@ -241,18 +276,59 @@ static void textview_popup_item_cb(GtkWidget *widget,
DictData *dd)
}
+static void textview_popup_copylink_item_cb(GtkWidget *widget, DictData *dd)
+{
+ GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+ GtkTextIter iter;
+ gchar *hyperlink;
+
+ gtk_text_buffer_get_iter_at_mark(dd->main_textbuffer, &iter,
dd->mark_click);
+ hyperlink = textview_get_hyperlink_at_iter(dd->main_textview, &iter,
dd);
+ if (hyperlink != NULL)
+ {
+ gtk_clipboard_set_text(clipboard, hyperlink, -1);
+ g_free(hyperlink);
+ }
+}
+
+
+static gboolean textview_is_hyperlink_at_cursor(DictData *dd)
+{
+ GtkTextIter iter;
+ gchar *hyperlink;
+
+ gtk_text_buffer_get_iter_at_mark(dd->main_textbuffer, &iter,
dd->mark_click);
+ hyperlink = textview_get_hyperlink_at_iter(dd->main_textview, &iter,
dd);
+ if (hyperlink != NULL)
+ {
+ g_free(hyperlink);
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
+
static void textview_populate_popup_cb(GtkTextView *textview, GtkMenu *menu,
DictData *dd)
{
GtkWidget *search = gtk_image_menu_item_new_from_stock(GTK_STOCK_FIND,
NULL);
+ GtkWidget *copy_link = gtk_image_menu_item_new_with_label(_("Copy
Link"));
GtkWidget *sep = gtk_separator_menu_item_new();
+ GtkWidget *copy_link_image = gtk_image_new_from_stock(GTK_STOCK_COPY,
GTK_ICON_SIZE_MENU);
gtk_widget_show(sep);
gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), sep);
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy_link),
copy_link_image);
+ gtk_widget_show(copy_link);
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), copy_link);
+ gtk_widget_set_sensitive(GTK_WIDGET(copy_link),
textview_is_hyperlink_at_cursor(dd));
+
gtk_widget_show(search);
gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), search);
- g_signal_connect(search, "activate",
G_CALLBACK(textview_popup_item_cb), dd);
+ g_signal_connect(search, "activate",
G_CALLBACK(textview_popup_search_item_cb), dd);
+ g_signal_connect(copy_link, "activate",
G_CALLBACK(textview_popup_copylink_item_cb), dd);
}
@@ -776,7 +852,7 @@ void dict_gui_create_main_window(DictData *dd)
g_signal_connect(dd->main_textview, "visibility-notify-event",
G_CALLBACK(textview_visibility_notify_event), NULL);
}
- /* support
[Xfce4-commits] Don't show errors we are not supposed to show
Updating branch refs/heads/master
to 9de1c447ab7dfa22c76c96d198dc97fa2cf76f41 (commit)
from 520ef33f1717426e4bcf158c94ec732bff445463 (commit)
commit 9de1c447ab7dfa22c76c96d198dc97fa2cf76f41
Author: Enrico Tröger
Date: Sun Jan 9 11:52:47 2011 +0100
Don't show errors we are not supposed to show
src/backendgvfs.c | 70
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/backendgvfs.c b/src/backendgvfs.c
index 44b619d..303ed9d 100644
--- a/src/backendgvfs.c
+++ b/src/backendgvfs.c
@@ -430,26 +430,29 @@ static void volume_mount_finished_cb(GObject *src,
GAsyncResult *res, gpointer b
if (! g_volume_mount_finish(G_VOLUME(src), res, &error))
{
- gchar *name, *msg;
-
- if (G_IS_VOLUME(src))
- name = g_volume_get_name(G_VOLUME(src));
- else
- {
-
gigolo_backend_gvfs_get_name_and_uri_from_mount(G_MOUNT(src), &name, NULL);
- if (name == NULL)
- name = g_strdup(_("unknown"));
- }
-
- g_warning("Mounting of \"%s\" failed: %s", name,
error->message);
if (! g_error_matches(error, G_IO_ERROR,
G_IO_ERROR_FAILED_HANDLED))
{
- msg = g_strdup_printf(_("Connecting to \"%s\"
failed."), name);
- g_signal_emit(backend, signals[OPERATION_FAILED], 0,
msg, error->message);
- g_free(msg);
+ gchar *name, *msg;
+
+ if (G_IS_VOLUME(src))
+ name = g_volume_get_name(G_VOLUME(src));
+ else
+ {
+
gigolo_backend_gvfs_get_name_and_uri_from_mount(G_MOUNT(src), &name, NULL);
+ if (name == NULL)
+ name = g_strdup(_("unknown"));
+ }
+
+ g_warning("Mounting of \"%s\" failed: %s", name,
error->message);
+ if (! g_error_matches(error, G_IO_ERROR,
G_IO_ERROR_FAILED_HANDLED))
+ {
+ msg = g_strdup_printf(_("Connecting to \"%s\"
failed."), name);
+ g_signal_emit(backend,
signals[OPERATION_FAILED], 0, msg, error->message);
+ g_free(msg);
+ }
+ g_error_free(error);
+ g_free(name);
}
- g_error_free(error);
- g_free(name);
}
else
verbose("Mount finished sucessfully");
@@ -466,25 +469,28 @@ static void unmount_finished_cb(GObject *src,
GAsyncResult *res, gpointer backen
if (! g_mount_unmount_finish(G_MOUNT(src), res, &error))
#endif
{
- gchar *name, *msg;
-
- if (G_IS_VOLUME(src))
- name = g_volume_get_name(G_VOLUME(src));
- else
+ if (! g_error_matches(error, G_IO_ERROR,
G_IO_ERROR_FAILED_HANDLED))
{
-
gigolo_backend_gvfs_get_name_and_uri_from_mount(G_MOUNT(src), &name, NULL);
- if (name == NULL)
- name = g_strdup(_("unknown"));
- }
+ gchar *name, *msg;
- g_warning("Unmounting of \"%s\" failed: %s", name,
error->message);
- msg = g_strdup_printf(_("Disconnecting from \"%s\" failed."),
name);
+ if (G_IS_VOLUME(src))
+ name = g_volume_get_name(G_VOLUME(src));
+ else
+ {
+
gigolo_backend_gvfs_get_name_and_uri_from_mount(G_MOUNT(src), &name, NULL);
+ if (name == NULL)
+ name = g_strdup(_("unknown"));
+ }
- g_signal_emit(backend, signals[OPERATION_FAILED], 0, msg,
error->message);
+ g_warning("Unmounting of \"%s\" failed: %s", name,
error->message);
+ msg = g_strdup_printf(_("Disconnecting from \"%s\"
failed."), name);
- g_error_free(error);
- g_free(name);
- g_free(msg);
+ g_signal_emit(backend, signals[OPERATION_FAILED], 0,
msg, error->message);
+
+ g_error_free(error);
+ g_free(name);
+ g_free(msg);
+ }
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Refactor get_answer a bit to make it more flexible and ensure to read the server's answer after quitting the session.
Updating branch refs/heads/master
to 614f909f006f0e4a2c508ee2c2a7c66281140fd0 (commit)
from 6aa6ae683341c307f8497587d3570d91f12a24ad (commit)
commit 614f909f006f0e4a2c508ee2c2a7c66281140fd0
Author: Enrico Tröger
Date: Mon Jan 3 01:09:57 2011 +0100
Refactor get_answer a bit to make it more flexible and ensure to read the
server's answer after quitting the session.
This should fix connection resets on server-side, we closed the connection
too early.
While at it, fix some typos.
lib/dictd.c | 73 +-
1 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/lib/dictd.c b/lib/dictd.c
index 8a52686..9929812 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -397,7 +397,7 @@ static gboolean process_server_response(DictData *dd)
if (! NZV(dd->query_buffer))
{
- dict_gui_status_add(dd, _("Unknown error while quering the
server."));
+ dict_gui_status_add(dd, _("Unknown error while querying the
server."));
g_free(dd->query_buffer);
return FALSE;
}
@@ -453,7 +453,7 @@ static gboolean process_server_response(DictData *dd)
}
else if (strncmp("150", answer, 3) != 0 && dd->query_status !=
NOTHING_FOUND)
{
- dict_gui_status_add(dd, _("Unknown error while quering the
server."));
+ dict_gui_status_add(dd, _("Unknown error while querying the
server."));
g_free(dd->query_buffer);
return FALSE;
}
@@ -494,14 +494,18 @@ static gboolean process_server_response(DictData *dd)
}
-static gchar *get_answer(DictData *dd, gint fd)
+static gint get_answer(gint fd, gchar **buffer)
{
gboolean fol = TRUE;
gboolean sol = FALSE;
gboolean tol = FALSE;
- GString *str = g_string_sized_new(100);
+ GString *str;
gchar c;
gchar ec[3];
+ gint query_status;
+
+ if (buffer != NULL)
+ str = g_string_sized_new(100);
alarm(10); /* abort after 10 seconds, there should went wrong something
*/
while (read(fd, &c, 1) > 0)
@@ -529,7 +533,9 @@ static gchar *get_answer(DictData *dd, gint fd)
tol = FALSE;
}
- g_string_append_c(str, c);
+ if (buffer != NULL)
+ g_string_append_c(str, c);
+
if (tol)
{
if (strncmp(ec, "250", 3) == 0 || /* ok */
@@ -538,45 +544,50 @@ static gchar *get_answer(DictData *dd, gint fd)
{
break;
}
- else if (strncmp(ec, "220", 3) == 0) /* server ready */
+ else if (strncmp(ec, "220", 3) == 0 || /* server ready
*/
+strncmp(ec, "221", 3) == 0)/* good
bye */
{
- dd->query_status = NO_ERROR;
+ query_status = NO_ERROR;
break;
}
else if (strncmp(ec, "420", 3) == 0 ||
strncmp(ec, "421", 3) == 0) /* server
not ready (server down or shutdown) */
{
- dd->query_status = SERVER_NOT_READY;
+ query_status = SERVER_NOT_READY;
break;
}
else if (strncmp(ec, "500", 3) == 0 ||
strncmp(ec, "501", 3) == 0) /* bad
command or parameters */
{
- dd->query_status = BAD_COMMAND;
+ query_status = BAD_COMMAND;
break;
}
else if (strncmp(ec, "550", 3) == 0) /* invalid
database */
{
- dd->query_status = UNKNOWN_DATABASE;
+ query_status = UNKNOWN_DATABASE;
break;
}
else if (strncmp(ec, "552", 3) == 0) /* nothing found */
{
- dd->query_status = NOTHING_FOUND;
+ query_status = NOTHING_FOUND;
break;
}
else if (strncmp(ec, "554", 3) == 0) /* no databases
present */
{
- dd->query_status = NO_DATABASES;
+
[Xfce4-commits] Update copyright
Updating branch refs/heads/master
to 855f375f00791454263e9d0dc96e62b749397953 (commit)
from 445dac0e8ea1811add59c56dee21e84cabf75e13 (commit)
commit 855f375f00791454263e9d0dc96e62b749397953
Author: Enrico Tröger
Date: Mon Jan 3 00:32:52 2011 +0100
Update copyright
lib/common.c |2 +-
lib/common.h |2 +-
lib/dictd.c |2 +-
lib/dictd.h |2 +-
lib/gui.c|4 ++--
lib/gui.h|2 +-
lib/libdict.h|2 +-
lib/prefs.c |2 +-
lib/prefs.h |2 +-
lib/searchentry.c|2 +-
lib/searchentry.h|2 +-
lib/speedreader.c|2 +-
lib/speedreader.h|2 +-
lib/spell.c |2 +-
lib/spell.h |2 +-
lib/wraplabel.c |2 +-
lib/wraplabel.h |2 +-
panel-plugin/xfce4-dict-plugin.c |2 +-
src/popup_plugin.c |2 +-
src/popup_plugin.h |2 +-
src/xfce4-dict.c |4 ++--
21 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/lib/common.c b/lib/common.c
index 556d3d1..123babd 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2010 Enrico Tröger
+ * Copyright 2006-2011 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/common.h b/lib/common.h
index 7123540..ce9c66a 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2010 Enrico Tröger
+ * Copyright 2006-2011 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/dictd.c b/lib/dictd.c
index a493895..55312f6 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2010 Enrico Tröger
+ * Copyright 2006-2011 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/dictd.h b/lib/dictd.h
index f636d0f..3f31856 100644
--- a/lib/dictd.h
+++ b/lib/dictd.h
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2010 Enrico Tröger
+ * Copyright 2006-2011 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/gui.c b/lib/gui.c
index 8e19194..70ee1a1 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2010 Enrico Tröger
+ * Copyright 2006-2011 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -849,7 +849,7 @@ void dict_gui_about_dialog(GtkWidget *widget, DictData *dd)
"destroy-with-parent", TRUE,
"authors", authors,
"comments", _("A client program to query different
dictionaries."),
- "copyright", _("Copyright \302\251 2006-2010 Enrico Tröger"),
+ "copyright", _("Copyright \302\251 2006-2011 Enrico Tröger"),
"website",
"http://goodies.xfce.org/projects/applications/xfce4-dict";,
"logo", logo,
"translator-credits", _("translator-credits"),
diff --git a/lib/gui.h b/lib/gui.h
index c9aeac2..858e51b 100644
--- a/lib/gui.h
+++ b/lib/gui.h
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2010 Enrico Tröger
+ * Copyright 2006-2011 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/libdict.h b/lib/libdict.h
index 7009486..0e7571e 100644
--- a/lib/libdict.h
+++ b/lib/libdict.h
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2010 Enrico Tröger
+ * Copyright 2006-2011 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/prefs.c b/lib/prefs.c
index e7ed636..238aed4 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2010 Enrico Tröger
+ * Copyright 2006-2011 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/prefs.h b/lib/prefs.h
index 00ff6a9..9959305 100644
[Xfce4-commits] Make the code more readable
Updating branch refs/heads/master
to 6aa6ae683341c307f8497587d3570d91f12a24ad (commit)
from aef72cd999786bcc19d473bf6e3a97b802574189 (commit)
commit 6aa6ae683341c307f8497587d3570d91f12a24ad
Author: Enrico Tröger
Date: Mon Jan 3 00:53:16 2011 +0100
Make the code more readable
lib/dictd.c |7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/dictd.c b/lib/dictd.c
index a9de054..8a52686 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -584,6 +584,7 @@ static gpointer ask_server(DictData *dd)
{
gint fd, i;
static gchar cmd[BUF_SIZE];
+ gchar *tmp_buf;
if ((fd = open_socket(dd->server, dd->port)) == -1)
{
@@ -595,12 +596,14 @@ static gpointer ask_server(DictData *dd)
dd->query_is_running = TRUE;
dd->query_status = NO_CONNECTION;
- g_free(get_answer(dd, fd));
+ tmp_buf = get_answer(dd, fd);
+ g_free(tmp_buf);
if (dd->query_status == NO_ERROR)
{
/* take only the first part of the dictionary string, so let
the string end at the space */
i = 0;
- while (dd->dictionary[i] != ' ') i++;
+ while (dd->dictionary[i] != ' ')
+ i++;
dd->dictionary[i] = '\0';
g_snprintf(cmd, BUF_SIZE, "DEFINE %s \"%s\"", dd->dictionary,
dd->searched_word);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Send the QUIT command always, also in case of errors
Updating branch refs/heads/master to aef72cd999786bcc19d473bf6e3a97b802574189 (commit) from 9f69259fc2bef4786821840ca7a4d2ae847bea81 (commit) commit aef72cd999786bcc19d473bf6e3a97b802574189 Author: Enrico Tröger Date: Mon Jan 3 00:51:52 2011 +0100 Send the QUIT command always, also in case of errors lib/dictd.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/dictd.c b/lib/dictd.c index 4e16db9..a9de054 100644 --- a/lib/dictd.c +++ b/lib/dictd.c @@ -610,8 +610,8 @@ static gpointer ask_server(DictData *dd) dd->dictionary[i] = ' '; dd->query_buffer = get_answer(dd, fd); - send_command(fd, "QUIT"); } + send_command(fd, "QUIT"); close(fd); dd->query_is_running = FALSE; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix some function signatures and prototypes
Updating branch refs/heads/master
to 9f69259fc2bef4786821840ca7a4d2ae847bea81 (commit)
from 855f375f00791454263e9d0dc96e62b749397953 (commit)
commit 9f69259fc2bef4786821840ca7a4d2ae847bea81
Author: Enrico Tröger
Date: Mon Jan 3 00:37:18 2011 +0100
Fix some function signatures and prototypes
lib/common.c |2 +-
lib/common.h |2 +-
lib/dictd.c |2 +-
panel-plugin/xfce4-dict-plugin.c |2 +-
src/popup_plugin.h |2 +-
src/xfce4-dict.c |2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/common.c b/lib/common.c
index 123babd..2a2967e 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -573,7 +573,7 @@ void dict_drag_data_received(GtkWidget *widget,
GdkDragContext *drag_context, gi
}
-DictData *dict_create_dictdata()
+DictData *dict_create_dictdata(void)
{
DictData *dd = g_new0(DictData, 1);
diff --git a/lib/common.h b/lib/common.h
index ce9c66a..673bc1a 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -133,7 +133,7 @@ void dict_search_word(DictData *dd, const gchar *word);
void dict_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context,
gint x, gint y,
GtkSelectionData
*data, guint info, guint ltime, DictData *dd);
-DictData *dict_create_dictdata();
+DictData *dict_create_dictdata(void);
gboolean dict_start_web_query(DictData *dd, const gchar *word);
gchar *dict_get_web_query_uri(DictData *dd, const gchar *word);
gchar *dict_get_clipboard_contents(void);
diff --git a/lib/dictd.c b/lib/dictd.c
index 55312f6..4e16db9 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -623,7 +623,7 @@ static gpointer ask_server(DictData *dd)
}
-void signal_cb(gint sig)
+static void signal_cb(gint sig)
{
/* do nothing here and hope we never get called */
}
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 2162209..332f6ca 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -226,7 +226,7 @@ static gboolean dict_plugin_set_selection(DictPanelData
*dpd)
}
-void dict_plugin_close_button_clicked(GtkWidget *button, DictPanelData *dpd)
+static void dict_plugin_close_button_clicked(GtkWidget *button, DictPanelData
*dpd)
{
gtk_widget_hide(dpd->dd->window);
}
diff --git a/src/popup_plugin.h b/src/popup_plugin.h
index 46d1ad8..0aca132 100644
--- a/src/popup_plugin.h
+++ b/src/popup_plugin.h
@@ -22,6 +22,6 @@
#define POPUP_PLUGIN_H 1
-gboolean dict_find_panel_plugin(gboolean focus_panel_entry, const gchar *text);
+gboolean dict_find_panel_plugin(gchar flags, const gchar *text);
#endif
diff --git a/src/xfce4-dict.c b/src/xfce4-dict.c
index 9d46be8..f39bec6 100644
--- a/src/xfce4-dict.c
+++ b/src/xfce4-dict.c
@@ -76,7 +76,7 @@ static void close_button_clicked(GtkWidget *button, DictData
*dd)
}
-void pref_dialog_activated(GtkMenuItem *menuitem, DictData *dd)
+static void pref_dialog_activated(GtkMenuItem *menuitem, DictData *dd)
{
GtkWidget *dlg;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add a separator to the Bookmark Edit Dialog
Updating branch refs/heads/master
to bc8f76ec117699a57f51df8aac3b6c36559b9ad3 (commit)
from 13de03810feea18ab8b7da373536db2e6af81b12 (commit)
commit bc8f76ec117699a57f51df8aac3b6c36559b9ad3
Author: Enrico Tröger
Date: Sat Jan 1 16:11:49 2011 +0100
Add a separator to the Bookmark Edit Dialog
src/bookmarkeditdialog.c | 14 ++
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 0cbcd80..446efaf 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -50,6 +50,8 @@ struct _GigoloBookmarkEditDialogPrivate
GtkWidget *type_combo;
GtkWidget *information_label;
+ GtkWidget *separator;
+
GtkWidget *name_label;
GtkWidget *name_entry;
@@ -542,7 +544,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
gtk_container_remove(GTK_CONTAINER(priv->table),
priv->information_label);
}
- i = 5;
+ i = 6;
table = priv->table;
if (meth->scheme == NULL)
@@ -899,6 +901,7 @@ static void
gigolo_bookmark_edit_dialog_set_property(GObject *object, guint prop
gtk_widget_hide(priv->color_chooser);
gtk_widget_hide(priv->autoconnect_label);
gtk_widget_hide(priv->autoconnect_checkbtn);
+ gtk_widget_hide(priv->separator);
break;
}
}
@@ -1038,15 +1041,18 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
gtk_label_set_mnemonic_widget(GTK_LABEL(priv->autoconnect_label),
priv->autoconnect_checkbtn);
gtk_table_attach(GTK_TABLE(table), priv->autoconnect_checkbtn, 1, 2, 2,
3, GTK_FILL, GTK_FILL, 0, 0);
+ priv->separator = gtk_hseparator_new();
+ gtk_table_attach(GTK_TABLE(table), priv->separator, 0, 2, 3, 4,
GTK_FILL, GTK_FILL, 0, 0);
+
label = gtk_label_new_with_mnemonic(_("Service t_ype:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, GTK_FILL,
GTK_FILL, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, GTK_FILL,
GTK_FILL, 0, 0);
priv->type_combo = combo = gtk_combo_box_new();
- gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 3, 4, GTK_FILL |
GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 4, 5, GTK_FILL |
GTK_EXPAND, GTK_FILL, 0, 0);
label_tmp = gtk_label_new(" ");
- gtk_table_attach(GTK_TABLE(table), label_tmp, 0, 2, 4, 5, GTK_FILL |
GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), label_tmp, 0, 2, 5, 6, GTK_FILL |
GTK_EXPAND, GTK_FILL, 0, 0);
renderer = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update Waf to 1.6.1 and adjust wscript
Updating branch refs/heads/master
to b994dbee7bb659a5f9022893a36f544f52396521 (commit)
from bc8f76ec117699a57f51df8aac3b6c36559b9ad3 (commit)
commit b994dbee7bb659a5f9022893a36f544f52396521
Author: Enrico Tröger
Date: Sun Jan 2 14:42:46 2011 +0100
Update Waf to 1.6.1 and adjust wscript
waf | Bin 59403 -> 76329 bytes
wscript | 396 ++-
2 files changed, 188 insertions(+), 208 deletions(-)
diff --git a/waf b/waf
index 29af63d..95ffdf3 100755
Binary files a/waf and b/waf differ
diff --git a/wscript b/wscript
index 3c721ec..b7fa147 100644
--- a/wscript
+++ b/wscript
@@ -20,238 +20,218 @@
-from TaskGen import taskgen, feature
-import Build, Configure, Options, Utils, UnitTest
-import sys, os, shutil
+import os
+from waflib import Logs, Options, Scripting
+from waflib.TaskGen import feature
APPNAME = 'gigolo'
VERSION = '0.4.1'
+LINGUAS_FILE = 'po/LINGUAS'
-srcdir = '.'
-blddir = '_build_'
+top = '.'
+out = '_build_'
-sources = [ 'src/compat.c', 'src/window.c', 'src/bookmark.c', 'src/settings.c',
- 'src/menubuttonaction.c', 'src/mountoperation.c',
'src/bookmarkdialog.c',
- 'src/bookmarkeditdialog.c', 'src/preferencesdialog.c',
'src/backendgvfs.c',
- 'src/common.c', 'src/mountdialog.c',
'src/browsenetworkpanel.c',
- 'src/singleinstance.c', 'src/bookmarkpanel.c' ]
+sources = ['src/compat.c', 'src/window.c', 'src/bookmark.c', 'src/settings.c',
+ 'src/menubuttonaction.c', 'src/mountoperation.c',
'src/bookmarkdialog.c',
+ 'src/bookmarkeditdialog.c', 'src/preferencesdialog.c',
'src/backendgvfs.c',
+ 'src/common.c', 'src/mountdialog.c', 'src/browsenetworkpanel.c',
+ 'src/singleinstance.c', 'src/bookmarkpanel.c']
def configure(conf):
- conf.check_tool('compiler_cc intltool misc gnu_dirs')
+conf.load('compiler_c intltool gnu_dirs waf_unit_test')
- conf.check_cfg(package='gtk+-2.0', atleast_version='2.12.0',
uselib_store='GTK',
- mandatory=True, args='--cflags --libs')
- conf.check_cfg(package='gio-2.0', atleast_version='2.16.0',
uselib_store='GIO',
- mandatory=True, args='--cflags --libs')
- conf.check_cfg(package='x11', uselib_store='X11', mandatory=True,
args='--libs')
+conf.check_cfg(package='gtk+-2.0', atleast_version='2.12.0',
uselib_store='GTK',
+mandatory=True, args='--cflags --libs')
+conf.check_cfg(package='gio-2.0', atleast_version='2.16.0',
uselib_store='GIO',
+mandatory=True, args='--cflags --libs')
+conf.check_cfg(package='x11', uselib_store='X11', mandatory=True,
args='--libs')
- gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK')
- gio_version = conf.check_cfg(modversion='gio-2.0', uselib_store='GIO')
+gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK')
+gio_version = conf.check_cfg(modversion='gio-2.0', uselib_store='GIO')
- conf.define('GETTEXT_PACKAGE', APPNAME, 1)
- conf.define('PACKAGE', APPNAME, 1)
- conf.define('VERSION', VERSION, 1)
+conf.define('GETTEXT_PACKAGE', APPNAME, 1)
+conf.define('PACKAGE', APPNAME, 1)
+conf.define('VERSION', VERSION, 1)
- conf.write_config_header('config.h')
+conf.write_config_header('config.h', remove=False)
- if 'LINGUAS' in os.environ:
- conf.env['LINGUAS'] = os.environ['LINGUAS']
+if 'LINGUAS' in os.environ:
+conf.env['LINGUAS'] = os.environ['LINGUAS']
- # debug flags
- if Options.options.debug:
- conf.env.append_value('CCFLAGS', '-g -O0 -DDEBUG '.split())
+# debug flags
+if conf.options.debug:
+conf.env.append_value('CCFLAGS', '-g -O0 -DDEBUG '.split())
- Utils.pprint('BLUE', 'Summary:')
- print_message(conf, 'Install Gigolo ' + VERSION + ' in',
conf.env['PREFIX'])
- print_message(conf, 'Using GTK version', gtk_
[Xfce4-commits] Do not set the colour when no colour is explicitly selected
Updating branch refs/heads/master
to 969b716a358a8fdf70554572cda5a1b4e97b3886 (commit)
from 626550456eae93cf97626d36ccd9d41d9236174c (commit)
commit 969b716a358a8fdf70554572cda5a1b4e97b3886
Author: Enrico Tröger
Date: Fri Dec 31 01:29:37 2010 +0100
Do not set the colour when no colour is explicitly selected
src/bookmarkeditdialog.c | 16
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 72cfe4b..f8ae36d 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -84,6 +84,7 @@ struct _GigoloBookmarkEditDialogPrivate
GtkWidget *color_label;
GtkWidget *color_chooser;
+ gboolean color_set;
GigoloBookmark *bookmark_init;
GigoloBookmark *bookmark_update;
@@ -759,6 +760,10 @@ static void update_bookmark_color(GigoloBookmarkEditDialog
*dialog)
priv = GIGOLO_BOOKMARK_EDIT_DIALOG_GET_PRIVATE(dialog);
+ if (! priv->color_set)
+ /* if no colour has been chosen by the user, don't set the
default colour (black) */
+ return;
+
gtk_color_button_get_color(GTK_COLOR_BUTTON(priv->color_chooser),
&color);
color_string = gdk_color_to_string(&color);
gigolo_bookmark_set_color(priv->bookmark_update, color_string);
@@ -961,6 +966,15 @@ static void entry_activate_cb(G_GNUC_UNUSED GtkEditable
*editable, GigoloBookmar
}
+static void color_chooser_set_cb(G_GNUC_UNUSED GtkColorButton *widget,
+
GigoloBookmarkEditDialog *dialog)
+{
+ GigoloBookmarkEditDialogPrivate *priv =
GIGOLO_BOOKMARK_EDIT_DIALOG_GET_PRIVATE(dialog);
+
+ priv->color_set = TRUE;
+}
+
+
static void gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
{
GtkWidget *label;
@@ -1009,7 +1023,9 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
gtk_misc_set_alignment(GTK_MISC(priv->color_label), 0.0, 0.5);
gtk_table_attach(GTK_TABLE(table), priv->color_label, 0, 1, 1, 2,
GTK_FILL, GTK_FILL, 0, 0);
+ priv->color_set = FALSE;
priv->color_chooser = gtk_color_button_new();
+ g_signal_connect(priv->color_chooser, "color-set",
G_CALLBACK(color_chooser_set_cb), dialog);
gtk_label_set_mnemonic_widget(GTK_LABEL(priv->color_label),
priv->color_chooser);
gtk_table_attach(GTK_TABLE(table), priv->color_chooser,
1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] allow editing bookmarks from the main window popup menu
Updating branch refs/heads/master
to 626550456eae93cf97626d36ccd9d41d9236174c (commit)
from 065f3a6fd1b2d616abe4965cb0387769dc9c8dd0 (commit)
commit 626550456eae93cf97626d36ccd9d41d9236174c
Author: Enrico Tröger
Date: Fri Dec 31 01:15:14 2010 +0100
allow editing bookmarks from the main window popup menu
src/window.c | 36 ++--
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/window.c b/src/window.c
index d69f924..9436021 100644
--- a/src/window.c
+++ b/src/window.c
@@ -606,6 +606,16 @@ static gboolean iter_is_bookmark(GigoloWindow *window,
GtkTreeModel *model, GtkT
}
+static void update_create_edit_bookmark_action_label(GtkAction *action,
gboolean is_bookmark)
+{
+ gtk_action_set_sensitive(action, TRUE);
+ if (is_bookmark)
+ gtk_action_set_label(action, _("Edit _Bookmark"));
+ else
+ gtk_action_set_label(action, _("Create _Bookmark"));
+}
+
+
static void update_sensitive_buttons(GigoloWindow *window, GtkTreeModel
*model, GtkTreeIter *iter)
{
GigoloWindowPrivate *priv = GIGOLO_WINDOW_GET_PRIVATE(window);
@@ -619,7 +629,7 @@ static void update_sensitive_buttons(GigoloWindow *window,
GtkTreeModel *model,
gtk_action_set_sensitive(priv->action_connect, (ref_type !=
GIGOLO_WINDOW_REF_TYPE_MOUNT));
gtk_action_set_sensitive(priv->action_disconnect, (ref_type ==
GIGOLO_WINDOW_REF_TYPE_MOUNT));
- gtk_action_set_sensitive(priv->action_bookmark_create, !
is_bookmark);
+
update_create_edit_bookmark_action_label(priv->action_bookmark_create,
is_bookmark);
gtk_action_set_sensitive(priv->action_open,
gigolo_settings_has_file_manager(priv->settings));
gtk_action_set_sensitive(priv->action_copyuri, (ref_type ==
GIGOLO_WINDOW_REF_TYPE_MOUNT));
}
@@ -871,16 +881,17 @@ static void action_create_bookmark_cb(G_GNUC_UNUSED
GtkAction *button, GigoloWin
if (gigolo_backend_gvfs_is_mount(mnt))
{
gchar *uri, *name;
+ GigoloBookmark *bm;
+ GtkWidget *edit_dialog;
gigolo_backend_gvfs_get_name_and_uri_from_mount(mnt,
&name, &uri);
- if (gigolo_settings_get_bookmark_by_uri(priv->settings,
uri) == NULL)
+ bm =
gigolo_settings_get_bookmark_by_uri(priv->settings, uri);
+ if (bm == NULL)
{
- GigoloBookmark *bm =
gigolo_bookmark_new_from_uri(name, uri);
+ bm = gigolo_bookmark_new_from_uri(name, uri);
if (gigolo_bookmark_is_valid(bm))
{
- GtkWidget *edit_dialog;
-
/* show the bookmark edit dialog and
add the bookmark only if it was
* not cancelled */
edit_dialog =
gigolo_bookmark_edit_dialog_new_with_bookmark(
@@ -901,8 +912,21 @@ static void action_create_bookmark_cb(G_GNUC_UNUSED
GtkAction *button, GigoloWin
g_object_unref(bm);
}
else
- verbose("Bookmark for %s already exists", uri);
+ {
+ /* bookmark exists */
+ edit_dialog =
gigolo_bookmark_edit_dialog_new_with_bookmark(
+ window, GIGOLO_BE_MODE_EDIT, bm);
+ if (gigolo_bookmark_edit_dialog_run(
+
GIGOLO_BOOKMARK_EDIT_DIALOG(edit_dialog)) == GTK_RESPONSE_OK)
+ {
+ /* this fills the values of the dialog
into 'bm' */
+ g_object_set(edit_dialog,
"bookmark-update", bm, NULL);
+ gigolo_window_update_bookmarks(window);
+ gigolo_settings_write(priv->settings,
GIGOLO_SETTINGS_BOOKMARKS);
+ }
+ gtk_widget_destroy(edit_dialog);
+ }
g_free(uri);
g_free(name);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Display the bookmark colours in the Bookmark side panel as well
Updating branch refs/heads/master
to fb6817750168e0fe789b5dcc6407b475175b5406 (commit)
from 969b716a358a8fdf70554572cda5a1b4e97b3886 (commit)
commit fb6817750168e0fe789b5dcc6407b475175b5406
Author: Enrico Tröger
Date: Fri Dec 31 01:34:15 2010 +0100
Display the bookmark colours in the Bookmark side panel as well
src/bookmarkpanel.c |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/bookmarkpanel.c b/src/bookmarkpanel.c
index e70706f..7b8aa2f 100644
--- a/src/bookmarkpanel.c
+++ b/src/bookmarkpanel.c
@@ -41,6 +41,7 @@ typedef struct _GigoloBookmarkPanelPrivate
GigoloBookmarkPanelPrivate;
enum
{
GIGOLO_BOOKMARK_PANEL_COL_NAME,
+ GIGOLO_BOOKMARK_PANEL_COL_COLOR,
GIGOLO_BOOKMARK_PANEL_COL_REF,
GIGOLO_BOOKMARK_PANEL_N_COLUMNS
};
@@ -98,6 +99,7 @@ static void update_store(GigoloBookmarkPanel *panel,
GigoloSettings *settings)
gtk_list_store_insert_with_values(priv->store, NULL, -1,
GIGOLO_BOOKMARK_PANEL_COL_NAME,
gigolo_bookmark_get_name(bm),
+ GIGOLO_BOOKMARK_PANEL_COL_COLOR,
gigolo_bookmark_get_color(bm),
GIGOLO_BOOKMARK_PANEL_COL_REF, bm,
-1);
}
@@ -209,7 +211,8 @@ static void tree_prepare(GigoloBookmarkPanel *panel)
GigoloBookmarkPanelPrivate *priv =
GIGOLO_BOOKMARK_PANEL_GET_PRIVATE(panel);
tree = gtk_tree_view_new();
- store = gtk_list_store_new(GIGOLO_BOOKMARK_PANEL_N_COLUMNS,
G_TYPE_STRING, G_TYPE_POINTER);
+ store = gtk_list_store_new(GIGOLO_BOOKMARK_PANEL_N_COLUMNS,
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
column = gtk_tree_view_column_new();
@@ -217,7 +220,8 @@ static void tree_prepare(GigoloBookmarkPanel *panel)
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tree), FALSE);
gtk_tree_view_column_pack_start(column, text_renderer, TRUE);
gtk_tree_view_column_set_attributes(column, text_renderer,
- "text", GIGOLO_BOOKMARK_PANEL_COL_NAME, NULL);
+ "text", GIGOLO_BOOKMARK_PANEL_COL_NAME,
+ "cell-background", GIGOLO_BOOKMARK_PANEL_COL_COLOR, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] When manually expanding a tilde and no username is set for the connection, fallback to the local username
Updating branch refs/heads/master
to 065f3a6fd1b2d616abe4965cb0387769dc9c8dd0 (commit)
from c65cba3d9498fabb38def3298c834c8fa14c9d49 (commit)
commit 065f3a6fd1b2d616abe4965cb0387769dc9c8dd0
Author: Enrico Tröger
Date: Fri Dec 31 00:57:34 2010 +0100
When manually expanding a tilde and no username is set for the connection,
fallback to the local username
src/bookmark.c |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/bookmark.c b/src/bookmark.c
index 403d053..e552f91 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -441,8 +441,12 @@ gchar *gigolo_bookmark_get_folder_expanded(GigoloBookmark
*bookmark)
folder = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark)->folder;
username = gigolo_bookmark_get_user(bookmark);
- if (NZV(folder) && username && folder[0] == '~')
+ if (NZV(folder) && folder[0] == '~')
+ {
+ if (! username)
+ username = g_get_user_name();
result = g_strconcat("/home/", username, folder + 1, NULL);
+ }
else
result = g_strdup(folder);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Store and display colours for bookmarks
Updating branch refs/heads/master
to c65cba3d9498fabb38def3298c834c8fa14c9d49 (commit)
from b2686fb283a1a9bcfb8cd3f4732dccbd3ecce7ac (commit)
commit c65cba3d9498fabb38def3298c834c8fa14c9d49
Author: Enrico Tröger
Date: Fri Dec 31 00:48:44 2010 +0100
Store and display colours for bookmarks
Bookmarks now can have colours which are shown in the bookmarks dialog and
can be set in the bookmark edit dialog.
This is to easily group and identify bookmarks in a large list easily by
their colours.
src/bookmark.c | 23
src/bookmark.h |3 ++
src/bookmarkdialog.c | 18 +---
src/bookmarkeditdialog.c | 51 -
src/settings.c |7 +-
5 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/src/bookmark.c b/src/bookmark.c
index 9df9282..403d053 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -43,6 +43,7 @@ struct _GigoloBookmarkPrivate
gchar *share;
guintport;
gchar *user;
+ gchar *color;
gboolean autoconnect;
gboolean should_not_autoconnect;
@@ -629,6 +630,28 @@ void gigolo_bookmark_set_domain(GigoloBookmark *bookmark,
const gchar *domain)
}
+const gchar *gigolo_bookmark_get_color(GigoloBookmark *bookmark)
+{
+ g_return_val_if_fail(bookmark != NULL, NULL);
+
+ return GIGOLO_BOOKMARK_GET_PRIVATE(bookmark)->color;
+}
+
+
+void gigolo_bookmark_set_color(GigoloBookmark *bookmark, const gchar *color)
+{
+ GigoloBookmarkPrivate *priv;
+
+ g_return_if_fail(bookmark != NULL);
+ g_return_if_fail(color != NULL);
+
+ priv = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark);
+
+ g_free(priv->color);
+ priv->color = g_strdup(color);
+}
+
+
gboolean gigolo_bookmark_is_valid(GigoloBookmark *bookmark)
{
GigoloBookmarkPrivate *priv;
diff --git a/src/bookmark.h b/src/bookmark.h
index 7b82bd9..89c8064 100644
--- a/src/bookmark.h
+++ b/src/bookmark.h
@@ -95,6 +95,9 @@ gboolean gigolo_bookmark_parse_uri
(GigoloBookmark *bookmark, const gchar *ur
void gigolo_bookmark_bookmark_clear (GigoloBookmark
*bookmark);
+const gchar* gigolo_bookmark_get_color (GigoloBookmark
*bookmark);
+void gigolo_bookmark_set_color
(GigoloBookmark *bookmark, const gchar *color);
+
G_END_DECLS
#endif /* __BOOKMARK_H__ */
diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index fbfe574..3fb74df 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -61,6 +61,7 @@ enum
COL_AUTOMOUNT,
COL_USERNAME,
COL_OTHER,
+ COL_COLOR,
COL_BMREF,
N_COLUMNS,
ACTION_ADD,
@@ -119,6 +120,7 @@ static void update_row_in_model(GigoloBookmarkDialog
*dialog, GtkTreeIter *iter,
COL_AUTOMOUNT, gigolo_bookmark_get_autoconnect(bm),
COL_USERNAME, gigolo_bookmark_get_user(bm),
COL_OTHER, other_text->str,
+ COL_COLOR, gigolo_bookmark_get_color(bm),
COL_BMREF, bm,
-1);
g_string_free(other_text, TRUE);
@@ -298,11 +300,11 @@ static void tree_prepare(GigoloBookmarkDialog *dialog)
priv->tree = gtk_tree_view_new();
priv->store = gtk_list_store_new(N_COLUMNS,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
+ G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_POINTER);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
- _("Name"), renderer, "text", COL_NAME, NULL);
+ _("Name"), renderer, "text", COL_NAME, "cell-background",
COL_COLOR, NULL);
gtk_tree_view_column_set_sort_indicator(column, TRUE);
gtk_tree_view_column_set_sort_column_id(column, COL_NAME);
gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
@@ -310,7 +312,7 @@ static void tree_prepare(GigoloBookmarkDialog *dialog)
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
- _("Service Type"), renderer, "text", COL_SCHEME, NULL);
+ _("Service Type"), renderer, "text", COL_SCHEME,
"cell-background", COL_COLOR, NULL);
gtk_tree_view_column_set_sort_indicator(column, TRUE);
gtk_tree_view_column_set_sort_column_id(column, COL_SCHEME);
gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
@@ -318,7 +320,7 @@ static void tree_prepare(GigoloBookmarkDialog *dialog)
renderer = gtk_cell_rend
[Xfce4-commits] Update copyright
Updating branch refs/heads/master to 13de03810feea18ab8b7da373536db2e6af81b12 (commit) from fb6817750168e0fe789b5dcc6407b475175b5406 (commit) commit 13de03810feea18ab8b7da373536db2e6af81b12 Author: Enrico Tröger Date: Sat Jan 1 15:44:09 2011 +0100 Update copyright src/backendgvfs.c|2 +- src/backendgvfs.h|2 +- src/bookmark.c |2 +- src/bookmark.h |2 +- src/bookmarkdialog.c |2 +- src/bookmarkdialog.h |2 +- src/bookmarkeditdialog.c |2 +- src/bookmarkeditdialog.h |2 +- src/bookmarkpanel.c |2 +- src/bookmarkpanel.h |2 +- src/browsenetworkpanel.c |2 +- src/browsenetworkpanel.h |2 +- src/common.c |2 +- src/common.h |2 +- src/compat.c |2 +- src/compat.h |2 +- src/main.c |4 ++-- src/main.h |2 +- src/menubuttonaction.c |2 +- src/menubuttonaction.h |2 +- src/mountdialog.c|2 +- src/mountdialog.h|2 +- src/mountoperation.c |2 +- src/mountoperation.h |2 +- src/preferencesdialog.c |2 +- src/preferencesdialog.h |2 +- src/settings.c |2 +- src/settings.h |2 +- src/singleinstance.c |2 +- src/singleinstance.h |2 +- src/window.c |6 +++--- src/window.h |2 +- tests/uri_parsing.c |2 +- wscript |2 +- 34 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/backendgvfs.c b/src/backendgvfs.c index 50b7398..44b619d 100644 --- a/src/backendgvfs.c +++ b/src/backendgvfs.c @@ -1,7 +1,7 @@ /* * backendgvfs.c * - * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2011 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/backendgvfs.h b/src/backendgvfs.h index 7badf43..ed5b17e 100644 --- a/src/backendgvfs.h +++ b/src/backendgvfs.h @@ -1,7 +1,7 @@ /* * backendgvfs.h * - * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2011 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmark.c b/src/bookmark.c index e552f91..73cb2f2 100644 --- a/src/bookmark.c +++ b/src/bookmark.c @@ -1,7 +1,7 @@ /* * bookmark.c * - * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2011 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmark.h b/src/bookmark.h index 89c8064..a9e3dc0 100644 --- a/src/bookmark.h +++ b/src/bookmark.h @@ -1,7 +1,7 @@ /* * bookmark.h * - * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2011 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c index 3fb74df..c283cc5 100644 --- a/src/bookmarkdialog.c +++ b/src/bookmarkdialog.c @@ -1,7 +1,7 @@ /* * bookmarkdialog.c * - * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2011 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmarkdialog.h b/src/bookmarkdialog.h index cb7ff1f..8e8f01f 100644 --- a/src/bookmarkdialog.h +++ b/src/bookmarkdialog.h @@ -1,7 +1,7 @@ /* * bookmarkdialog.h * - * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2011 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c index f8ae36d..0cbcd80 100644 --- a/src/bookmarkeditdialog.c +++ b/src/bookmarkeditdialog.c @@ -1,7 +1,7 @@ /* * bookmarkeditdialog.c * - * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2011 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmarkeditdialog.h b/src/bookmarkeditdialog.h index 003c714..72e2122 100644 --- a/src/bookmarkeditdialog.h +++ b/src/bookmarkeditdialog.h @@ -1,7 +1,7 @@ /* * bookmarkeditdialog.h * - * Copyright 2008-2010 Enrico Tröger + * Copyright 2008-2011 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU
[Xfce4-commits] resolve symbolic links before writing config files
Updating branch refs/heads/master
to 32eab35513a4023bdfd5792fb6f1a4af3b3c701b (commit)
from 36cee9c2b37275634b6137ee1143fd2074217b14 (commit)
commit 32eab35513a4023bdfd5792fb6f1a4af3b3c701b
Author: Enrico Tröger
Date: Sat Oct 16 16:49:47 2010 +0200
resolve symbolic links before writing config files
src/settings.c | 21 -
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/settings.c b/src/settings.c
index dece5d3..e46ce3c 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -380,6 +380,7 @@ static void write_data(GKeyFile *k, const gchar *filename)
gsize len;
GError *error = NULL;
gchar *data;
+ gchar *real_filename;
data = g_key_file_to_data(k, &len, &error);
if (data == NULL || error != NULL)
@@ -389,13 +390,31 @@ static void write_data(GKeyFile *k, const gchar *filename)
g_free(data);
return;
}
+ /* resolve symbolic links */
+ if (g_file_test(filename, G_FILE_TEST_IS_SYMLINK))
+ {
+ real_filename = g_file_read_link(filename, &error);
+ if (error)
+ {
+ g_warning("Writing configuration file to disk failed
(%s).", error->message);
+ g_error_free(error);
+ g_free(data);
+ return;
+ }
+ }
+ else
+ {
+ real_filename = g_strdup(filename);
+ }
- if (! g_file_set_contents(filename, data, len, &error))
+ /* write data to file */
+ if (! g_file_set_contents(real_filename, data, len, &error))
{
g_warning("Writing configuration file to disk failed (%s).",
error->message);
g_error_free(error);
}
g_free(data);
+ g_free(real_filename);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remember side panel position
Updating branch refs/heads/master
to 4c51257d51869265014a200dcd110304b360d382 (commit)
from 32eab35513a4023bdfd5792fb6f1a4af3b3c701b (commit)
commit 4c51257d51869265014a200dcd110304b360d382
Author: Enrico Tröger
Date: Sat Oct 16 17:04:31 2010 +0200
Remember side panel position
src/settings.c | 18 ++
src/window.c | 12 +++-
2 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/settings.c b/src/settings.c
index e46ce3c..6282c44 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -52,6 +52,7 @@ struct _GigoloSettingsPrivate
gintview_mode;
gbooleanshow_panel;
guint last_panel_page;
+ gintpanel_position;
gbooleanshow_autoconnect_errors;
gchar *file_manager;
@@ -87,6 +88,7 @@ enum
PROP_VIEW_MODE,
PROP_SHOW_PANEL,
PROP_LAST_PANEL_PAGE,
+ PROP_PANEL_POSITION,
PROP_SHOW_AUTOCONNECT_ERRORS
};
@@ -134,6 +136,9 @@ static void gigolo_settings_set_property(GObject *object,
guint prop_id, const G
case PROP_LAST_PANEL_PAGE:
priv->last_panel_page = g_value_get_uint(value);
break;
+ case PROP_PANEL_POSITION:
+ priv->panel_position = g_value_get_uint(value);
+ break;
case PROP_SHOW_AUTOCONNECT_ERRORS:
priv->show_autoconnect_errors = g_value_get_boolean(value);
break;
@@ -185,6 +190,9 @@ static void gigolo_settings_get_property(GObject *object,
guint prop_id, GValue
case PROP_LAST_PANEL_PAGE:
g_value_set_uint(value, priv->last_panel_page);
break;
+ case PROP_PANEL_POSITION:
+ g_value_set_uint(value, priv->panel_position);
+ break;
case PROP_SHOW_AUTOCONNECT_ERRORS:
g_value_set_boolean(value, priv->show_autoconnect_errors);
break;
@@ -293,6 +301,14 @@ static void gigolo_settings_class_init(GigoloSettingsClass
*klass)
0,
G_MAXUINT, 0,
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class,
+
PROP_PANEL_POSITION,
+
g_param_spec_uint(
+
"panel-position",
+
"panel-position",
+ "Last
panel position",
+ 0,
G_MAXUINT, 0,
+
G_PARAM_READWRITE));
+ g_object_class_install_property(gobject_class,
PROP_SHOW_AUTOCONNECT_ERRORS,
g_param_spec_boolean(
"show-autoconnect-errors",
@@ -443,6 +459,7 @@ static void write_settings_config(GigoloSettings *settings)
g_key_file_set_integer(k, SECTION_UI, "view_mode", priv->view_mode);
g_key_file_set_boolean(k, SECTION_UI, "show_panel", priv->show_panel);
g_key_file_set_integer(k, SECTION_UI, "last_panel_page",
priv->last_panel_page);
+ g_key_file_set_integer(k, SECTION_UI, "panel_position",
priv->panel_position);
g_key_file_set_boolean(k, SECTION_UI, "show_autoconnect_errors",
priv->show_autoconnect_errors);
write_data(k, priv->config_filename);
@@ -549,6 +566,7 @@ static void load_settings_read_config(GigoloSettingsPrivate
*priv)
priv->toolbar_style = get_setting_int(k, SECTION_UI, "toolbar_style",
-1);
priv->toolbar_orientation = get_setting_int(k, SECTION_UI,
"toolbar_orientation", 0);
priv->view_mode = get_setting_int(k, SECTION_UI, "view_mode", 0);
+ priv->panel_position = get_setting_int(k, SECTION_UI, "panel_position",
0);
priv->geometry = g_key_file_get_integer_list(k, SECTION_UI, "geometry",
NULL, &error);
if (error)
{
diff --git a/src/window.c b/src/window.c
index 279bb0b..d69f924 100644
--- a/src/window.c
+++ b/src/window.c
@@ -59,6 +59,7 @@ struct _GigoloWindowPrivate
GtkWidget *hbox_pane;
GtkWidget *hbox_view;
+ GtkWidget *panel_pane;
GtkWidget *browse_panel;
GtkWi
[Xfce4-commits] Update project description
Updating branch refs/heads/master to 293a982ae002e2a0a863379d4772a6d99d0caa71 (commit) from 47c9568c1dab9dad758cf77bbe69143f7d672a80 (commit) commit 293a982ae002e2a0a863379d4772a6d99d0caa71 Author: Enrico Tröger Date: Sun Sep 19 12:50:23 2010 +0200 Update project description module.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/module.xml b/module.xml index 2f9c51b..26f58f0 100644 --- a/module.xml +++ b/module.xml @@ -6,7 +6,7 @@ xmlns="http://usefulinc.com/ns/doap#";> gigolo - Gigolo eases managing connections to remote filesystems + Gigolo eases managing connections to local and remote filesystems http://www.uvena.de/gigolo"/> http://foo-projects.org/mailman/listinfo/xfce"/> ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update project description
Updating branch refs/heads/master
to 47c9568c1dab9dad758cf77bbe69143f7d672a80 (commit)
from 1a39d5a8274e34c9890a96653bcb69cf69f173b6 (commit)
commit 47c9568c1dab9dad758cf77bbe69143f7d672a80
Author: Enrico Tröger
Date: Sun Sep 19 12:47:22 2010 +0200
Update project description
README |4 ++--
gigolo.1.in |2 +-
src/window.c |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README b/README
index 1d7bc22..3fc03a4 100644
--- a/README
+++ b/README
@@ -4,8 +4,8 @@ Gigolo
About
=
-Gigolo is a frontend to easily manage connections to remote filesystems using
-GIO/GVfs. It allows you to quickly connect/mount a remote filesystem and manage
+Gigolo is a frontend to easily manage connections to local and remote
filesystems
+using GIO/GVfs. It allows you to quickly connect/mount a remote filesystem and
manage
bookmarks of such.
GVfs is an userspace virtual filesystem and the successor of GnomeVfs but
doesn't
diff --git a/gigolo.1.in b/gigolo.1.in
index 3c4aaf4..e5efe6b 100644
--- a/gigolo.1.in
+++ b/gigolo.1.in
@@ -6,7 +6,7 @@ Gigolo \(em a simple frontend to easily connect to remote
filesystems with GIO/G
\fBgigolo\fR [\fBoption\fP]
.SH "DESCRIPTION"
.PP
-Gigolo is a frontend to easily manage connections to remote filesystems using
+Gigolo is a frontend to easily manage connections to local and remote
filesystems using
GIO/GVfs. It allows you to quickly mount a remote filesystem and manage
bookmarks to such.
.PP
diff --git a/src/window.c b/src/window.c
index 1dc1944..279bb0b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -422,7 +422,7 @@ static void action_about_cb(G_GNUC_UNUSED GtkAction
*action, GigoloWindow *windo
gtk_show_about_dialog(GTK_WINDOW(window),
"authors", authors,
"logo-icon-name", gigolo_get_application_icon_name(),
- "comments", _("A simple frontend to easily connect to remote
filesystems"),
+ "comments", _("A simple frontend to easily connect/mount to
local and remote filesystems"),
"copyright", _("Copyright 2008-2010 Enrico Tröger"),
"website", "http://www.uvena.de/gigolo/";,
"version", VERSION,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] fix wrong callback argument
Updating branch refs/heads/master
to 3b9d50855706c6f96512f9fa5a09878104acf8de (commit)
from 65546b23449ced89bba4fe5d64d415d3b1ca9762 (commit)
commit 3b9d50855706c6f96512f9fa5a09878104acf8de
Author: Enrico Tröger
Date: Sun Sep 19 12:37:24 2010 +0200
fix wrong callback argument
panel-plugin/xfce4-dict-plugin.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 6047db8..5374b18 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -371,7 +371,7 @@ static gboolean entry_buttonpress_cb(GtkWidget *entry,
GdkEventButton *event, Di
}
-static void entry_changed_cb(GtkEditable *editable, DictData *dd)
+static void entry_changed_cb(GtkEditable *editable, DictPanelData *dpd)
{
entry_is_dirty = TRUE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix Categories keyword to be more compatible, bug 6692
Updating branch refs/heads/master to 65546b23449ced89bba4fe5d64d415d3b1ca9762 (commit) from 27f28cd77400d4bee8b3ea7c88cbafbcabcefffa (commit) commit 65546b23449ced89bba4fe5d64d415d3b1ca9762 Author: Christoph Wickert Date: Sun Sep 19 12:17:55 2010 +0200 Fix Categories keyword to be more compatible, bug 6692 src/xfce4-dict.desktop.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xfce4-dict.desktop.in b/src/xfce4-dict.desktop.in index 13aa24a..e2c3cbe 100644 --- a/src/xfce4-dict.desktop.in +++ b/src/xfce4-dict.desktop.in @@ -8,4 +8,4 @@ Icon=xfce4-dict Exec=xfce4-dict Terminal=false StartupNotify=true -Categories=Office;Dictionary;GTK; +Categories=Office;TextTools;Dictionary;GTK; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use the correct XfcePanelPlugin instance when opening the preferences dialog to prevent crashes
Updating branch refs/heads/master
to 1b9641f8a6a81e0a0c054c0ec46d760691d7cf2e (commit)
from d78781168966ffc0a1d250eb4e58fa6cf78327ca (commit)
commit 1b9641f8a6a81e0a0c054c0ec46d760691d7cf2e
Author: Enrico Tröger
Date: Sun Sep 5 19:12:24 2010 +0200
Use the correct XfcePanelPlugin instance when opening the preferences
dialog to prevent crashes
panel-plugin/xfce4-dict-plugin.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 65eaa1b..6047db8 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -302,9 +302,10 @@ static void
dict_plugin_properties_dialog_response(GtkWidget *dlg, gint response
}
-static void dict_plugin_properties_dialog(XfcePanelPlugin *plugin,
DictPanelData *dpd)
+static void dict_plugin_properties_dialog(GtkWidget *widget, DictPanelData
*dpd)
{
GtkWidget *dlg;
+ XfcePanelPlugin *plugin = dpd->plugin;
xfce_panel_plugin_block_menu(plugin);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove fuzzy mark for previous change
Updating branch refs/heads/master to 32f34ac17215174f99d6540adfad43c1d68fb5ca (commit) from 103e4d103dc5580c11d0c404d002b710a0aaacc3 (commit) commit 32f34ac17215174f99d6540adfad43c1d68fb5ca Author: Enrico Tröger Date: Sun Aug 1 12:07:13 2010 +0200 Remove fuzzy mark for previous change po/ast.po |4 +- po/bg.po|4 +- po/ca.po|4 +- po/cs.po|4 +- po/da.po|4 +- po/de.po| 82 ++ po/el.po|4 +- po/es.po|4 +- po/eu.po|4 +- po/fi.po|4 +- po/fr.po|4 +- po/gl.po|4 +- po/hr.po|4 +- po/hu.po|4 +- po/id.po|4 +- po/it.po|4 +- po/ja.po|4 +- po/kk.po|4 +- po/lv.po|4 +- po/nl.po|4 +- po/pl.po|4 +- po/pt.po|4 +- po/pt_BR.po |5 ++- po/ru.po|4 +- po/sk.po|4 +- po/sv.po|5 ++- po/tr.po|4 +- po/ug.po|5 ++- po/uk.po|5 ++- po/ur.po|4 +- po/ur_PK.po |4 +- po/zh_CN.po |4 +- 32 files changed, 125 insertions(+), 85 deletions(-) diff --git a/po/ast.po b/po/ast.po index ed2414d..b297e0a 100644 --- a/po/ast.po +++ b/po/ast.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:43+0200\n" +"POT-Creation-Date: 2010-08-01 12:06+0200\n" "PO-Revision-Date: 2009-07-13 19:55+0100\n" "Last-Translator: Marcos Antonio Alvarez Costales \n" "Language-Team: Asturian \n" @@ -364,7 +364,7 @@ msgstr "_Ficheru" #: ../src/bookmarkeditdialog.c:1020 #, fuzzy -msgid "_Path:" +msgid "P_ath:" msgstr "_Puertu:" #: ../src/bookmarkeditdialog.c:1021 diff --git a/po/bg.po b/po/bg.po index 429c88b..71cff29 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:43+0200\n" +"POT-Creation-Date: 2010-08-01 12:06+0200\n" "PO-Revision-Date: 2009-02-13 00:56+0200\n" "Last-Translator: Adrian Dimitrov \n" "Language-Team: Bulgarian \n" @@ -368,7 +368,7 @@ msgstr "_Файл" #: ../src/bookmarkeditdialog.c:1020 #, fuzzy -msgid "_Path:" +msgid "P_ath:" msgstr "_Порт:" #: ../src/bookmarkeditdialog.c:1021 diff --git a/po/ca.po b/po/ca.po index 4817eb3..34ed4c6 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:43+0200\n" +"POT-Creation-Date: 2010-08-01 12:06+0200\n" "PO-Revision-Date: 2010-01-05 12:05+0100\n" "Last-Translator: Harald Servat \n" "Language-Team: Catalan\n" @@ -364,7 +364,7 @@ msgid "_Folder:" msgstr "_Fitxer:" #: ../src/bookmarkeditdialog.c:1020 -msgid "_Path:" +msgid "P_ath:" msgstr "_Camí:" #: ../src/bookmarkeditdialog.c:1021 diff --git a/po/cs.po b/po/cs.po index 3d8364b..2a563ef 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:43+0200\n" +"POT-Creation-Date: 2010-08-01 12:06+0200\n" "PO-Revision-Date: 2010-03-15 20:32+0100\n" "Last-Translator: Michal Várady \n" "Language-Team: Czech \n" @@ -362,7 +362,7 @@ msgid "_Folder:" msgstr "_Složka:" #: ../src/bookmarkeditdialog.c:1020 -msgid "_Path:" +msgid "P_ath:" msgstr "_Cesta:" #: ../src/bookmarkeditdialog.c:1021 diff --git a/po/da.po b/po/da.po index 364ab16..863f323 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:43+0200\n" +"POT-Creation-Date: 2010-08-01 12:06+0200\n" "PO-Revision-Date: 2010-01-19 10:21+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -364,7 +364,7 @@ msgid "_Folder:" msgstr "_Mappe:" #: ../src/bookmarkeditdialog.c:1020 -msgid "_Path:" +msgid "P_ath:" msgstr "_Sti:" #: ../src/bookmarkeditdialog.c:1021 diff --git a/po/de.po b/po/de.po index a007e4f..2406bfb 100644 --- a/po/de.po +++ b/po/de.po @@ -3,24 +3,25 @@ # This file is distributed under the same license as Gigolo. # Enrico Tröger , 2008-2009. # Fabian Nowak , 2009. -# +# msgid "&q
[Xfce4-commits] Fix mnemonics in the Connect dialog
Updating branch refs/heads/master
to 103e4d103dc5580c11d0c404d002b710a0aaacc3 (commit)
from 95a37d4ce28187b90c175edcd6230ec2b7f9f5d8 (commit)
commit 103e4d103dc5580c11d0c404d002b710a0aaacc3
Author: Enrico Tröger
Date: Sun Aug 1 11:57:45 2010 +0200
Fix mnemonics in the Connect dialog
src/bookmarkeditdialog.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index aa27408..4522a63 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -1017,7 +1017,7 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
priv->uri_label = gtk_label_new_with_mnemonic(_("_Location (URI):"));
priv->host_label = gtk_label_new_with_mnemonic(_("_Server:"));
priv->folder_label = gtk_label_new_with_mnemonic(_("_Folder:"));
- priv->path_label = gtk_label_new_with_mnemonic(_("_Path:"));
+ priv->path_label = gtk_label_new_with_mnemonic(_("P_ath:"));
priv->user_label = gtk_label_new_with_mnemonic(_("_User Name:"));
priv->information_label = gtk_label_new(_("Optional information:"));
priv->port_label = gtk_label_new_with_mnemonic(_("_Port:"));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag gigolo-0.4.1
Updating annotated tag refs/tags/gigolo-0.4.1 as new annotated tag to 20f1c52528444697b22fef4be307dc044628001a (tag) succeeds gigolo-0.4.0 tagged by Enrico Tröger on 2010-07-31 13:46 + Abel Martín (1): l10n: Updated Spanish (Castilian) (es) translation to 100% Aleksandr Ponomarenko (5): l10n: Made a complete translation, since upstream seems missing. l10n: Updated Russian (ru) translation to 100% l10n: Updated Russian (ru) translation to 100% l10n: Updated Russian (ru) translation to 100% l10n: Updated Russian (ru) translation to 100% Alexey Batiuk (2): l10n: Updated Russian (ru) translation to 100% l10n: Updated Russian (ru) translation to 100% Andhika Padmawan (2): l10n: Updated Indonesian (id) translation to 100% l10n: Updated Indonesian (id) translation to 100% Ayhan YALÇINSOY (1): l10n: Updated Turkish (tr) translation to 100% Bauzhan Muftakhidinov (1): l10n: New translation to Kazakh Christoph Wickert (3): l10n: Updated German (de) translation to 96% l10n: Updated German (de) translation to 98% l10n: Updated German (de) translation to 98% Dmitry Nikitin (1): l10n: Add Ukrainian translation fo Gigolo. Enrico Tröger (22): Turn on automake silent rules if supported Update copyright information Remove old SVN Id keywords Delete pot file Respect the LINGUAS environment variable when configuring the build system And sort the list of available languages before writing them into the LINGUAS file Respect the LINGUAS environment variable when configuring the build system Expand tilde in folder names if a username is set for the bookmark Show an error message dialog if the file-manager command failed to execute Fix a stupid typo which causes lots of unnecessary casts Completely remove the preference to select the Volume Manager implementation Improve generation of po/LINGUAS file Allow finishing the Connect / Bookmark Edit dialog by pressing Enter Ensure bookmark name is not empty Fix displayed URI/bookmark name in the mount progress dialog Fix indentation Don't try to destroy the mount progress dialog if it was closed before the mount finished Use SSH/SFTP as default connection type for new bookmarks/connections Update po files Version bump Update po files Release 0.4.1! Evaggelos Balaskas (1): l10n: Updated Greek (el) translation to 100% Gabor Kelemen (1): l10n: Updated Hungarian (hu) translation to 100% Gheyret Kenji (2): l10n: Uyghur Translation l10n: Updated Uyghur (ug) translation to 85% Harald Servat (3): l10n: Updates to Catalan (Valencian) (ca) translation l10n: Updates to Catalan (Valencian) (ca) translation l10n: Updated Catalan (Valencian) (ca) translation to 100% Ivica Kolić (3): l10n: Initial Croatian (hr) translation l10n: Updates to Croatian (hr) translation l10n: Updates to Croatian (hr) translation Jari Rahkonen (1): l10n: Add Finnish translation Johannes Lips (3): l10n: Updated German (de) translation to 98% l10n: Updated German (de) translation to 99% l10n: Updated German (de) translation to 99% Leandro Regueiro (3): l10n: Updates to Galician (gl) translation l10n: Updated Galician (gl) translation to 100% l10n: Updated Galician (gl) translation to 100% Masato Hashimoto (2): l10n: Updates to Japanese (ja) translation l10n: Updated Japanese (ja) translation to 100% Michal Várady (3): l10n: Updated Czech (cs) translation to 99% l10n: Updated Czech (cs) translation to 100% l10n: Updated Czech (cs) translation to 100% Nick Schermer (1): l10n: Overwrite wrong commit. Per Kongstad (2): l10n: Updates to Danish (da) translation l10n: Updated Danish (da) translation to 100% Piarres Beobide (2): l10n: Updated Basque (eu) translation to 99% l10n: Updated Basque (eu) translation to 100% Rihards Prieditis (1): l10n: Updated Latvian (lv) translation to 100% Sergio Marques (2): l10n: Updates to Portuguese (pt) translation l10n: Updated Portuguese (pt) translation to 100% Timo Verbeek (3): l10n: Dutch one l10n: Updated Dutch (Flemish) (nl) translation to 78% l10n: Updated Dutch (Flemish) (nl) translation to 94% Xu Meihong (2): l10n: Updated Chinese (China) (zh_CN) translation to 100% l10n: Updated Chinese (China) (zh_CN) translation to 100% Yarema aka Knedlyk (4): l10n: Updated Ukrainian (uk) translation to 70% l10n: Updated Ukrainian (uk) translation to 86% l10n: Updated Ukrainian (uk) translation to 94% l10n: Updated Ukrainian (uk) translation to 96% douart patrick (2): l10n: Updated French (fr) translation to 99% l10n: Updated French (fr) translation to 100% gianluca f
[Xfce4-commits] Update po files
Updating branch refs/heads/master to 0c05c4fbddc53713dfe360bc02251d2d0c00b1fa (commit) from 8826cc74055688ab70f863746161beeda2cb08cb (commit) commit 0c05c4fbddc53713dfe360bc02251d2d0c00b1fa Author: Enrico Tröger Date: Sat Jul 31 15:44:12 2010 +0200 Update po files po/ast.po |2 +- po/bg.po|2 +- po/ca.po|2 +- po/cs.po|2 +- po/da.po|2 +- po/de.po|2 +- po/el.po|2 +- po/es.po|2 +- po/eu.po|2 +- po/fi.po|2 +- po/fr.po|2 +- po/gl.po|2 +- po/hr.po|2 +- po/hu.po|2 +- po/id.po|2 +- po/it.po|2 +- po/ja.po|2 +- po/kk.po|2 +- po/lv.po|2 +- po/nl.po|2 +- po/pl.po|2 +- po/pt.po|2 +- po/pt_BR.po |2 +- po/ru.po|2 +- po/sk.po|2 +- po/sv.po|2 +- po/tr.po|2 +- po/ug.po|2 +- po/uk.po|2 +- po/ur.po|2 +- po/ur_PK.po |2 +- po/zh_CN.po |2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/po/ast.po b/po/ast.po index 11634ed..ed2414d 100644 --- a/po/ast.po +++ b/po/ast.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:40+0200\n" +"POT-Creation-Date: 2010-07-31 15:43+0200\n" "PO-Revision-Date: 2009-07-13 19:55+0100\n" "Last-Translator: Marcos Antonio Alvarez Costales \n" "Language-Team: Asturian \n" diff --git a/po/bg.po b/po/bg.po index 97bc6e2..429c88b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:40+0200\n" +"POT-Creation-Date: 2010-07-31 15:43+0200\n" "PO-Revision-Date: 2009-02-13 00:56+0200\n" "Last-Translator: Adrian Dimitrov \n" "Language-Team: Bulgarian \n" diff --git a/po/ca.po b/po/ca.po index 1d1226d..4817eb3 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:40+0200\n" +"POT-Creation-Date: 2010-07-31 15:43+0200\n" "PO-Revision-Date: 2010-01-05 12:05+0100\n" "Last-Translator: Harald Servat \n" "Language-Team: Catalan\n" diff --git a/po/cs.po b/po/cs.po index 5a55aad..3d8364b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:40+0200\n" +"POT-Creation-Date: 2010-07-31 15:43+0200\n" "PO-Revision-Date: 2010-03-15 20:32+0100\n" "Last-Translator: Michal Várady \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index 52de729..364ab16 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:40+0200\n" +"POT-Creation-Date: 2010-07-31 15:43+0200\n" "PO-Revision-Date: 2010-01-19 10:21+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 32a2bd6..524e98a 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo 0.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:40+0200\n" +"POT-Creation-Date: 2010-07-31 15:43+0200\n" "PO-Revision-Date: 2009-04-13 14:30+0200\n" "Last-Translator: Fabian Nowak \n" "Language-Team: German \n" diff --git a/po/el.po b/po/el.po index 8d9b297..a5ee1c9 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:40+0200\n" +"POT-Creation-Date: 2010-07-31 15:43+0200\n" "PO-Revision-Date: 2010-01-29 23:19+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" diff --git a/po/es.po b/po/es.po index f1ab26d..7dcbf84 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gigolo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-31 15:40+0200\n" +"POT-Creation-Date: 2010-07-31 15:43+0200\n" "PO-Revision-Date: 2009-12-14 18:29-0300\n" "Last-Translator: elega \n" "Language-Team: Spanish\n" diff --git a
[Xfce4-commits] Version bump
Updating branch refs/heads/master to 8826cc74055688ab70f863746161beeda2cb08cb (commit) from c7a414eb7923ee8e91a3fd923b86ce2bbdaf1468 (commit) commit 8826cc74055688ab70f863746161beeda2cb08cb Author: Enrico Tröger Date: Sat Jul 31 15:42:27 2010 +0200 Version bump configure.ac |2 +- wscript |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 4ac4b65..2f5a659 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([gigolo], [0.4.0], [http://bugs.xfce.org/]) +AC_INIT([gigolo], [0.4.1], [http://bugs.xfce.org/]) AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/wscript b/wscript index 668dc5e..ec70cf1 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import sys, os, shutil APPNAME = 'gigolo' -VERSION = '0.4.0' +VERSION = '0.4.1' srcdir = '.' blddir = '_build_' ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix indentation
Updating branch refs/heads/master to c6420777a9f4e9b7a1d8d4c4e7c2a36eb331aa1d (commit) from f464a768880db0976b0f411d76cd60239055993c (commit) commit c6420777a9f4e9b7a1d8d4c4e7c2a36eb331aa1d Author: Enrico Tröger Date: Sat Jul 31 15:12:03 2010 +0200 Fix indentation src/mountdialog.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mountdialog.c b/src/mountdialog.c index a38ea79..f2aae52 100644 --- a/src/mountdialog.c +++ b/src/mountdialog.c @@ -77,7 +77,7 @@ static void gigolo_mount_dialog_destroy(GtkObject *widget) priv->timer_id = -1; } -GTK_OBJECT_CLASS(gigolo_mount_dialog_parent_class)->destroy(widget); + GTK_OBJECT_CLASS(gigolo_mount_dialog_parent_class)->destroy(widget); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use SSH/SFTP as default connection type for new bookmarks/connections
Updating branch refs/heads/master
to 26d953368d5acac2571b1029c611b102bc062a36 (commit)
from 8715d4422bb8e24474cf036b9cd89ae403901764 (commit)
commit 26d953368d5acac2571b1029c611b102bc062a36
Author: Enrico Tröger
Date: Sat Jul 31 15:28:57 2010 +0200
Use SSH/SFTP as default connection type for new bookmarks/connections
src/bookmarkeditdialog.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 3c0e1e7..aa27408 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -139,8 +139,8 @@ enum {
};
static struct MethodInfo methods[] = {
- { "ftp", 21, SHOW_PORT | SHOW_USER | SHOW_FOLDER },
{ "sftp", 22, SHOW_PORT | SHOW_USER | SHOW_FOLDER },
+ { "ftp", 21, SHOW_PORT | SHOW_USER | SHOW_FOLDER },
{ "smb", 0,SHOW_SHARE | SHOW_USER | SHOW_DOMAIN | SHOW_FOLDER },
{ "dav", 80, SHOW_PATH | SHOW_PORT | SHOW_USER | SHOW_FOLDER },
{ "davs", 443, SHOW_PATH | SHOW_PORT | SHOW_USER | SHOW_FOLDER },
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Don't try to destroy the mount progress dialog if it was closed before the mount finished
Updating branch refs/heads/master to 8715d4422bb8e24474cf036b9cd89ae403901764 (commit) from c6420777a9f4e9b7a1d8d4c4e7c2a36eb331aa1d (commit) commit 8715d4422bb8e24474cf036b9cd89ae403901764 Author: Enrico Tröger Date: Sat Jul 31 15:13:18 2010 +0200 Don't try to destroy the mount progress dialog if it was closed before the mount finished src/backendgvfs.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/backendgvfs.c b/src/backendgvfs.c index 29e85f3..50b7398 100644 --- a/src/backendgvfs.c +++ b/src/backendgvfs.c @@ -551,7 +551,7 @@ static void mount_ready_cb(GFile *location, GAsyncResult *res, MountInfo *mi) if (error != NULL) g_error_free(error); - if (mi->dialog != NULL) + if (mi->dialog != NULL && GTK_IS_WIDGET(mi->dialog)) gtk_widget_destroy(mi->dialog); g_free(uri); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix displayed URI/bookmark name in the mount progress dialog
Updating branch refs/heads/master
to f464a768880db0976b0f411d76cd60239055993c (commit)
from 20420e53a50e643ff88c382bd6209d26c73f532f (commit)
commit f464a768880db0976b0f411d76cd60239055993c
Author: Enrico Tröger
Date: Sat Jul 31 15:07:57 2010 +0200
Fix displayed URI/bookmark name in the mount progress dialog
src/bookmarkeditdialog.c |2 +-
src/common.h |3 +++
src/window.c |6 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 5cbeebb..3c0e1e7 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -765,7 +765,7 @@ static void update_bookmark(GigoloBookmarkEditDialog
*dialog)
if (*tmp) /* the name might be empty if the dialog is used as a
Connect dialog */
gigolo_bookmark_set_name(priv->bookmark_update, tmp);
else
- gigolo_bookmark_set_name(priv->bookmark_update, "none");
+ gigolo_bookmark_set_name(priv->bookmark_update,
GIGOLO_BOOKMARK_NAME_NONE);
if (idx == -1)
idx = 0;
diff --git a/src/common.h b/src/common.h
index 24a4e8e..cd01a4b 100644
--- a/src/common.h
+++ b/src/common.h
@@ -43,6 +43,9 @@ void debug(gchar const *format, ...) G_GNUC_PRINTF (1, 2);
# define debug(...)
#endif
+#define GIGOLO_BOOKMARK_NAME_NONE "none"
+
+
void verbose(gchar const *format, ...) G_GNUC_PRINTF (1, 2);
diff --git a/src/window.c b/src/window.c
index 284e6c6..1dc1944 100644
--- a/src/window.c
+++ b/src/window.c
@@ -250,7 +250,11 @@ void gigolo_window_mount_from_bookmark(GigoloWindow
*window, GigoloBookmark *boo
if (show_dialog)
{
const gchar *name = gigolo_bookmark_get_name(bookmark);
- gchar *label = g_strdup_printf(_("Connecting to \"%s\""), (name
!= NULL) ? name : uri);
+ gchar *label;
+
+ if (name == NULL || gigolo_str_equal(name,
GIGOLO_BOOKMARK_NAME_NONE))
+ name = uri;
+ label = g_strdup_printf(_("Connecting to \"%s\""), name);
dialog = gigolo_mount_dialog_new(GTK_WINDOW(window), label);
gtk_widget_show_all(dialog);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Ensure bookmark name is not empty
Updating branch refs/heads/master to 20420e53a50e643ff88c382bd6209d26c73f532f (commit) from 6a01eb372a7235fc933d0a3bce0aa9b520920ccb (commit) commit 20420e53a50e643ff88c382bd6209d26c73f532f Author: Enrico Tröger Date: Mon Jul 26 20:11:19 2010 +0200 Ensure bookmark name is not empty src/bookmarkeditdialog.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c index db1cbca..5cbeebb 100644 --- a/src/bookmarkeditdialog.c +++ b/src/bookmarkeditdialog.c @@ -764,6 +764,8 @@ static void update_bookmark(GigoloBookmarkEditDialog *dialog) tmp = gtk_entry_get_text(GTK_ENTRY(priv->name_entry)); if (*tmp) /* the name might be empty if the dialog is used as a Connect dialog */ gigolo_bookmark_set_name(priv->bookmark_update, tmp); + else + gigolo_bookmark_set_name(priv->bookmark_update, "none"); if (idx == -1) idx = 0; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Allow finishing the Connect / Bookmark Edit dialog by pressing Enter
Updating branch refs/heads/master
to 6a01eb372a7235fc933d0a3bce0aa9b520920ccb (commit)
from c1dfb5c2c3bdaad9e165233b696d4a03640704d1 (commit)
commit 6a01eb372a7235fc933d0a3bce0aa9b520920ccb
Author: Enrico Tröger
Date: Mon Jul 26 20:02:56 2010 +0200
Allow finishing the Connect / Bookmark Edit dialog by pressing Enter
src/bookmarkeditdialog.c | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 2931b82..db1cbca 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -923,6 +923,12 @@ static void host_entry_changed_cb(GtkEditable *editable,
GtkWidget *btn)
}
+static void entry_activate_cb(G_GNUC_UNUSED GtkEditable *editable,
GigoloBookmarkEditDialog *dialog)
+{
+ gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+}
+
+
static void gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
{
GtkWidget *label;
@@ -1033,6 +1039,13 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
g_signal_connect(priv->host_entry, "changed",
G_CALLBACK(host_entry_changed_cb), priv->share_button);
+ g_signal_connect(priv->name_entry, "activate",
G_CALLBACK(entry_activate_cb), dialog);
+ g_signal_connect(priv->uri_entry, "activate",
G_CALLBACK(entry_activate_cb), dialog);
+ g_signal_connect(priv->host_entry, "activate",
G_CALLBACK(entry_activate_cb), dialog);
+ g_signal_connect(priv->folder_entry, "activate",
G_CALLBACK(entry_activate_cb), dialog);
+ g_signal_connect(priv->path_entry, "activate",
G_CALLBACK(entry_activate_cb), dialog);
+ g_signal_connect(priv->user_entry, "activate",
G_CALLBACK(entry_activate_cb), dialog);
+
/* We need an extra ref so we can remove them from the table */
g_object_ref(priv->uri_entry);
g_object_ref(priv->uri_label);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] When pasting text in the speed reader, query only the main clipboard
Updating branch refs/heads/master
to 87998b7a3257af530997e9f3bf6decbffd0aa9f0 (commit)
from 5a7847bba8e4ff031ae4aa283be47840bd6c (commit)
commit 87998b7a3257af530997e9f3bf6decbffd0aa9f0
Author: Enrico Tröger
Date: Sat Jun 5 13:41:00 2010 +0200
When pasting text in the speed reader, query only the main clipboard
This mostly reverts the previous related commit as it turned out that
it would most often paste the selected text from the search field
which we don't want.
lib/speedreader.c | 11 +++
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/lib/speedreader.c b/lib/speedreader.c
index 069ca72..a3514d1 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -548,14 +548,9 @@ static void sr_clear_clicked_cb(GtkButton *button,
GtkTextBuffer *buffer)
static void sr_paste_clicked_cb(GtkButton *button, GtkTextBuffer *buffer)
{
- gchar *text;
- gtk_text_buffer_set_text(buffer, "", 0);
- text = dict_get_clipboard_contents();
- if (text != NULL)
- {
- gtk_text_buffer_set_text(buffer, text, -1);
- g_free(text);
- }
+ GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+ gtk_text_buffer_set_text(buffer, "", 0);
+ gtk_text_buffer_paste_clipboard(buffer, clipboard, NULL, TRUE);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Minor cleanup
Updating branch refs/heads/master
to 5a7847bba8e4ff031ae4aa283be47840bd6c (commit)
from 6640412a4fd7cad4c029ccb33774d6bc674bb897 (commit)
commit 5a7847bba8e4ff031ae4aa283be47840bd6c
Author: Enrico Tröger
Date: Sun May 30 19:17:15 2010 +0200
Minor cleanup
lib/prefs.c |8
panel-plugin/xfce4-dict-plugin.c |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/prefs.c b/lib/prefs.c
index 7b03bbb..e7ed636 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -315,7 +315,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
gtk_widget_show(radio_button);
gtk_box_pack_start(GTK_BOX(inner_vbox), radio_button, FALSE,
FALSE, 0);
g_object_set_data(G_OBJECT(radio_button), "type",
GINT_TO_POINTER(DICTMODE_DICT));
- g_signal_connect(G_OBJECT(radio_button), "toggled",
G_CALLBACK(search_method_changed), dd);
+ g_signal_connect(radio_button, "toggled",
G_CALLBACK(search_method_changed), dd);
radio_button = gtk_radio_button_new_with_label(search_method,
_("Web Service"));
search_method =
gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button));
@@ -324,7 +324,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
gtk_widget_show(radio_button);
gtk_box_pack_start(GTK_BOX(inner_vbox), radio_button, FALSE,
FALSE, 0);
g_object_set_data(G_OBJECT(radio_button), "type",
GINT_TO_POINTER(DICTMODE_WEB));
- g_signal_connect(G_OBJECT(radio_button), "toggled",
G_CALLBACK(search_method_changed), dd);
+ g_signal_connect(radio_button, "toggled",
G_CALLBACK(search_method_changed), dd);
radio_button = gtk_radio_button_new_with_label(search_method,
_("Spell Checker"));
search_method =
gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button));
@@ -333,7 +333,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
gtk_widget_show(radio_button);
gtk_box_pack_start(GTK_BOX(inner_vbox), radio_button, FALSE,
FALSE, 0);
g_object_set_data(G_OBJECT(radio_button), "type",
GINT_TO_POINTER(DICTMODE_SPELL));
- g_signal_connect(G_OBJECT(radio_button), "toggled",
G_CALLBACK(search_method_changed), dd);
+ g_signal_connect(radio_button, "toggled",
G_CALLBACK(search_method_changed), dd);
radio_button = gtk_radio_button_new_with_label(search_method,
_("Last used method"));
search_method =
gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button));
@@ -342,7 +342,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
gtk_widget_show(radio_button);
gtk_box_pack_start(GTK_BOX(inner_vbox), radio_button, FALSE,
FALSE, 0);
g_object_set_data(G_OBJECT(radio_button), "type",
GINT_TO_POINTER(DICTMODE_LAST_USED));
- g_signal_connect(G_OBJECT(radio_button), "toggled",
G_CALLBACK(search_method_changed), dd);
+ g_signal_connect(radio_button, "toggled",
G_CALLBACK(search_method_changed), dd);
label = gtk_label_new(_("Colors:"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index f3b6899..65eaa1b 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -220,7 +220,7 @@ static gboolean dict_plugin_set_selection(DictPanelData
*dpd)
XSelectInput(GDK_DISPLAY(), xwin, PropertyChangeMask);
XSetSelectionOwner(GDK_DISPLAY(), selection_atom, xwin,
GDK_CURRENT_TIME);
- g_signal_connect(G_OBJECT(win), "client-event",
G_CALLBACK(dict_plugin_message_received), dpd);
+ g_signal_connect(win, "client-event",
G_CALLBACK(dict_plugin_message_received), dpd);
return TRUE;
}
@@ -420,7 +420,7 @@ static void dict_plugin_construct(XfcePanelPlugin *plugin)
dict_gui_create_main_window(dpd->dd);
- g_signal_connect(dpd->dd->window, "delete_event",
G_CALLBACK(gtk_widget_hide_on_delete), NULL);
+ g_signal_connect(dpd->dd->window, "delete-event",
G_CALLBACK(gtk_widget_hide_on_delete), NULL);
g_signal_connect(dpd->dd->close_button, "clicked",
G_CALLBACK(dict_plugin_close_button_clicked), dpd);
g_signal_connect(plugin, "free-data",
G_CALLBACK(dict_plugin_free_data), dpd);
g_signal_connect(plugin, "size-changed",
G_CALLBACK(dict_plugin_panel_set_size), dpd);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] When pasting text, always first query the PRIMARY clipboard and in case we didn't find anything, query the main clipboard.
Updating branch refs/heads/master
to 6640412a4fd7cad4c029ccb33774d6bc674bb897 (commit)
from c94ceb68f638ab8e734fd4b8accfcedd02a5f535 (commit)
commit 6640412a4fd7cad4c029ccb33774d6bc674bb897
Author: Enrico Tröger
Date: Sun May 30 19:17:01 2010 +0200
When pasting text, always first query the PRIMARY clipboard and in case we
didn't find anything, query the main clipboard.
ChangeLog |3 +++
lib/common.c |9 +
lib/common.h |1 +
lib/speedreader.c |9 +++--
src/xfce4-dict.c |6 +-
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8fbf52a..eed937e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
Quit/Close main window if Escape is pressed.
* lib/speedreader.c:
Add a paste button to the Speed Reader.
+ * lib/common.c, lib/common.h, lib/speedreader.c, src/xfce4-dict.c:
+ When pasting text, always first query the PRIMARY clipboard
+ and in case we didn't find anything, query the main clipboard.
2010-01-01 Enrico Tröger
diff --git a/lib/common.c b/lib/common.c
index 9f9bd7b..556d3d1 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -626,3 +626,12 @@ void dict_show_msgbox(DictData *dd, gint type, const gchar
*text, ...)
}
+gchar *dict_get_clipboard_contents(void)
+{
+ gchar *text =
gtk_clipboard_wait_for_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY));
+
+ if (! text)
+ text =
gtk_clipboard_wait_for_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY));
+
+ return text;
+}
diff --git a/lib/common.h b/lib/common.h
index 115e857..7123540 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -136,6 +136,7 @@ void dict_drag_data_received(GtkWidget *widget,
GdkDragContext *drag_context, gi
DictData *dict_create_dictdata();
gboolean dict_start_web_query(DictData *dd, const gchar *word);
gchar *dict_get_web_query_uri(DictData *dd, const gchar *word);
+gchar *dict_get_clipboard_contents(void);
void dict_show_msgbox(DictData *dd, gint type, const gchar *text, ...)
G_GNUC_PRINTF (3, 4);
diff --git a/lib/speedreader.c b/lib/speedreader.c
index b875ac1..069ca72 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -548,9 +548,14 @@ static void sr_clear_clicked_cb(GtkButton *button,
GtkTextBuffer *buffer)
static void sr_paste_clicked_cb(GtkButton *button, GtkTextBuffer *buffer)
{
- GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+ gchar *text;
gtk_text_buffer_set_text(buffer, "", 0);
- gtk_text_buffer_paste_clipboard(buffer, clipboard, NULL, TRUE);
+ text = dict_get_clipboard_contents();
+ if (text != NULL)
+ {
+ gtk_text_buffer_set_text(buffer, text, -1);
+ g_free(text);
+ }
}
diff --git a/src/xfce4-dict.c b/src/xfce4-dict.c
index 38ce6d9..b7cb2cc 100644
--- a/src/xfce4-dict.c
+++ b/src/xfce4-dict.c
@@ -154,11 +154,7 @@ gint main(gint argc, gchar *argv[])
if (use_clipboard)
{
- search_text = gtk_clipboard_wait_for_text(gtk_clipboard_get(
- gdk_atom_intern("PRIMARY",
FALSE)));
- if (! search_text)
- search_text =
gtk_clipboard_wait_for_text(gtk_clipboard_get(
-
gdk_atom_intern("CLIPBOARD", FALSE)));
+ search_text = dict_get_clipboard_contents();
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Quit/Close main window if Escape is pressed (do it properly)
Updating branch refs/heads/master
to c94ceb68f638ab8e734fd4b8accfcedd02a5f535 (commit)
from 7ccb1eb4e15e7ab69d2966adf20cfbc5a2925407 (commit)
commit c94ceb68f638ab8e734fd4b8accfcedd02a5f535
Author: Enrico Tröger
Date: Sun May 30 12:55:17 2010 +0200
Quit/Close main window if Escape is pressed (do it properly)
lib/gui.c | 16
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index 552cf9f..8e19194 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -615,16 +615,6 @@ void dict_gui_finalize(DictData *dd)
gdk_cursor_unref(regular_cursor);
}
-static gboolean window_key_release_cb(GtkWidget *widget, GdkEventKey *event,
DictData *dd)
-{
- if (event->keyval == GDK_Escape)
- {
- /* quit on Escape */
- g_signal_emit_by_name(dd->close_button, "clicked");
- }
- return FALSE;
-}
-
void dict_gui_create_main_window(DictData *dd)
{
@@ -632,6 +622,7 @@ void dict_gui_create_main_window(DictData *dd)
GtkWidget *sep, *align, *scrolledwindow_results;
GdkPixbuf *icon;
GtkWidget *method_chooser, *radio, *label, *button;
+ GtkAccelGroup *accel_group = gtk_accel_group_new();
dd->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(dd->window), _("Dictionary"));
@@ -642,8 +633,6 @@ void dict_gui_create_main_window(DictData *dd)
gtk_window_set_icon(GTK_WINDOW(dd->window), icon);
g_object_unref(icon);
- g_signal_connect(dd->window, "key-release-event",
G_CALLBACK(window_key_release_cb), dd);
-
main_box = gtk_vbox_new(FALSE, 0);
gtk_widget_show(main_box);
gtk_container_add(GTK_CONTAINER(dd->window), main_box);
@@ -826,6 +815,9 @@ void dict_gui_create_main_window(DictData *dd)
if (dd->geometry[4] == 1)
gtk_window_maximize(GTK_WINDOW(dd->window));
}
+ /* quit on Escape */
+ gtk_widget_add_accelerator(dd->close_button, "clicked", accel_group,
GDK_Escape, 0, 0);
+ gtk_window_add_accel_group(GTK_WINDOW(dd->window), accel_group);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Explicitly handle GTK_RESPONSE_DELETE_EVENT as well
Updating branch refs/heads/master
to 7ccb1eb4e15e7ab69d2966adf20cfbc5a2925407 (commit)
from ba4136fa7380336e614e80cb7428d535e47ec6e1 (commit)
commit 7ccb1eb4e15e7ab69d2966adf20cfbc5a2925407
Author: Enrico Tröger
Date: Sun May 30 12:03:50 2010 +0200
Explicitly handle GTK_RESPONSE_DELETE_EVENT as well
lib/speedreader.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/speedreader.c b/lib/speedreader.c
index 6fc9cf9..b875ac1 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -465,7 +465,7 @@ static void xfd_speed_reader_response_cb(XfdSpeedReader
*dialog, gint response,
{
XfdSpeedReaderPrivate *priv = XFD_SPEED_READER_GET_PRIVATE(dialog);
- if (response == GTK_RESPONSE_CLOSE)
+ if (response == GTK_RESPONSE_CLOSE || response ==
GTK_RESPONSE_DELETE_EVENT)
{
gtk_widget_destroy(GTK_WIDGET(dialog));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add a paste button to the Speed Reader.
Updating branch refs/heads/master
to ba4136fa7380336e614e80cb7428d535e47ec6e1 (commit)
from 3b9cd23c5fe85fd81697a2381d619e48d0ea23d3 (commit)
commit ba4136fa7380336e614e80cb7428d535e47ec6e1
Author: Enrico Tröger
Date: Sun May 30 11:59:58 2010 +0200
Add a paste button to the Speed Reader.
ChangeLog |2 ++
lib/speedreader.c | 20 +++-
2 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e5dc7ff..8fbf52a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* lib/gui.c:
Quit/Close main window if Escape is pressed.
+ * lib/speedreader.c:
+ Add a paste button to the Speed Reader.
2010-01-01 Enrico Tröger
diff --git a/lib/speedreader.c b/lib/speedreader.c
index ee5f22f..6fc9cf9 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -546,6 +546,14 @@ static void sr_clear_clicked_cb(GtkButton *button,
GtkTextBuffer *buffer)
}
+static void sr_paste_clicked_cb(GtkButton *button, GtkTextBuffer *buffer)
+{
+ GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+ gtk_text_buffer_set_text(buffer, "", 0);
+ gtk_text_buffer_paste_clipboard(buffer, clipboard, NULL, TRUE);
+}
+
+
static void sr_spin_grouping_changed_cb(GtkSpinButton *button, GtkLabel *label)
{
gint count = gtk_spin_button_get_value_as_int(button);
@@ -563,7 +571,7 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
{
GtkWidget *label_intro, *label_words, *label_font, *label_grouping,
*label_grouping_desc;
GtkWidget *vbox, *hbox_words, *hbox_font, *hbox_grouping, *swin,
*textview;
- GtkWidget *vbox_text_buttons, *hbox_text, *button_clear, *button_open;
+ GtkWidget *vbox_text_buttons, *hbox_text, *button_clear, *button_paste,
*button_open;
GtkSizeGroup *sizegroup;
XfdSpeedReaderPrivate *priv = XFD_SPEED_READER_GET_PRIVATE(dialog);
@@ -646,6 +654,15 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
gtk_widget_set_tooltip_text(button_open, _("Load the contents of a
file"));
#endif
+ button_paste = gtk_button_new();
+ gtk_button_set_image(GTK_BUTTON(button_paste),
+ gtk_image_new_from_stock(GTK_STOCK_PASTE, GTK_ICON_SIZE_MENU));
+ g_signal_connect(button_paste, "clicked",
G_CALLBACK(sr_paste_clicked_cb), priv->buffer);
+#if GTK_CHECK_VERSION(2, 12, 0)
+ gtk_widget_set_tooltip_text(button_paste,
+ _("Clear the contents of the text field and paste the contents
of the clipboard"));
+#endif
+
button_clear = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(button_clear),
gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU));
@@ -656,6 +673,7 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
vbox_text_buttons = gtk_vbox_new(FALSE, 6);
gtk_box_pack_start(GTK_BOX(vbox_text_buttons), button_open, FALSE,
FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox_text_buttons), button_paste, FALSE,
FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox_text_buttons), button_clear, FALSE,
FALSE, 0);
hbox_text = gtk_hbox_new(FALSE, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Quit/Close main window if Escape is pressed.
Updating branch refs/heads/master
to 3b9cd23c5fe85fd81697a2381d619e48d0ea23d3 (commit)
from 7398e3d577daf29867864209e83840f517d5ee64 (commit)
commit 3b9cd23c5fe85fd81697a2381d619e48d0ea23d3
Author: Enrico Tröger
Date: Sun May 30 11:46:49 2010 +0200
Quit/Close main window if Escape is pressed.
ChangeLog |6 ++
lib/gui.c | 12
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8023c91..e5dc7ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-29 Enrico Tröger
+
+ * lib/gui.c:
+ Quit/Close main window if Escape is pressed.
+
+
2010-01-01 Enrico Tröger
* *:
diff --git a/lib/gui.c b/lib/gui.c
index 1054158..552cf9f 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -615,6 +615,16 @@ void dict_gui_finalize(DictData *dd)
gdk_cursor_unref(regular_cursor);
}
+static gboolean window_key_release_cb(GtkWidget *widget, GdkEventKey *event,
DictData *dd)
+{
+ if (event->keyval == GDK_Escape)
+ {
+ /* quit on Escape */
+ g_signal_emit_by_name(dd->close_button, "clicked");
+ }
+ return FALSE;
+}
+
void dict_gui_create_main_window(DictData *dd)
{
@@ -632,6 +642,8 @@ void dict_gui_create_main_window(DictData *dd)
gtk_window_set_icon(GTK_WINDOW(dd->window), icon);
g_object_unref(icon);
+ g_signal_connect(dd->window, "key-release-event",
G_CALLBACK(window_key_release_cb), dd);
+
main_box = gtk_vbox_new(FALSE, 0);
gtk_widget_show(main_box);
gtk_container_add(GTK_CONTAINER(dd->window), main_box);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Improve generation of po/LINGUAS file
Updating branch refs/heads/master
to 515b3f7279bde3c0ad25e06680c115ef2df07ab3 (commit)
from 8a1d9f5f0259f15391c912e029bc8df446045a0d (commit)
commit 515b3f7279bde3c0ad25e06680c115ef2df07ab3
Author: Enrico Tröger
Date: Thu Apr 29 18:01:29 2010 +0200
Improve generation of po/LINGUAS file
wscript |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/wscript b/wscript
index 973841e..668dc5e 100644
--- a/wscript
+++ b/wscript
@@ -89,7 +89,10 @@ def set_options(opt):
def write_linguas_file(self):
linguas = ''
if 'LINGUAS' in Build.bld.env:
- linguas = Build.bld.env['LINGUAS']
+ files = Build.bld.env['LINGUAS']
+ for po_filename in files.split(' '):
+ if os.path.exists('po/%s.po' % po_filename):
+ linguas += '%s ' % po_filename
else:
files = os.listdir('%s/po' % self.path.abspath())
files.sort()
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Completely remove the preference to select the Volume Manager implementation
Updating branch refs/heads/master
to 8a1d9f5f0259f15391c912e029bc8df446045a0d (commit)
from 40d41f20328d44c73a91d670d3e173d4e22572f6 (commit)
commit 8a1d9f5f0259f15391c912e029bc8df446045a0d
Author: Enrico Tröger
Date: Thu Apr 29 17:56:37 2010 +0200
Completely remove the preference to select the Volume Manager implementation
Since GVfs doesn't provide HAL anymore but uses GDU now, we remove the
preference to not provide hard-coded defaults.
src/main.c |6 --
src/preferencesdialog.c | 36 ++--
src/settings.c | 35 ---
3 files changed, 2 insertions(+), 75 deletions(-)
diff --git a/src/main.c b/src/main.c
index 91c9431..6f4114b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -68,7 +68,6 @@ gint main(gint argc, gchar** argv)
{
GigoloSettings *settings;
GigoloSingleInstance *gis = NULL;
- const gchar *vm_impl;
gchar *accel_filename;
GOptionContext *context;
GtkWidget *window;
@@ -124,11 +123,6 @@ gint main(gint argc, gchar** argv)
accel_filename = g_build_filename(g_get_user_config_dir(), PACKAGE,
"accels", NULL);
gtk_accel_map_load(accel_filename);
- /* GVfs currently depends on gnome-mount for HAL-based GVolumeMonitor
implementation,
-* when gnome-mount is not installed, we can use "unix" as
GVolumeMonitor implementation. */
- if ((vm_impl = gigolo_settings_get_vm_impl(settings)) != NULL)
- g_setenv("GIO_USE_VOLUME_MONITOR", vm_impl, 0);
-
window = gigolo_window_new(settings);
if (gis != NULL)
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index f831b72..d080b8a 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -85,12 +85,6 @@ static GtkWidget *xfce_header_new(const gchar *icon, const
gchar *title)
}
-static void vm_imple_toggle_cb(GtkToggleButton *button, GigoloSettings
*settings)
-{
- gigolo_settings_set_vm_impl(settings,
g_object_get_data(G_OBJECT(button), "impl"));
-}
-
-
static void check_button_toggle_cb(GtkToggleButton *button, GigoloSettings
*settings)
{
gboolean toggled = gtk_toggle_button_get_active(button);
@@ -311,10 +305,9 @@ static GtkWidget *add_spinbutton(GigoloSettings *settings,
const gchar *property
static void set_settings(GigoloPreferencesDialog *dialog, GigoloSettings
*settings)
{
GtkWidget *frame_vbox, *notebook_vbox, *vbox, *hbox, *notebook;
- GtkWidget *radio1, *radio2, *checkbox, *combo, *entry,
*combo_toolbar_style, *tmp_box;
+ GtkWidget *checkbox, *combo, *entry, *combo_toolbar_style, *tmp_box;
GtkWidget *combo_toolbar_orient, *spinbutton;
- GtkWidget *label1, *label2, *label3, *label4, *label_volman, *image;
- GSList *rlist;
+ GtkWidget *label1, *label2, *label3, *label4, *image;
GtkSizeGroup *sg;
vbox = gigolo_dialog_get_content_area(GTK_DIALOG(dialog));
@@ -371,31 +364,6 @@ static void set_settings(GigoloPreferencesDialog *dialog,
GigoloSettings *settin
gtk_box_pack_start(GTK_BOX(frame_vbox), gtk_label_new(""), FALSE,
FALSE, 0);
- label_volman = gtk_label_new(_("The HAL based volume manager
implementation requires the tool 'gnome-mount' to mount local resources like
disks. The Unix based volume manager implementation can mount such resources
directly and also lists other local devices.\nIf you are unsure, use the HAL
based monitor."));
- gtk_label_set_line_wrap(GTK_LABEL(label_volman), TRUE);
- gtk_label_set_line_wrap_mode(GTK_LABEL(label_volman), PANGO_WRAP_WORD);
- gtk_misc_set_alignment(GTK_MISC(label_volman), 0.0f, 0.5f);
- gtk_box_pack_start(GTK_BOX(frame_vbox), label_volman, FALSE, FALSE, 0);
-
- radio1 = gtk_radio_button_new_with_mnemonic(NULL, _("Use _HAL based
volume manager"));
- gtk_widget_set_tooltip_markup(radio1, _("Changing this option
requires a restart of Gigolo."));
- rlist = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio1));
- if (strcmp(gigolo_settings_get_vm_impl(settings), "hal") == 0)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio1), TRUE);
- gtk_box_pack_start(GTK_BOX(frame_vbox), radio1, FALSE, FALSE, 0);
- g_object_set_data(G_OBJECT(radio1), "impl", (gpointer) "hal");
-
- radio2 = gtk_radio_button_new_with_mnemonic(rlist, _("Use _Unix based
volume manager"));
- gtk_widget_set_tooltip_markup(radio2, _("Changing this option
requires a restart of Gigolo."));
- rlist = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio2));
- if (strcmp(gigolo_settings_get_vm_impl(settings), "unix") == 0)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio2), TRUE);
- gtk_box_pack_start(GTK_BOX
[Xfce4-commits] Fix a stupid typo which causes lots of unnecessary casts
Updating branch refs/heads/master
to a4bc10567790f71920d7286f6f791db585d55677 (commit)
from a95036f97824c682ca2c10ed3deb99195ed3c4eb (commit)
commit a4bc10567790f71920d7286f6f791db585d55677
Author: Enrico Tröger
Date: Mon Jan 18 00:02:27 2010 +0100
Fix a stupid typo which causes lots of unnecessary casts
src/bookmarkeditdialog.c | 10 +-
src/common.c |2 +-
src/common.h |2 +-
src/window.c |4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 1b1398d..2931b82 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -211,7 +211,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
- gigolo_message_dialog((gpointer)dialog,
GTK_MESSAGE_ERROR, _("Error"),
+ gigolo_message_dialog(dialog,
GTK_MESSAGE_ERROR, _("Error"),
_("You must enter a name for
the bookmark."), NULL);
gtk_widget_grab_focus(priv->name_entry);
}
@@ -230,7 +230,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (gigolo_str_equal(tmp,
gigolo_bookmark_get_name(bm)))
{
error = TRUE;
-
gigolo_message_dialog((gpointer)dialog, GTK_MESSAGE_ERROR, _("Error"),
+
gigolo_message_dialog(dialog, GTK_MESSAGE_ERROR, _("Error"),
_("The entered bookmark name is already in use. Please
choose another one."), NULL);
gtk_widget_grab_focus(priv->name_entry);
}
@@ -243,7 +243,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
- gigolo_message_dialog((gpointer)dialog,
GTK_MESSAGE_ERROR, _("Error"),
+ gigolo_message_dialog(dialog,
GTK_MESSAGE_ERROR, _("Error"),
_("You must enter a server
address or name."), NULL);
gtk_widget_grab_focus(priv->host_entry);
}
@@ -254,7 +254,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
- gigolo_message_dialog((gpointer)dialog,
GTK_MESSAGE_ERROR, _("Error"),
+ gigolo_message_dialog(dialog,
GTK_MESSAGE_ERROR, _("Error"),
_("You must enter a share
name."), NULL);
gtk_widget_grab_focus(priv->share_combo);
}
@@ -265,7 +265,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
- gigolo_message_dialog((gpointer)dialog,
GTK_MESSAGE_ERROR, _("Error"),
+ gigolo_message_dialog(dialog,
GTK_MESSAGE_ERROR, _("Error"),
_("You must enter a valid URI
for the connection."), NULL);
gtk_widget_grab_focus(priv->uri_entry);
}
diff --git a/src/common.c b/src/common.c
index ebb6d2d..13ad491 100644
--- a/src/common.c
+++ b/src/common.c
@@ -149,7 +149,7 @@ gboolean gigolo_is_desktop_xfce(void)
}
-gboolean gigolo_message_dialog(gpointer *parent, gint type, const gchar *title,
+gboolean gigolo_message_dialog(gpointer parent, gint type, const gchar *title,
const gchar *text,
const gchar *secondary)
{
gboolean ret = FALSE;
diff --git a/src/common.h b/src/common.h
index 554e4ab..24a4e8e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -58,7 +58,7 @@ void gigolo_show_uri(const gchar *uri);
guint gigolo_get_default_port(const gchar *schem
[Xfce4-commits] Expand tilde in folder names if a username is set for the bookmark
Updating branch refs/heads/master
to 7904194c58633270be180e54f660dc62aea778a1 (commit)
from 0ec84f42a1dc3184cab04348b9b0147d95bc4203 (commit)
commit 7904194c58633270be180e54f660dc62aea778a1
Author: Enrico Tröger
Date: Sun Jan 17 23:58:16 2010 +0100
Expand tilde in folder names if a username is set for the bookmark
src/bookmark.c | 19 +++
src/bookmark.h |1 +
src/bookmarkeditdialog.c |2 --
src/window.c | 12 ++--
4 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/bookmark.c b/src/bookmark.c
index 12c701f..9df9282 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -430,6 +430,25 @@ const gchar *gigolo_bookmark_get_folder(GigoloBookmark
*bookmark)
}
+gchar *gigolo_bookmark_get_folder_expanded(GigoloBookmark *bookmark)
+{
+ const gchar *folder;
+ const gchar *username;
+ gchar *result;
+
+ g_return_val_if_fail(bookmark != NULL, NULL);
+
+ folder = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark)->folder;
+ username = gigolo_bookmark_get_user(bookmark);
+ if (NZV(folder) && username && folder[0] == '~')
+ result = g_strconcat("/home/", username, folder + 1, NULL);
+ else
+ result = g_strdup(folder);
+
+ return result;
+}
+
+
void gigolo_bookmark_set_folder(GigoloBookmark *bookmark, const gchar *folder)
{
GigoloBookmarkPrivate *priv;
diff --git a/src/bookmark.h b/src/bookmark.h
index 4c8ca56..7b82bd9 100644
--- a/src/bookmark.h
+++ b/src/bookmark.h
@@ -67,6 +67,7 @@ void gigolo_bookmark_set_host
(GigoloBookmark *bookmark, const gchar *host);
const gchar* gigolo_bookmark_get_folder (GigoloBookmark
*bookmark);
void gigolo_bookmark_set_folder
(GigoloBookmark *bookmark, const gchar *folder);
+gchar*
gigolo_bookmark_get_folder_expanded(GigoloBookmark *bookmark);
const gchar* gigolo_bookmark_get_path(GigoloBookmark
*bookmark);
void gigolo_bookmark_set_path
(GigoloBookmark *bookmark, const gchar *path);
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 3b1bf29..1b1398d 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -276,7 +276,6 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (tmp[0] == '/')
{ /* remove leading slashes */
gtk_entry_set_text(GTK_ENTRY(priv->path_entry), tmp + 1);
-
}
}
if (! error && gtk_widget_get_parent(priv->share_entry)
!= NULL)
@@ -285,7 +284,6 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (tmp[0] == '/')
{ /* remove leading slashes */
gtk_entry_set_text(GTK_ENTRY(priv->share_entry), tmp + 1);
-
}
}
if (! error)
diff --git a/src/window.c b/src/window.c
index f9b5a93..d5decd4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -500,7 +500,11 @@ static void action_copy_uri_cb(G_GNUC_UNUSED GtkAction
*action, GigoloWindow *wi
b = gigolo_settings_get_bookmark_by_uri(priv->settings,
uri);
if (b != NULL)
- setptr(uri, g_build_filename(uri,
gigolo_bookmark_get_folder(b), NULL));
+ {
+ gchar *folder =
gigolo_bookmark_get_folder_expanded(b);
+ setptr(uri, g_build_filename(uri, folder,
NULL));
+ g_free(folder);
+ }
gtk_clipboard_set_text(gtk_clipboard_get(gdk_atom_intern("CLIPBOARD", FALSE)),
uri, -1);
@@ -536,7 +540,11 @@ static void action_open_cb(G_GNUC_UNUSED GtkAction
*action, GigoloWindow *window
gigolo_backend_gvfs_get_name_and_uri_from_mount(mnt,
NULL, &uri);
b = gigolo_settings_get_bookmark_by_uri(priv->settings,
uri);
if (b != NULL)
- setptr(uri, g_build_filename(uri,
gigolo_bookmark_get_folder(b), NULL));
+ {
+ gchar *folder =
gigolo_bookmark_get_folder_expanded(b);
+ setptr(uri, g_build_filename(uri, folder,
NULL));
+ g_free(folder);
+ }
/* escape spaces and similar */
[Xfce4-commits] Show an error message dialog if the file-manager command failed to execute
Updating branch refs/heads/master
to a95036f97824c682ca2c10ed3deb99195ed3c4eb (commit)
from 7904194c58633270be180e54f660dc62aea778a1 (commit)
commit a95036f97824c682ca2c10ed3deb99195ed3c4eb
Author: Enrico Tröger
Date: Sun Jan 17 23:59:00 2010 +0100
Show an error message dialog if the file-manager command failed to execute
src/window.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/window.c b/src/window.c
index d5decd4..00a1b28 100644
--- a/src/window.c
+++ b/src/window.c
@@ -551,8 +551,11 @@ static void action_open_cb(G_GNUC_UNUSED GtkAction
*action, GigoloWindow *window
cmd = g_strconcat(file_manager, " \"", uri, "\"", NULL);
if (! g_spawn_command_line_async(cmd, &error))
{
- verbose("%s", error->message);
+ gchar *msg = g_strdup_printf(_("The command
'%s' failed"), cmd);
+ gigolo_message_dialog((gpointer) window,
GTK_MESSAGE_ERROR, _("Error"), msg, error->message);
+ verbose("%s: %s", msg, error->message);
g_error_free(error);
+ g_free(msg);
}
g_free(cmd);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Respect the LINGUAS environment variable when configuring the build system
Updating branch refs/heads/master
to 0ec84f42a1dc3184cab04348b9b0147d95bc4203 (commit)
from fe79d1bf25ac86d5472a1870196f6f72c750dd04 (commit)
commit 0ec84f42a1dc3184cab04348b9b0147d95bc4203
Author: Enrico Tröger
Date: Sun Jan 17 19:03:59 2010 +0100
Respect the LINGUAS environment variable when configuring the build system
This time for the autotools based build
configure.ac | 11 ---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index b813474..4ac4b65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,10 +37,15 @@ GETTEXT_PACKAGE=gigolo
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package.])
-if test -z "$conf_dir" ; then
- conf_dir="."
+if [ "${LINGUAS}" ]
+then
+ ALL_LINGUAS="${LINGUAS}"
+else
+ if test -z "$conf_dir" ; then
+ conf_dir="."
+ fi
+ ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null |
$AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'`
fi
-ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK
'BEGIN { FS="."; ORS=" " } { print $1 }'`
AM_GLIB_GNU_GETTEXT
# workaround for intltool bug
(http://bugzilla.gnome.org/show_bug.cgi?id=490845)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Respect the LINGUAS environment variable when configuring the build system
Updating branch refs/heads/master
to e8e5b30a18d3bfac3f3b3a7e1d74f80add23f618 (commit)
from c297ecf31ead7ce3b12c17767a2463af88744396 (commit)
commit e8e5b30a18d3bfac3f3b3a7e1d74f80add23f618
Author: Enrico Tröger
Date: Sun Jan 17 18:49:19 2010 +0100
Respect the LINGUAS environment variable when configuring the build system
wscript | 14 ++
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/wscript b/wscript
index 1cfccc8..0889e7d 100644
--- a/wscript
+++ b/wscript
@@ -58,6 +58,9 @@ def configure(conf):
conf.write_config_header('config.h')
+ if 'LINGUAS' in os.environ:
+ conf.env['LINGUAS'] = os.environ['LINGUAS']
+
# debug flags
if Options.options.debug:
conf.env.append_value('CCFLAGS', '-g -O0 -DDEBUG '.split())
@@ -85,10 +88,13 @@ def set_options(opt):
@feature('intltool_po')
def write_linguas_file(self):
linguas = ''
- files = os.listdir('%s/po' % self.path.abspath())
- for f in files:
- if f.endswith('.po'):
- linguas += '%s ' % f[:-3]
+ if 'LINGUAS' in Build.bld.env:
+ linguas = Build.bld.env['LINGUAS']
+ else:
+ files = os.listdir('%s/po' % self.path.abspath())
+ for f in files:
+ if f.endswith('.po'):
+ linguas += '%s ' % f[:-3]
f = open("po/LINGUAS", "w")
f.write('# This file is autogenerated. Do not edit.\n%s\n' % linguas)
f.close()
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] And sort the list of available languages before writing them into the LINGUAS file
Updating branch refs/heads/master
to fe79d1bf25ac86d5472a1870196f6f72c750dd04 (commit)
from e8e5b30a18d3bfac3f3b3a7e1d74f80add23f618 (commit)
commit fe79d1bf25ac86d5472a1870196f6f72c750dd04
Author: Enrico Tröger
Date: Sun Jan 17 18:53:45 2010 +0100
And sort the list of available languages before writing them into the
LINGUAS file
This is not necessary at all but just nice
wscript |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/wscript b/wscript
index 0889e7d..973841e 100644
--- a/wscript
+++ b/wscript
@@ -92,6 +92,7 @@ def write_linguas_file(self):
linguas = Build.bld.env['LINGUAS']
else:
files = os.listdir('%s/po' % self.path.abspath())
+ files.sort()
for f in files:
if f.endswith('.po'):
linguas += '%s ' % f[:-3]
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Delete pot file
Updating branch refs/heads/master to a0693101b2b8da314cd75e51d616f80aa7036b58 (commit) from 27e937deb35cebc44be25c4c9a01aff4487e1348 (commit) commit a0693101b2b8da314cd75e51d616f80aa7036b58 Author: Enrico Tröger Date: Mon Jan 4 20:31:27 2010 +0100 Delete pot file po/gigolo.pot | 579 - 1 files changed, 0 insertions(+), 579 deletions(-) diff --git a/po/gigolo.pot b/po/gigolo.pot deleted file mode 100644 index 86be133..000 --- a/po/gigolo.pot +++ /dev/null @@ -1,579 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-20 12:01+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../src/main.c:46 -msgid "Ignore running instances, enforce opening a new instance" -msgstr "" - -#: ../src/main.c:47 -msgid "Print a list of supported URI schemes" -msgstr "" - -#: ../src/main.c:48 -msgid "Be verbose" -msgstr "" - -#: ../src/main.c:49 -msgid "Show version information" -msgstr "" - -#: ../src/main.c:80 -msgid "- a simple frontend to easily connect to remote filesystems" -msgstr "" - -#: ../src/common.c:77 -msgid "Unix Device" -msgstr "" - -#: ../src/common.c:79 -msgid "Windows Share" -msgstr "" - -#: ../src/common.c:81 -msgid "FTP" -msgstr "" - -#: ../src/common.c:83 -msgid "HTTP" -msgstr "" - -#: ../src/common.c:85 -msgid "SSH" -msgstr "" - -#: ../src/common.c:87 -msgid "Obex" -msgstr "" - -#: ../src/common.c:89 -msgid "WebDAV" -msgstr "" - -#: ../src/common.c:91 -msgid "WebDAV (secure)" -msgstr "" - -#: ../src/common.c:93 ../src/window.c:1352 -msgid "Network" -msgstr "" - -#: ../src/common.c:95 -msgid "Archive" -msgstr "" - -#: ../src/common.c:97 -msgid "Photos" -msgstr "" - -#: ../src/common.c:99 -msgid "Custom Location" -msgstr "" - -#: ../src/window.c:253 -#, c-format -msgid "Connecting to \"%s\"" -msgstr "" - -#: ../src/window.c:421 ../gigolo.desktop.in.h:1 -msgid "A simple frontend to easily connect to remote filesystems" -msgstr "" - -#: ../src/window.c:422 -msgid "Copyright 2008-2009 Enrico Tröger" -msgstr "" - -#: ../src/window.c:425 -msgid "translator-credits" -msgstr "" - -#: ../src/window.c:457 -msgid "Gigolo can use the following protocols provided by GVfs:" -msgstr "" - -#: ../src/window.c:671 ../src/bookmarkeditdialog.c:214 -#: ../src/bookmarkeditdialog.c:233 ../src/bookmarkeditdialog.c:246 -#: ../src/bookmarkeditdialog.c:257 ../src/bookmarkeditdialog.c:268 -msgid "Error" -msgstr "" - -#: ../src/window.c:1138 -msgid "_File" -msgstr "" - -#: ../src/window.c:1139 -msgid "_Edit" -msgstr "" - -#: ../src/window.c:1140 -msgid "_Actions" -msgstr "" - -#: ../src/window.c:1141 -msgid "_View" -msgstr "" - -#: ../src/window.c:1142 -msgid "_Help" -msgstr "" - -#: ../src/window.c:1146 ../src/browsenetworkpanel.c:453 -#: ../src/browsenetworkpanel.c:497 -msgid "Create _Bookmark" -msgstr "" - -#: ../src/window.c:1148 -msgid "_Edit Bookmarks" -msgstr "" - -#: ../src/window.c:1149 -msgid "Open the bookmark manager to add, edit or delete bookmarks" -msgstr "" - -#: ../src/window.c:1153 -msgid "Disconnect the selected resource" -msgstr "" - -#: ../src/window.c:1155 -msgid "Open the selected resource with a file manager" -msgstr "" - -#: ../src/window.c:1156 -msgid "Copy _URI" -msgstr "" - -#: ../src/window.c:1157 -msgid "Quit Gigolo" -msgstr "" - -#: ../src/window.c:1158 -msgid "Online Help" -msgstr "" - -#: ../src/window.c:1159 -msgid "Supported Protocols" -msgstr "" - -#: ../src/window.c:1165 -msgid "Side _Panel" -msgstr "" - -#: ../src/window.c:1167 -msgid "_Toolbar" -msgstr "" - -#: ../src/window.c:1169 -msgid "Status _Icon" -msgstr "" - -#: ../src/window.c:1175 -msgid "View as _Sy
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-dict
Updating branch refs/heads/master to 80382d07fe62b21cb8e528dc88e5e9abbb45ec70 (commit) from 24ce294d348f8df53f68f97d40701580f762d773 (commit) commit 80382d07fe62b21cb8e528dc88e5e9abbb45ec70 Merge: 24ce294d348f8df53f68f97d40701580f762d773 085ceae1d59982bf39e2d511a14c9091983c972a Author: Enrico Tröger Date: Mon Jan 4 20:19:09 2010 +0100 Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-dict commit 085ceae1d59982bf39e2d511a14c9091983c972a Author: Michal Várady Date: Mon Jan 4 17:31:12 2010 + l10n: Updates to Czech (cs) translation Transmitted-via: Transifex (translations.xfce.org) commit 41801e171abd3a7da82154c48815020b0c38e0fb Author: Masato Hashimoto Date: Sun Jan 3 15:06:59 2010 + l10n: Updates to Japanese (ja) translation Transmitted-via: Transifex (translations.xfce.org) commit 68cf88c96bce0023d7fd6fd3d26afffeb5055112 Author: Harald Servat Date: Sun Jan 3 14:34:27 2010 + l10n: Updates to Catalan (Valencian) (ca) translation Transmitted-via: Transifex (translations.xfce.org) po/ca.po | 86 +++ po/cs.po | 171 - po/ja.po |8 ++-- 3 files changed, 125 insertions(+), 140 deletions(-) diff --git a/po/ca.po b/po/ca.po index 8dd82eb..962f676 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: xfce4-dict-plugin 0.3.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-12-30 14:17+0100\n" -"PO-Revision-Date: 2009-01-20 15:21+0100\n" -"Last-Translator: Carles Muñoz Gorriz \n" +"PO-Revision-Date: 2010-01-03 15:32+0100\n" +"Last-Translator: Harald Servat \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,9 +95,8 @@ msgid "Dictionary Client" msgstr "Client de diccionari" #: ../lib/spell.c:75 -#, fuzzy msgid "Spell Checker Results:" -msgstr "Comprovador d'ortografia" +msgstr "Resultats del comprovador ortogràfic:" #: ../lib/spell.c:101 #, c-format @@ -107,19 +106,19 @@ msgstr[0] "%d suggeriment trobat." msgstr[1] "%d suggeriments trobats." #: ../lib/spell.c:105 -#, fuzzy, c-format +#, c-format msgid "Suggestions for \"%s\" (%s):" -msgstr "Suggeriment per «%s»:" +msgstr "Suggeriment per «%s» (%s):" #: ../lib/spell.c:122 -#, fuzzy, c-format +#, c-format msgid "\"%s\" is spelled correctly (%s)." -msgstr "«%s» està escrit correctament." +msgstr "«%s» està escrit correctament (%s)." #: ../lib/spell.c:134 -#, fuzzy, c-format +#, c-format msgid "No suggestions could be found for \"%s\" (%s)." -msgstr "No s'ha trobat cp suggeriment per «%s»." +msgstr "No s'ha trobat cap suggeriment per «%s» (%s)." #. translation hint: #. * Error while executing () @@ -145,65 +144,67 @@ msgstr "Ha fallat el procés (%s)" #: ../lib/speedreader.c:80 ../lib/speedreader.c:664 msgid "P_ause" -msgstr "" +msgstr "P_ausa" #: ../lib/speedreader.c:81 msgid "_Resume" -msgstr "" +msgstr "_Reiniciar" #: ../lib/speedreader.c:263 msgid "Running" -msgstr "" +msgstr "Executant" #: ../lib/speedreader.c:266 msgid "Finished" -msgstr "" +msgstr "Finalitzat" #: ../lib/speedreader.c:274 msgid "Speed Reader" -msgstr "" +msgstr "Lector ràpid" #: ../lib/speedreader.c:369 msgid "You must enter a text." -msgstr "" +msgstr "Heu d'introduir un text." #: ../lib/speedreader.c:505 msgid "Choose a file to load" -msgstr "" +msgstr "Seleccioneu un fitxer per a carregar" #: ../lib/speedreader.c:534 #, c-format msgid "The file '%s' could not be loaded." -msgstr "" +msgstr "El fitxer «%s» no s'ha pogut carregar." #: ../lib/speedreader.c:552 #, c-format msgid "(display %d word at a time)" msgid_plural "(display %d words at a time)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "(mostra %d paraula al mateix temps)" +msgstr[1] "(mostra %d paraules al mateix temps)" #: ../lib/speedreader.c:577 msgid "" "This is an easy speed reading utility to help train you to read faster. It " "does this by flashing words at a rapid rate on the screen." msgstr "" +"Aquesta és una utilitat de lectura ràpida per a entrenar-vos a llegir ràpid. " +"Funciona il·luminant paraules ràpidament a la pantalla." #: ../lib/speedreader.c:580 msgid &q
[Xfce4-commits] Delete pot file
Updating branch refs/heads/master to 24ce294d348f8df53f68f97d40701580f762d773 (commit) from 7e61c739d2062d86914690bb52cb3d90ff4537f8 (commit) commit 24ce294d348f8df53f68f97d40701580f762d773 Author: Enrico Tröger Date: Mon Jan 4 20:18:55 2010 +0100 Delete pot file po/xfce4-dict.pot | 497 - 1 files changed, 0 insertions(+), 497 deletions(-) diff --git a/po/xfce4-dict.pot b/po/xfce4-dict.pot deleted file mode 100644 index b678400..000 --- a/po/xfce4-dict.pot +++ /dev/null @@ -1,497 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-30 14:17+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - -#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1 -msgid "A plugin to query different dictionaries." -msgstr "" - -#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2 -#: ../src/xfce4-dict.desktop.in.h:2 ../lib/gui.c:627 ../lib/prefs.c:270 -msgid "Dictionary" -msgstr "" - -#: ../panel-plugin/xfce4-dict-plugin.c:346 -#: ../panel-plugin/xfce4-dict-plugin.c:472 ../src/xfce4-dict.c:204 -#: ../lib/spell.c:243 ../lib/gui.c:411 -msgid "Ready" -msgstr "" - -#: ../panel-plugin/xfce4-dict-plugin.c:412 -msgid "Look up a word" -msgstr "" - -#: ../panel-plugin/xfce4-dict-plugin.c:443 ../lib/gui.c:651 -msgid "Search term" -msgstr "" - -#: ../src/xfce4-dict.c:51 -msgid "Search the given text using a Dict server(RFC 2229)" -msgstr "" - -#: ../src/xfce4-dict.c:52 -msgid "Search the given text using a web-based search engine" -msgstr "" - -#: ../src/xfce4-dict.c:53 -msgid "Check the given text with a spell checker" -msgstr "" - -#: ../src/xfce4-dict.c:54 -msgid "Grab the focus on the text field in the panel" -msgstr "" - -#: ../src/xfce4-dict.c:55 -msgid "Start stand-alone application even if the panel plugin is loaded" -msgstr "" - -#: ../src/xfce4-dict.c:56 -msgid "Grabs the PRIMARY selection content and uses it as search text" -msgstr "" - -#: ../src/xfce4-dict.c:57 -msgid "Be verbose" -msgstr "" - -#: ../src/xfce4-dict.c:58 -msgid "Show version information" -msgstr "" - -#: ../src/xfce4-dict.c:131 -msgid "[TEXT]" -msgstr "" - -#: ../src/xfce4-dict.c:147 -#, c-format -msgid "Please report bugs to <%s>." -msgstr "" - -#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:847 -msgid "A client program to query different dictionaries." -msgstr "" - -#: ../src/xfce4-dict.desktop.in.h:3 -msgid "Dictionary Client" -msgstr "" - -#: ../lib/spell.c:75 -msgid "Spell Checker Results:" -msgstr "" - -#: ../lib/spell.c:101 -#, c-format -msgid "%d suggestion found." -msgid_plural "%d suggestions found." -msgstr[0] "" -msgstr[1] "" - -#: ../lib/spell.c:105 -#, c-format -msgid "Suggestions for \"%s\" (%s):" -msgstr "" - -#: ../lib/spell.c:122 -#, c-format -msgid "\"%s\" is spelled correctly (%s)." -msgstr "" - -#: ../lib/spell.c:134 -#, c-format -msgid "No suggestions could be found for \"%s\" (%s)." -msgstr "" - -#. translation hint: -#. * Error while executing () -#: ../lib/spell.c:164 -#, c-format -msgid "Error while executing \"%s\" (%s)." -msgstr "" - -#: ../lib/spell.c:202 -msgid "Please set the spell check command in the preferences dialog." -msgstr "" - -#: ../lib/spell.c:208 ../lib/common.c:224 -msgid "Invalid input" -msgstr "" - -#: ../lib/spell.c:247 -#, c-format -msgid "Process failed (%s)" -msgstr "" - -#: ../lib/speedreader.c:80 ../lib/speedreader.c:664 -msgid "P_ause" -msgstr "" - -#: ../lib/speedreader.c:81 -msgid "_Resume" -msgstr "" - -#: ../lib/speedreader.c:263 -msgid "Running" -msgstr "" - -#: ../lib/speedreader.c:266 -msgid "Finished" -msgstr "" - -#: ../lib/speedreader.c:274 -msgid "Speed Reader" -msgstr "" - -#: ../lib/speedreader.c:369 -msgid "Yo
[Xfce4-commits] Update copyright information
Updating branch refs/heads/master to f2d0680203cadc9b219e7f5d10c02af4c04318c1 (commit) from aa007dfb73c1e49b40f61426f0410e5b3c9acec3 (commit) commit f2d0680203cadc9b219e7f5d10c02af4c04318c1 Author: Enrico Tröger Date: Fri Jan 1 16:48:14 2010 +0100 Update copyright information src/backendgvfs.c|2 +- src/backendgvfs.h|2 +- src/bookmark.c |2 +- src/bookmark.h |2 +- src/bookmarkdialog.c |2 +- src/bookmarkdialog.h |2 +- src/bookmarkeditdialog.c |2 +- src/bookmarkeditdialog.h |2 +- src/bookmarkpanel.c |2 +- src/bookmarkpanel.h |2 +- src/browsenetworkpanel.c |2 +- src/browsenetworkpanel.h |2 +- src/common.c |2 +- src/common.h |2 +- src/compat.c |2 +- src/compat.h |2 +- src/main.c |4 ++-- src/main.h |2 +- src/menubuttonaction.c |2 +- src/menubuttonaction.h |2 +- src/mountdialog.c|2 +- src/mountdialog.h|2 +- src/mountoperation.c |2 +- src/mountoperation.h |2 +- src/preferencesdialog.c |2 +- src/preferencesdialog.h |2 +- src/settings.c |2 +- src/settings.h |2 +- src/singleinstance.c |2 +- src/singleinstance.h |2 +- src/window.c |6 +++--- src/window.h |2 +- tests/uri_parsing.c |2 +- wscript |2 +- 34 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/backendgvfs.c b/src/backendgvfs.c index d1643fc..29e85f3 100644 --- a/src/backendgvfs.c +++ b/src/backendgvfs.c @@ -1,7 +1,7 @@ /* * backendgvfs.c * - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/backendgvfs.h b/src/backendgvfs.h index 5a72fb2..7badf43 100644 --- a/src/backendgvfs.h +++ b/src/backendgvfs.h @@ -1,7 +1,7 @@ /* * backendgvfs.h * - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmark.c b/src/bookmark.c index 5ea06dd..12c701f 100644 --- a/src/bookmark.c +++ b/src/bookmark.c @@ -1,7 +1,7 @@ /* * bookmark.c * - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmark.h b/src/bookmark.h index 07453cd..4c8ca56 100644 --- a/src/bookmark.h +++ b/src/bookmark.h @@ -1,7 +1,7 @@ /* * bookmark.h * - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c index 0d45951..fbfe574 100644 --- a/src/bookmarkdialog.c +++ b/src/bookmarkdialog.c @@ -1,7 +1,7 @@ /* * bookmarkdialog.c * - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmarkdialog.h b/src/bookmarkdialog.h index dbcd753..cb7ff1f 100644 --- a/src/bookmarkdialog.h +++ b/src/bookmarkdialog.h @@ -1,7 +1,7 @@ /* * bookmarkdialog.h * - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c index 5729559..3b1bf29 100644 --- a/src/bookmarkeditdialog.c +++ b/src/bookmarkeditdialog.c @@ -1,7 +1,7 @@ /* * bookmarkeditdialog.c * - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/bookmarkeditdialog.h b/src/bookmarkeditdialog.h index 3550ffe..003c714 100644 --- a/src/bookmarkeditdialog.h +++ b/src/bookmarkeditdialog.h @@ -1,7 +1,7 @@ /* * bookmarkeditdialog.h * - * Copyright 2008-2009 Enrico Tröger + * Copyright 2008-2010 Enrico Tröger * * This program is free software; you can redistribute it and/or modify * it under the terms
[Xfce4-commits] Remove old SVN Id keywords
Updating branch refs/heads/master to 27e937deb35cebc44be25c4c9a01aff4487e1348 (commit) from f2d0680203cadc9b219e7f5d10c02af4c04318c1 (commit) commit 27e937deb35cebc44be25c4c9a01aff4487e1348 Author: Enrico Tröger Date: Fri Jan 1 16:49:33 2010 +0100 Remove old SVN Id keywords configure.ac |1 - wscript |2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index bf6d605..b813474 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,4 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id$ AC_INIT([gigolo], [0.4.0], [http://bugs.xfce.org/]) AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) diff --git a/wscript b/wscript index 50f9d65..1cfccc8 100644 --- a/wscript +++ b/wscript @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# $Id$ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Require xfce4-dev-tools 4.7.1 or newer for autogen.sh
Updating branch refs/heads/master to 6192f807377f95450a3544c70274f4281651452e (commit) from 280bc46d068ceb30dd77b9c25b2f9c7a175fbe16 (commit) commit 6192f807377f95450a3544c70274f4281651452e Author: Enrico Tröger Date: Fri Jan 1 16:02:38 2010 +0100 Require xfce4-dev-tools 4.7.1 or newer for autogen.sh While at it, remove some useless code autogen.sh | 11 ++- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/autogen.sh b/autogen.sh index 3321745..5564b30 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,8 +1,6 @@ #!/bin/sh # -# $Id$ -# -# Copyright (c) 2002-2005 +# Copyright (c) 2002-2010 # The Xfce development team. All rights reserved. # # Written for Xfce by Benedikt Meurer . @@ -21,9 +19,4 @@ EOF exit 1 } -echo 'dnl *** This file is autogenerated. Do not edit. ***' >configure.ac -echo >>configure.ac - -exec xdt-autogen $@ - -# vi:set ts=2 sw=2 et ai: +XDT_AUTOGEN_REQUIRED_VERSION=4.7.1 xdt-autogen $@ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update copyright information
Updating branch refs/heads/master
to 8b7a7c31e0af37db7e8c2628b3036d9a089b41e7 (commit)
from 6192f807377f95450a3544c70274f4281651452e (commit)
commit 8b7a7c31e0af37db7e8c2628b3036d9a089b41e7
Author: Enrico Tröger
Date: Fri Jan 1 16:07:32 2010 +0100
Update copyright information
ChangeLog|6 ++
lib/common.c |2 +-
lib/common.h |2 +-
lib/dictd.c |2 +-
lib/dictd.h |2 +-
lib/gui.c|4 ++--
lib/gui.h|2 +-
lib/libdict.h|2 +-
lib/prefs.c |2 +-
lib/prefs.h |2 +-
lib/searchentry.c|2 +-
lib/searchentry.h|2 +-
lib/speedreader.c|2 +-
lib/speedreader.h|2 +-
lib/spell.c |2 +-
lib/spell.h |2 +-
lib/wraplabel.c |2 +-
lib/wraplabel.h |2 +-
panel-plugin/xfce4-dict-plugin.c |2 +-
src/popup_plugin.c |2 +-
src/popup_plugin.h |2 +-
src/xfce4-dict.c |4 ++--
22 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 37bf74c..8023c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-01 Enrico Tröger
+
+ * *:
+ Update copyright information.
+
+
2009-12-31 Enrico Tröger
* lib/dict.c:
diff --git a/lib/common.c b/lib/common.c
index b55b22f..9f9bd7b 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2009 Enrico Tröger
+ * Copyright 2006-2010 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/common.h b/lib/common.h
index fe4581e..115e857 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2009 Enrico Tröger
+ * Copyright 2006-2010 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/dictd.c b/lib/dictd.c
index bd364b7..a493895 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2009 Enrico Tröger
+ * Copyright 2006-2010 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/dictd.h b/lib/dictd.h
index 8d8d489..f636d0f 100644
--- a/lib/dictd.h
+++ b/lib/dictd.h
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2009 Enrico Tröger
+ * Copyright 2006-2010 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/gui.c b/lib/gui.c
index f24932f..1054158 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2009 Enrico Tröger
+ * Copyright 2006-2010 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -845,7 +845,7 @@ void dict_gui_about_dialog(GtkWidget *widget, DictData *dd)
"destroy-with-parent", TRUE,
"authors", authors,
"comments", _("A client program to query different
dictionaries."),
- "copyright", _("Copyright \302\251 2006-2009 Enrico Tröger"),
+ "copyright", _("Copyright \302\251 2006-2010 Enrico Tröger"),
"website",
"http://goodies.xfce.org/projects/applications/xfce4-dict";,
"logo", logo,
"translator-credits", _("translator-credits"),
diff --git a/lib/gui.h b/lib/gui.h
index 53b7cc9..c9aeac2 100644
--- a/lib/gui.h
+++ b/lib/gui.h
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2009 Enrico Tröger
+ * Copyright 2006-2010 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/libdict.h b/lib/libdict.h
index 24909d8..7009486 100644
--- a/lib/libdict.h
+++ b/lib/libdict.h
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyright 2006-2009 Enrico Tröger
+ * Copyright 2006-2010 Enrico Tröger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/prefs.c b/lib/prefs.c
index abbf010..7b03bbb 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -1,6 +1,6 @@
/* $Id$
*
- * Copyr
