[Xfce4-commits] exo:master l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 3623e5d4f7fa65138222ea228660cba6d0c5c7a4 (commit) from e4b61dc4a84eafdbb8305d71352d13f590cffcde (commit) commit 3623e5d4f7fa65138222ea228660cba6d0c5c7a4 Author: Per Kongstad p_kongs...@op.pl Date: Sun Jul 18 12:22:37 2010 +0200 l10n: Updated Danish (da) translation to 100% New status: 328 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 73 +++-- 1 files changed, 42 insertions(+), 31 deletions(-) diff --git a/po/da.po b/po/da.po index 9600dfd..aa0dee1 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: Exo 0.5.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-02-28 18:00+0100\n +POT-Creation-Date: 2010-07-18 10:00+\n PO-Revision-Date: 2010-02-20 00:22+0100\n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Danish da...@dansk-gruppen.dk\n @@ -523,7 +523,7 @@ msgid --strip-content Remove node contents from XML files\n msgstr --strip-content Fjern knudeindhold fra XML-filer (node)\n #: ../exo-csource/main.c:304 ../exo-desktop-item-edit/main.c:177 -#: ../exo-mount/main.c:263 ../exo-mount-notify/main.c:169 +#: ../exo-mount/main.c:265 ../exo-mount-notify/main.c:169 #: ../exo-open/main.c:258 #, c-format msgid @@ -540,7 +540,7 @@ msgstr \n #: ../exo-csource/main.c:308 ../exo-desktop-item-edit/main.c:181 -#: ../exo-mount/main.c:267 ../exo-mount-notify/main.c:173 +#: ../exo-mount/main.c:269 ../exo-mount-notify/main.c:173 #: ../exo-open/main.c:262 #, c-format msgid @@ -557,7 +557,7 @@ msgstr \n #: ../exo-csource/main.c:312 ../exo-desktop-item-edit/main.c:185 -#: ../exo-mount/main.c:271 ../exo-mount-notify/main.c:177 +#: ../exo-mount/main.c:273 ../exo-mount-notify/main.c:177 #: ../exo-open/main.c:266 #, c-format msgid Please report bugs to %s.\n @@ -605,43 +605,49 @@ msgstr Opret programstarter b%s/b #. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to #. avoid mnemonic conflicts -#: ../exo-desktop-item-edit/exo-die-editor.c:277 +#: ../exo-desktop-item-edit/exo-die-editor.c:297 msgid _Name: msgstr _Navn: #. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to #. avoid mnemonic conflicts -#: ../exo-desktop-item-edit/exo-die-editor.c:293 +#: ../exo-desktop-item-edit/exo-die-editor.c:313 msgid C_omment: msgstr K_ommentar: #. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic #. conflicts -#: ../exo-desktop-item-edit/exo-die-editor.c:309 +#: ../exo-desktop-item-edit/exo-die-editor.c:329 msgid Comm_and: msgstr Komm_ando: #. TRANSLATORS: Label in Create Link dialog, make sure to avoid mnemonic #. conflicts -#: ../exo-desktop-item-edit/exo-die-editor.c:324 +#: ../exo-desktop-item-edit/exo-die-editor.c:344 msgid _URL: msgstr _URL: +#. TRANSLATORS: Label in Create Launcher dialog, make sure to avoid mnemonic +#. conflicts +#: ../exo-desktop-item-edit/exo-die-editor.c:360 +msgid Working _Directory: +msgstr Arbejds_mappe: + #. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to #. avoid mnemonic conflicts -#: ../exo-desktop-item-edit/exo-die-editor.c:340 +#: ../exo-desktop-item-edit/exo-die-editor.c:389 msgid _Icon: msgstr _Ikon: #. TRANSLATORS: Label for the icon button in Create Launcher/Create Link #. dialog if no icon selected #. setup a label to tell that no icon was selected -#: ../exo-desktop-item-edit/exo-die-editor.c:357 -#: ../exo-desktop-item-edit/exo-die-editor.c:1080 +#: ../exo-desktop-item-edit/exo-die-editor.c:406 +#: ../exo-desktop-item-edit/exo-die-editor.c:1233 msgid No icon msgstr Intet ikon -#: ../exo-desktop-item-edit/exo-die-editor.c:363 +#: ../exo-desktop-item-edit/exo-die-editor.c:412 msgid Options: msgstr Indstillinger: @@ -650,11 +656,11 @@ msgstr Indstillinger: #. * and sync your translations with the translations in Thunar #. and xfce4-panel. #. -#: ../exo-desktop-item-edit/exo-die-editor.c:372 +#: ../exo-desktop-item-edit/exo-die-editor.c:421 msgid Use _startup notification msgstr Brug op_startsbesked -#: ../exo-desktop-item-edit/exo-die-editor.c:373 +#: ../exo-desktop-item-edit/exo-die-editor.c:422 msgid Select this option to enable startup notification when the command is run from the file manager or the menu. Not every application supports startup notification. msgstr Vælg denne indstilling for at slå opstartsbesked til, når kommandoen bliver kørt fra filhåndteringen eller menuen. Ikke alle programmer understøtter dette. @@ -663,19 +669,24 @@ msgstr Vælg denne indstilling for at slå opstartsbesked til, når kommandoen #. * and sync your translations with the translations in Thunar #. and xfce4-panel. #. -#: ../exo-desktop-item-edit/exo-die-editor.c:385 +#: ../exo-desktop-item-edit/exo-die-editor.c:434 msgid Run in _terminal
[Xfce4-commits] thunar:jannis/port-to-udev Deleting branch jannis/port-to-udev
Deleting branch refs/heads/jannis/port-to-udev ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:jannis/port-to-udev Creating branch jannis/port-to-udev
Updating branch refs/heads/jannis/port-to-udev as new branch to 396557ff7d62bd277d3537db4ad5011d7492feee (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/jannis/port-to-udev for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:jannis/port-to-udev Also react on undev change events.
Updating branch refs/heads/jannis/port-to-udev
to 396557ff7d62bd277d3537db4ad5011d7492feee (commit)
from e9ca683579c6dd6366bc9657bf0ebf4e97186231 (commit)
commit 396557ff7d62bd277d3537db4ad5011d7492feee
Author: Jannis Pohlmann jan...@xfce.org
Date: Thu Jan 28 19:56:19 2010 +0100
Also react on undev change events.
thunar/thunar-application.c | 71 +--
1 files changed, 1 insertions(+), 70 deletions(-)
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index b3709bc..32b6a83 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -103,11 +103,6 @@ static void thunar_application_uevent
(GUdevClient
const gchar
*action,
GUdevDevice
*device,
ThunarApplication *application);
-#if 0
-static void thunar_application_drive_eject
(GVolumeMonitor *volume_monitor,
- GDrive
*drive,
-
ThunarApplication *application);
-#endif
static gboolean thunar_application_volman_idle(gpointer
user_data);
static void thunar_application_volman_idle_destroy(gpointer
user_data);
static void thunar_application_volman_watch (GPid
pid,
@@ -220,14 +215,6 @@ thunar_application_init (ThunarApplication *application)
}
#ifdef HAVE_GUDEV
-#if 0
- /* connect to the volume manager */
- application-volume_monitor = g_volume_monitor_get ();
-
- /* connect the volume manager support callbacks (used to spawn thunar-volman
appropriately) */
- g_signal_connect (application-volume_monitor, drive-eject-button,
G_CALLBACK (thunar_application_drive_eject), application);
-#endif
-
/* establish connection with udev */
application-udev_client = g_udev_client_new (subsystems);
@@ -272,11 +259,6 @@ thunar_application_finalize (GObject *object)
g_slist_foreach (application-volman_udis, (GFunc) g_free, NULL);
g_slist_free (application-volman_udis);
-#if 0
- /* disconnect from the volume monitor */
- g_object_unref (application-volume_monitor);
-#endif
-
/* disconnect from the udev client */
g_object_unref (application-udev_client);
#endif
@@ -512,7 +494,7 @@ thunar_application_uevent (GUdevClient *client,
sysfs_path = g_udev_device_get_sysfs_path (device);
/* distinguish between add and remove actions, ignore change and
move */
- if (g_strcmp0 (action, add) == 0)
+ if (g_strcmp0 (action, add) == 0 || g_strcmp0 (action, change) == 0)
{
/* only insert the path if we don't have it already */
if (g_slist_find_custom (application-volman_udis, sysfs_path,
@@ -551,57 +533,6 @@ thunar_application_uevent (GUdevClient *client,
-#if 0
-static void
-thunar_application_drive_eject (GVolumeMonitor*volume_monitor,
-GDrive*drive,
-ThunarApplication *application)
-{
- GdkScreen *screen;
- GError*err = NULL;
- gchar *argv[4];
- gchar *udi;
-
- _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
- _thunar_return_if_fail (application-volume_monitor == volume_monitor);
- _thunar_return_if_fail (G_IS_DRIVE (drive));
- _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
-
- /* determine the HAL UDI for this device */
- udi = g_drive_get_identifier (drive, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
-
- /* check if we have a UDI */
- if (G_LIKELY (udi != NULL))
-{
- /* generate the argument list for exo-eject */
- argv[0] = (gchar *) exo-eject;
- argv[1] = (gchar *) -h;
- argv[2] = (gchar *) udi;
- argv[3] = NULL;
-
- /* locate the currently active screen (the one with the pointer) */
- screen = xfce_gdk_screen_get_active (NULL);
-
- /* try to spawn the volume_monitor on the active screen */
- if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, err))
-{
- /* failed to launch exo-eject, inform the user about this */
- thunar_dialogs_show_error (screen, err, _(Failed to execute
\%s\), exo-eject);
- g_error_free (err);
-}
- else
-{
- /* we most probably removed the device */
- thunar_application_drive_disconnected (volume_monitor, drive,
application);
-}
-
- g_free (udi);
-}
-}
-#endif
-
-
-
static gboolean
thunar_application_volman_idle (gpointer user_data)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
[Xfce4-commits] thunar:jannis/port-to-udev Use GUDev and sysfs paths to spawn thunar-volman on udev events.
Updating branch refs/heads/jannis/port-to-udev to e9ca683579c6dd6366bc9657bf0ebf4e97186231 (commit) from 9226bfc565bc092cf53f92fade4b4abb4cd16f70 (commit) commit e9ca683579c6dd6366bc9657bf0ebf4e97186231 Author: Jannis Pohlmann jan...@xfce.org Date: Sun Jan 17 03:11:05 2010 +0100 Use GUDev and sysfs paths to spawn thunar-volman on udev events. configure.in.in | 33 +++ thunar/Makefile.am |7 ++- thunar/thunar-application.c | 137 --- 3 files changed, 104 insertions(+), 73 deletions(-) diff --git a/configure.in.in b/configure.in.in index 5e6ff69..6892334 100644 --- a/configure.in.in +++ b/configure.in.in @@ -171,6 +171,12 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION], [0.4], [startup-notification], [startup notification library]) +dnl *** +dnl *** Optional support for GUDev (required for thunar-volman) *** +dnl *** +XDT_CHECK_OPTIONAL_PACKAGE([GUDEV], [gudev-1.0], [145], [gudev], + [GUDev (required for thunar-volman)]) + dnl * dnl *** Check for gtk-doc *** dnl * @@ -292,19 +298,24 @@ echo echo Build Configuration: echo if test x$DBUS_FOUND = xyes; then -echo * D-BUS support: yes +echo * D-BUS support: yes else -echo * D-BUS support: no +echo * D-BUS support: no fi if test x$GIO_UNIX_FOUND = xyes; then -echo * GIO UNIX features: yes +echo * GIO UNIX features: yes else -echo * GIO UNIX features: no +echo * GIO UNIX features: no fi if test x$LIBSTARTUP_NOTIFICATION_FOUND = xyes; then -echo * Startup Notification: yes +echo * Startup Notification: yes +else +echo * Startup Notification: no +fi +if test x$GUDEV_FOUND = xyes; then +echo * GUDev (required for thunar-volman): yes else -echo * Startup Notification: no +echo * GUDev (required for thunar-volman): no fi echo * Debug Support: $enable_debug if test x$enable_gen_doc = xyes; then @@ -317,9 +328,9 @@ fi echo echo Additional Plugins: echo -echo * Advanced Properties: $ac_bm_thunar_plugin_apr -echo * Simple Builting Renamers: $ac_bm_thunar_plugin_sbr -echo * Trash Panel Applet:$ac_bm_thunar_plugin_tpa -echo * User Customizable Actions: $ac_bm_thunar_plugin_uca -echo * Wallpaper support: $ac_bm_thunar_plugin_wallpaper +echo * Advanced Properties:$ac_bm_thunar_plugin_apr +echo * Simple Builting Renamers: $ac_bm_thunar_plugin_sbr +echo * Trash Panel Applet: $ac_bm_thunar_plugin_tpa +echo * User Customizable Actions: $ac_bm_thunar_plugin_uca +echo * Wallpaper support: $ac_bm_thunar_plugin_wallpaper echo diff --git a/thunar/Makefile.am b/thunar/Makefile.am index 6c5b20c..436933d 100644 --- a/thunar/Makefile.am +++ b/thunar/Makefile.am @@ -12,6 +12,7 @@ INCLUDES = \ -DPACKAGE_LOCALE_DIR=\$(localedir)\ \ -DTHUNAR_VERSION_API=\$(THUNAR_VERSION_API)\ \ -DSN_API_NOT_YET_FROZEN \ + -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ $(PLATFORM_CPPFLAGS) bin_SCRIPTS = \ @@ -219,8 +220,9 @@ Thunar_SOURCES = \ Thunar_CFLAGS = \ $(EXO_CFLAGS) \ - $(GTHREAD_CFLAGS) \ $(GIO_CFLAGS) \ + $(GTHREAD_CFLAGS) \ + $(GUDEV_CFLAGS) \ $(LIBSM_CFLAGS) \ $(LIBSTARTUP_NOTIFICATION_CFLAGS) \ $(LIBXFCE4UI_CFLAGS)\ @@ -235,8 +237,9 @@ Thunar_LDADD = \ $(top_builddir)/tdb/libtdb.la \ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la\ $(EXO_LIBS) \ - $(GTHREAD_LIBS) \ $(GIO_LIBS) \ + $(GTHREAD_LIBS) \ + $(GUDEV_LIBS)
[Xfce4-commits] postler:master Show 'Copy Address' and 'Copy' in hyperlink context menu
Updating branch refs/heads/master
to c85fb4d38d7058742d7dc17e2ef8c277bc27 (commit)
from 82e091f7fd5eb826ad90c95412791bf2f564620e (commit)
commit c85fb4d38d7058742d7dc17e2ef8c277bc27
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Jul 7 23:12:01 2010 +0200
Show 'Copy Address' and 'Copy' in hyperlink context menu
postler/postler-content.vala | 25 -
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index e0111b2..f76a491 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -145,7 +145,30 @@ public class Postler.Content : WebKit.WebView {
void populate_menu (Gtk.Menu menu) {
menu.hide_all ();
-Gtk.MenuItem menuitem = new Gtk.ImageMenuItem.from_stock
(Gtk.STOCK_COPY, null);
+
+var event = Gtk.get_current_event ();
+var result = get_hit_test_result ((Gdk.EventButton?)event);
+Gtk.MenuItem menuitem;
+
+if (result.link_uri != null) {
+menuitem = new Gtk.MenuItem.with_mnemonic (_(Copy _Address));
+menuitem.activate.connect ((menuitem) = {
+var clipboard = get_clipboard (Gdk.SELECTION_CLIPBOARD);
+string address = result.link_uri.split (?)[0];
+clipboard.set_text (address, -1);
+});
+menuitem.show ();
+menu.append (menuitem);
+menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_COPY, null);
+menuitem.activate.connect ((menuitem) = {
+copy_clipboard (); });
+menuitem.show ();
+menuitem.sensitive = can_copy_clipboard ();
+menu.append (menuitem);
+return;
+}
+
+menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_COPY, null);
menuitem.activate.connect ((menuitem) = {
copy_clipboard (); });
menuitem.show ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master If the original message was top-post, we also top-post
Updating branch refs/heads/master
to 92097f431791f156aad9f6795e0a34e191918cd6 (commit)
from 6ebf8cff7e66bdeeaa80c02c1088f68f306f62b1 (commit)
commit 92097f431791f156aad9f6795e0a34e191918cd6
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jul 8 21:43:13 2010 +0200
If the original message was top-post, we also top-post
postler/postler-content.vala | 29 +++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 9db20c2..4b5f79a 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -331,12 +331,37 @@ public class Postler.Content : WebKit.WebView {
}
}
+/* If the original message was top-post, we also top-post.
+ Presumably more quotes than none at the bottom indicates that. */
+bool top_post = false;
+ssize_t position = body.len;
+uint line_breaks = 0;
+uint quote_lines = 0;
+do {
+if (body.str[position] == ' ' body.str[position - 1] == '') {
+quote_lines++;
+if (quote_lines 5) {
+top_post = true;
+break;
+}
+position--;
+} else if (body.str[position] == '\n') {
+line_breaks++;
+if (line_breaks 5)
+break;
+}
+position--;
+} while (position 0 position body.len);
+
+string signature = ;
try {
-string signature = ;
GLib.FileUtils.get_contents (Environment.get_home_dir () +
/.signature,
out signature);
-body.append (\n\n--\n + signature);
} catch (GLib.FileError error) { }
+if (top_post)
+body.prepend (\n\n--\n + signature + \n);
+else
+body.append (\n\n--\n + signature);
load_string (body.str, text/plain, UTF-8, about:blank);
return true;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Add 'Print' to message content context menu
Updating branch refs/heads/master
to 566f902470fbb0e962cf6ae4a102864877b78af1 (commit)
from c85fb4d38d7058742d7dc17e2ef8c277bc27 (commit)
commit 566f902470fbb0e962cf6ae4a102864877b78af1
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Jul 7 23:25:34 2010 +0200
Add 'Print' to message content context menu
postler/postler-content.vala |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index f76a491..ecb2887 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -193,6 +193,12 @@ public class Postler.Content : WebKit.WebView {
menuitem.show ();
menuitem.sensitive = last_location != null;
menu.append (menuitem);
+menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_PRINT, null);
+menuitem.activate.connect ((menuitem) = {
+get_main_frame ().print (); });
+menuitem.show ();
+menuitem.sensitive = last_location != null;
+menu.append (menuitem);
}
public void clear () {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Iterate actual line length when preparing reply
Updating branch refs/heads/master
to 9ef3521a1afc5c4c3e7bc4ac5648f00862e9c7cb (commit)
from 92097f431791f156aad9f6795e0a34e191918cd6 (commit)
commit 9ef3521a1afc5c4c3e7bc4ac5648f00862e9c7cb
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jul 8 22:02:40 2010 +0200
Iterate actual line length when preparing reply
postler/postler-content.vala |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 4b5f79a..0f3309d 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -307,8 +307,8 @@ public class Postler.Content : WebKit.WebView {
break;
}
-size_t length;
-while ((line = stream.read_line (out length, null)) != null) {
+while ((line = stream.read_line (null, null)) != null) {
+size_t length = line.len ();
/* TODO: Handle encoding */
for (int i = 0; i length; i += (quote ? 78 : 80))
body.append ((quote ? : )
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Start replies with 'On %s, %s wrote:' style sentence
Updating branch refs/heads/master
to 6ebf8cff7e66bdeeaa80c02c1088f68f306f62b1 (commit)
from 566f902470fbb0e962cf6ae4a102864877b78af1 (commit)
commit 6ebf8cff7e66bdeeaa80c02c1088f68f306f62b1
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jul 8 21:20:19 2010 +0200
Start replies with 'On %s, %s wrote:' style sentence
postler/postler-composer.vala |2 +-
postler/postler-content.vala |6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala
index 3794483..31e4ed3 100644
--- a/postler/postler-composer.vala
+++ b/postler/postler-composer.vala
@@ -314,7 +314,7 @@ public class Postler.Composer : Gtk.Window {
}
public bool prepare_reply (string? location=null, bool quote=false) {
-return content.prepare_reply (location, quote);
+return content.prepare_reply (location, entry_to.text, quote);
}
public bool add_field (string field, string data) {
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index ecb2887..9db20c2 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -289,10 +289,14 @@ public class Postler.Content : WebKit.WebView {
return ;
}
-public bool prepare_reply (string? location, bool quote) {
+public bool prepare_reply (string? location, string recipient, bool quote)
{
var body = new StringBuilder ();
if (location != null) {
+ulong now = new Soup.Date.from_now (0).to_time_t ();
+string date = GLib.Time.local ((time_t)now).format (%x %X);
+body.append_printf (_(On %s, %s wrote:), date, recipient);
+body.append_c ('\n');
var contents = File.new_for_path (location);
try {
var stream = new DataInputStream (contents.read (null));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Implement 'Import Archived Mailbox' context menu on folders
Updating branch refs/heads/master
to 409d7cd46f49e9ede06b5ee2b1adb658d3335d28 (commit)
from b510eb83c069e94a9ac89b412ffa94f9cb04c277 (commit)
commit 409d7cd46f49e9ede06b5ee2b1adb658d3335d28
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 10 22:11:29 2010 +0200
Implement 'Import Archived Mailbox' context menu on folders
postler/postler-folders.vala | 52 ++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index 1a46e1c..b4e5134 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -225,6 +225,51 @@ public class Postler.Folders : Gtk.TreeView {
messages.clear ();
}
+void import_folder (Gtk.TreeIter iter) {
+var dialog = new Gtk.FileChooserDialog (_(Import Archived Mailbox),
+get_toplevel () as Gtk.Window, Gtk.FileChooserAction.OPEN);
+dialog.add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+Gtk.STOCK_OPEN, Gtk.ResponseType.OK);
+dialog.set_default_response (Gtk.ResponseType.OK);
+int response = dialog.run ();
+var mailbox_archive = dialog.get_file ();
+dialog.destroy ();
+if (response != Gtk.ResponseType.OK)
+return;
+
+string location;
+store.get (iter, Columns.LOCATION, out location);
+try {
+string path = location + /cur/;
+var stream = new DataInputStream (mailbox_archive.read (null));
+GLib.StringBuilder body = new GLib.StringBuilder ();
+string line;
+while ((line = stream.read_line (null, null)) != null) {
+if (line.has_prefix (From )) {
+if (body.len == 0)
+continue;
+
+string filename = path +
+Postler.Messages.generate_maildir_filename (S);
+FileUtils.set_contents (filename, body.str, -1);
+FileUtils.chmod (filename, 0700);
+body = new GLib.StringBuilder ();
+}
+body.append (line + \n);
+}
+if (body.len != 0) {
+string filename = path +
+Postler.Messages.generate_maildir_filename (S);
+FileUtils.set_contents (filename, body.str, -1);
+FileUtils.chmod (filename, 0700);
+}
+messages.populate (location);
+} catch (GLib.Error error) {
+GLib.critical (_(Failed to empty folder \%s\: %s),
+location, error.message);
+}
+}
+
void empty_folder (Gtk.TreeIter iter) {
string location;
store.get (iter, Columns.LOCATION, out location);
@@ -289,6 +334,13 @@ public class Postler.Folders : Gtk.TreeView {
}
});
menu.append (menuitem);
+menuitem = new Gtk.MenuItem.with_mnemonic (_(_Import Archived
Mailbox));
+menuitem.activate.connect ((menuitem) = {
+ Gtk.TreeIter iter;
+ if (get_selection ().get_selected (null, out iter))
+ import_folder (iter);
+});
+menu.append (menuitem);
menuitem = new Gtk.MenuItem.with_mnemonic (_(_Empty Folder));
menuitem.activate.connect ((menuitem) = {
Gtk.TreeIter iter;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Add 'reply' and 'organization' fields for IMAP accounts
Updating branch refs/heads/master
to b510eb83c069e94a9ac89b412ffa94f9cb04c277 (commit)
from 9ef3521a1afc5c4c3e7bc4ac5648f00862e9c7cb (commit)
commit b510eb83c069e94a9ac89b412ffa94f9cb04c277
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Jul 9 23:01:49 2010 +0200
Add 'reply' and 'organization' fields for IMAP accounts
postler/postler-accounts.vala |6 ++
postler/postler-composer.vala |6 +-
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index 89dea25..6b0a42d 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -29,6 +29,8 @@ namespace Postler {
public string path;
public string certificate;
public string sync;
+public string reply;
+public string organization;
public string hide;
}
}
@@ -127,6 +129,10 @@ public class Postler.Accounts : GLib.Object {
info.certificate = keyfile.get_string (group,
certificate);
if (keyfile.has_key (group, sync))
info.sync = keyfile.get_string (group, sync);
+if (keyfile.has_key (group, reply))
+info.reply = keyfile.get_string (group, reply);
+if (keyfile.has_key (group, organization))
+info.organization = keyfile.get_string (group,
organization);
if (keyfile.has_key (group, hide))
info.hide = keyfile.get_string (group, hide);
}
diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala
index 31e4ed3..b33d441 100644
--- a/postler/postler-composer.vala
+++ b/postler/postler-composer.vala
@@ -96,7 +96,11 @@ public class Postler.Composer : Gtk.Window {
string header = (From: %s\nTo: %s\n%s%s
+ MIME-Version: 1.0\nContent-Transfer-Encoding: 8bit\n
+ Content-Type: text/plain; charset=UTF-8\n
-+ Subject: %s\nDate: %s\nX-Mailer: %s\n\n).printf (
++ Subject: %s\nDate: %s\nX-Mailer: %s\n
++ (info.reply != null ? Reply-To: + info.reply + \n :
)
++ (info.organization != null ?
+Organization: + info.organization + \n : )
++ \n).printf (
sender,
entry_to.text,
copy != ? CC: : , copy != ? copy + \n :
,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Implement inline find in message body as letters are typed
Updating branch refs/heads/master
to 0dfb73d56fad92782b85170b16ff0e5a7d80b0e4 (commit)
from 977a764015a65387fd3e5c84cdaba4a60ad1975e (commit)
commit 0dfb73d56fad92782b85170b16ff0e5a7d80b0e4
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Jul 11 19:19:38 2010 +0200
Implement inline find in message body as letters are typed
postler/postler-viewer.vala | 38 ++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/postler/postler-viewer.vala b/postler/postler-viewer.vala
index bb56a74..1a4df60 100644
--- a/postler/postler-viewer.vala
+++ b/postler/postler-viewer.vala
@@ -13,6 +13,8 @@ public class Postler.Viewer : Gtk.VBox {
Gtk.InfoBar infobar;
Postler.Content content;
Gtk.VBox message_parts;
+Gtk.Toolbar findbar;
+Gtk.Entry find_entry;
bool allow_external_images;
@@ -44,6 +46,19 @@ public class Postler.Viewer : Gtk.VBox {
message_parts.parent.parent.set_no_show_all (true);
notify_n_parts (content, null);
content.notify[n-parts].connect (notify_n_parts);
+
+findbar = new Gtk.Toolbar ();
+pack_start (findbar, false, false, 0);
+find_entry = new Gtk.Entry ();
+var toolitem = new Gtk.ToolItem ();
+toolitem.add (find_entry);
+toolitem.show_all ();
+findbar.insert (toolitem, -1);
+findbar.set_no_show_all (true);
+key_press_event.connect (key_pressed);
+find_entry.changed.connect (find_entry_changed);
+find_entry.activate.connect (find_entry_changed);
+find_entry.focus_out_event.connect (find_entry_unfocus);
}
void resource_request (WebKit.WebFrame frame, WebKit.WebResource resouce,
@@ -111,5 +126,28 @@ public class Postler.Viewer : Gtk.VBox {
message_parts.parent.parent.set_no_show_all (false);
scrollable.show_all ();
}
+
+bool key_pressed (Gdk.EventKey event) {
+uint character = Gdk.unicode_to_keyval (event.keyval);
+if (character == (event.keyval | 0x0100))
+return false;
+
+string text = %c.printf ((char)character);
+find_entry.text = text;
+findbar.show ();
+find_entry.grab_focus ();
+content.search_text (text, false, true, true);
+return true;
+}
+
+void find_entry_changed () {
+content.search_text (find_entry.text, false, true, true);
+}
+
+bool find_entry_unfocus (Gdk.EventFocus event) {
+find_entry.text = ;
+findbar.hide ();
+return false;
+}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Escape sender address in message cell renderer
Updating branch refs/heads/master
to d4cd37b66c9f8aceb07c949021b84a626c0cda60 (commit)
from 409d7cd46f49e9ede06b5ee2b1adb658d3335d28 (commit)
commit d4cd37b66c9f8aceb07c949021b84a626c0cda60
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 10 22:31:14 2010 +0200
Escape sender address in message cell renderer
postler/postler-messages.vala |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala
index 0350347..2b53951 100644
--- a/postler/postler-messages.vala
+++ b/postler/postler-messages.vala
@@ -110,11 +110,12 @@ public class Postler.Messages : Gtk.TreeView {
Columns.FROM, out from);
subject = escape_text (parse_encoded (subject, out charset));
+from = escape_text (parse_address (parse_encoded (from, out
charset))[0]);
renderer.markup = (span weight=\%d\%s/span\n +
smalltt%s /tt/small %s).printf (
weight, subject,
GLib.Time.local (timestamp).format (%x %X),
- parse_address (parse_encoded (from, out
charset))[0]);
+ from);
}
void render_from (Gtk.TreeViewColumn column, Gtk.CellRenderer cell,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Add address parsing test case containing apostrophe
Updating branch refs/heads/master
to 977a764015a65387fd3e5c84cdaba4a60ad1975e (commit)
from d4cd37b66c9f8aceb07c949021b84a626c0cda60 (commit)
commit 977a764015a65387fd3e5c84cdaba4a60ad1975e
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Jul 11 19:10:09 2010 +0200
Add address parsing test case containing apostrophe
tests/parsing.vala |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tests/parsing.vala b/tests/parsing.vala
index febe057..3a1f6de 100644
--- a/tests/parsing.vala
+++ b/tests/parsing.vala
@@ -48,6 +48,7 @@ const TestCase[] addresses = {
{ mailto:kaufm...@heim.at, kaufm...@heim.at kaufm...@heim.at },
{ 'Klaus' kl...@heim.at, Klaus kl...@heim.at },
{ \Klaus\ kl...@heim.at, Klaus kl...@heim.at },
+{ Bert O'Brian be...@uni.edu, Bert O'Brian be...@uni.edu },
{ =?iso-8859-1?Q?M=2C_Alf?= al...@vw.de,
=?iso-8859-1?Q?M=2C_Alf?= al...@vw.de }
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Require Vala version 0.8 at minimum
Updating branch refs/heads/master
to ce124ca07d5e8fae701522d2f30b4fc68fe77f9d (commit)
from 0dfb73d56fad92782b85170b16ff0e5a7d80b0e4 (commit)
commit ce124ca07d5e8fae701522d2f30b4fc68fe77f9d
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Jul 12 22:33:15 2010 +0200
Require Vala version 0.8 at minimum
wscript |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/wscript b/wscript
index 8345016..839863a 100644
--- a/wscript
+++ b/wscript
@@ -75,8 +75,8 @@ def configure (conf):
conf.check_tool ('compiler_cc')
conf.check_tool ('vala')
-if conf.env['VALAC_VERSION'][1] 7:
- Utils.pprint ('RED', 'valac = 0.7.0 required')
+if conf.env['VALAC_VERSION'][1] 8:
+ Utils.pprint ('RED', 'valac = 0.8.0 required')
sys.exit (1)
if option_enabled ('nls'):
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Use 'git describe' to generate the git version string
Updating branch refs/heads/master to 1a74b862e4d929009784b8fad15265fae4879d39 (commit) from ce124ca07d5e8fae701522d2f30b4fc68fe77f9d (commit) commit 1a74b862e4d929009784b8fad15265fae4879d39 Author: Christian Dywan christ...@twotoasts.de Date: Wed Jul 14 23:01:01 2010 +0200 Use 'git describe' to generate the git version string wscript |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 839863a..25bf16d 100644 --- a/wscript +++ b/wscript @@ -40,9 +40,9 @@ APPNAME = 'postler' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) try: -git = Utils.cmd_output (['git', 'rev-parse', '--short', 'HEAD'], silent=True) +git = Utils.cmd_output (['git', 'describe'], silent=True) if git: -VERSION = (VERSION + '-' + git).strip () +VERSION = git except: pass ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Suggest real name of the system user as default
Updating branch refs/heads/master
to 8047d49e0be8ed8a4b4f3e37c5af223c13e03c65 (commit)
from 83ce45266315d2eb0223d576799ce7fc3eb2a309 (commit)
commit 8047d49e0be8ed8a4b4f3e37c5af223c13e03c65
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 17 17:13:50 2010 +0200
Suggest real name of the system user as default
postler/postler-accountsetup.vala |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/postler/postler-accountsetup.vala
b/postler/postler-accountsetup.vala
index ba213b2..03f5385 100644
--- a/postler/postler-accountsetup.vala
+++ b/postler/postler-accountsetup.vala
@@ -69,6 +69,10 @@ public class Postler.AccountSetup : Gtk.Dialog {
public static AccountSetup new_account () {
var info = new AccountInfo ();
info.type = AccountType.IMAP;
+string realname = Environment.get_real_name ();
+if (realname == Unknown)
+realname = ;
+info.realname = realname.locale_to_utf8 (-1, null, null, null);
var setup = new AccountSetup (info);
setup.add_button (_(_Create Account), Gtk.ResponseType.APPLY);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Implicitly update path when adding IMAP accounts
Updating branch refs/heads/master
to 8eed4867ba0b87fdd0586ca31d745bd388e80045 (commit)
from 5e46d0a9d5c2a56d47caeb500542177f0ad5a08f (commit)
commit 8eed4867ba0b87fdd0586ca31d745bd388e80045
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 17 16:13:14 2010 +0200
Implicitly update path when adding IMAP accounts
postler/postler-accounts.vala |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index 6b0a42d..bd8e7a0 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -168,6 +168,8 @@ public class Postler.Accounts : GLib.Object {
}
public void add_info (AccountInfo info) {
+if (info.type == AccountType.IMAP)
+info.path = data_path + info.name;
infos.append (info);
/* TODO: Update accountrc file */
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Implement a dashboard with a button box and a logo image
Updating branch refs/heads/master
to 5e46d0a9d5c2a56d47caeb500542177f0ad5a08f (commit)
from 48261eaf5c68f5b37ea8f18191ab43d9134902bd (commit)
commit 5e46d0a9d5c2a56d47caeb500542177f0ad5a08f
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jul 15 22:42:47 2010 +0200
Implement a dashboard with a button box and a logo image
postler/postler-viewer.vala | 50 +++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/postler/postler-viewer.vala b/postler/postler-viewer.vala
index 1a4df60..f46935f 100644
--- a/postler/postler-viewer.vala
+++ b/postler/postler-viewer.vala
@@ -15,6 +15,8 @@ public class Postler.Viewer : Gtk.VBox {
Gtk.VBox message_parts;
Gtk.Toolbar findbar;
Gtk.Entry find_entry;
+public Gtk.ButtonBox dashboard;
+Gtk.EventBox dummy_plugin_widget;
bool allow_external_images;
@@ -59,6 +61,16 @@ public class Postler.Viewer : Gtk.VBox {
find_entry.changed.connect (find_entry_changed);
find_entry.activate.connect (find_entry_changed);
find_entry.focus_out_event.connect (find_entry_unfocus);
+
+dashboard = new Gtk.VButtonBox ();
+dashboard.layout_style = Gtk.ButtonBoxStyle.START;
+dashboard.spacing = 8;
+dashboard.show ();
+dummy_plugin_widget = new Gtk.EventBox ();
+content.create_plugin_widget.connect (create_plugin_widget);
+content.settings.set (enable-plugins, true);
+content.clear.connect_after ((content) = { show_dashboard (); });
+show_dashboard ();
}
void resource_request (WebKit.WebFrame frame, WebKit.WebResource resouce,
@@ -149,5 +161,43 @@ public class Postler.Viewer : Gtk.VBox {
findbar.hide ();
return false;
}
+
+void show_dashboard () {
+string encoded_logo = ;
+Gdk.Pixbuf pixbuf = null;
+try {
+var theme = Gtk.IconTheme.get_for_screen (Gdk.Screen.get_default
());
+pixbuf = theme.load_icon (STOCK_INTERNET_MAIL, 128, 0);
+} catch (GLib.Error error) { }
+if (pixbuf != null) {
+string buffer;
+size_t buffer_size;
+try {
+if (Gdk.pixbuf_save_to_buffer (pixbuf, out buffer,
+out buffer_size, png, null, null)) {
+encoded_logo = GLib.base64_encode (buffer, buffer_size);
+}
+} catch (GLib.Error error) { }
+}
+
+content.load_string (
+object type=application/x-gtk-vbox
+style=width:33%; height:66%/object
+img style=position: absolute; right: 15px; bottom: 15px;
+ src=data:image/png;base64,%s
+.
+printf (encoded_logo), text/html, UTF-8, about:blank);
+}
+
+unowned Gtk.Widget create_plugin_widget (string mime_type, string other,
+GLib.HashTable values) {
+
+if (mime_type == application/x-gtk-vbox) {
+return dashboard;
+}
+
+/* Block any unknown plugins */
+return dummy_plugin_widget;
+}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Make Postler.Content.clear a signal that can be connected to
Updating branch refs/heads/master
to 48261eaf5c68f5b37ea8f18191ab43d9134902bd (commit)
from ba7c7f6500a77e714e4890fa5e4e7735c7b285a5 (commit)
commit 48261eaf5c68f5b37ea8f18191ab43d9134902bd
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Jul 15 22:11:55 2010 +0200
Make Postler.Content.clear a signal that can be connected to
postler/postler-content.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index cc8e523..f911131 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -201,7 +201,7 @@ public class Postler.Content : WebKit.WebView {
menu.append (menuitem);
}
-public void clear () {
+public virtual signal void clear () {
last_location = null;
reply_to = null;
reply_to_all = null;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Introduce AcountSetup class and add a 'New Account' button
Updating branch refs/heads/master
to 05a94279f92794b2ee843f31ef77ac5121e9e437 (commit)
from 8eed4867ba0b87fdd0586ca31d745bd388e80045 (commit)
commit 05a94279f92794b2ee843f31ef77ac5121e9e437
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 17 16:34:52 2010 +0200
Introduce AcountSetup class and add a 'New Account' button
postler/postler-accountsetup.vala | 78 +
postler/postler-app.vala |2 +
postler/postler-bureau.vala | 17 -
3 files changed, 96 insertions(+), 1 deletions(-)
diff --git a/postler/postler-accountsetup.vala
b/postler/postler-accountsetup.vala
new file mode 100644
index 000..9f00e76
--- /dev/null
+++ b/postler/postler-accountsetup.vala
@@ -0,0 +1,78 @@
+/*
+ Copyright (C) 2010 Christian Dywan christ...@twotoasts.de
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+public class Postler.AccountSetup : Gtk.Dialog {
+Gtk.SizeGroup sizegroup;
+Gtk.Box content_area;
+
+Gtk.Entry realname;
+Gtk.Entry address;
+Gtk.Entry password;
+
+AccountInfo info;
+
+public signal void done (AccountInfo info);
+
+private AccountSetup (AccountInfo info) {
+this.info = info;
+
+sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
+content_area = get_content_area () as Gtk.Box;
+
+realname = new Gtk.Entry ();
+add_label_entry (_(Full Name), realname);
+address = new Gtk.Entry ();
+add_label_entry (_(Electronic Mail Address), address);
+password = new Gtk.Entry ();
+password.visibility = false;
+add_label_entry (_(Password), password);
+content_area.show_all ();
+
+add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+ _(_Create Account), Gtk.ResponseType.APPLY);
+set_default_response (Gtk.ResponseType.APPLY);
+
+response.connect (responded);
+}
+
+void add_label_entry (string text, Gtk.Entry entry) {
+var hbox = new Gtk.HBox (false, 0);
+content_area.pack_start (hbox, false, false, 4);
+var label = new Gtk.Label.with_mnemonic (text);
+label.xalign = 0;
+sizegroup.add_widget (label);
+hbox.pack_start (label, false, false, 4);
+entry.activate.connect ((entry) = {
+responded (Gtk.ResponseType.APPLY); });
+hbox.pack_start (entry, false, false, 4);
+}
+
+void responded (int response) {
+if (response == Gtk.ResponseType.APPLY) {
+info.name = address.text;
+info.realname = realname.text;
+info.address = address.text;
+info.password = password.text;
+done (info);
+}
+destroy ();
+}
+
+public static AccountSetup new_account () {
+var info = new AccountInfo ();
+info.type = AccountType.IMAP;
+
+var setup = new AccountSetup (info);
+setup.show ();
+return setup;
+}
+}
+
diff --git a/postler/postler-app.vala b/postler/postler-app.vala
index b120249..1576aff 100644
--- a/postler/postler-app.vala
+++ b/postler/postler-app.vala
@@ -10,6 +10,7 @@
*/
namespace Postler {
+const string STOCK_ACCOUNT_NEW = contact-new;
const string STOCK_ADDRESSBOOK = stock_addressbook;
const string STOCK_ARCHIVE = gnome-mime-application-x-archive;
const string STOCK_EMBLEM_DRAFT = emblem-draft;
@@ -46,6 +47,7 @@ public class Postler.App : Unique.App {
}
const Gtk.StockItem[] stock_items = {
+{ STOCK_ACCOUNT_NEW, N_(New _Account), 0, 0, list-add },
{ STOCK_ADDRESSBOOK, N_(_Addressbook) },
{ STOCK_ARCHIVE, N_(Archi_ve) },
{ STOCK_EMBLEM_DRAFT },
diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala
index cdb982c..a63a4f6 100644
--- a/postler/postler-bureau.vala
+++ b/postler/postler-bureau.vala
@@ -275,6 +275,13 @@ public class Postler.Bureau : Gtk.Window {
Postler.App.spawn_module (source, content.last_location);
}
+void action_account_new () {
+AccountSetup.new_account ().done.connect ((setup, info) = {
+accounts.add_info (info);
+folders.populate ();
+} );
+}
+
void action_preferences () {
/* TODO */
}
@@ -332,6 +339,8 @@ public class Postler.Bureau : Gtk.Window {
N_(View the message in fullscreen), action_fullscreen },
{ ViewSource, null, N_(View _Source), CtrlAltu,
N_(View the source of the message), action_view_source },
+{ AccountNew, STOCK_ACCOUNT_NEW, null, ,
+ N_(Setup a new account), action_account_new },
{ Preferences, Gtk.STOCK_PREFERENCES, null,
[Xfce4-commits] postler:master Implement account editing of account properties
Updating branch refs/heads/master
to 83ce45266315d2eb0223d576799ce7fc3eb2a309 (commit)
from 05a94279f92794b2ee843f31ef77ac5121e9e437 (commit)
commit 83ce45266315d2eb0223d576799ce7fc3eb2a309
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 17 16:59:21 2010 +0200
Implement account editing of account properties
postler/postler-accountsetup.vala | 18 ++
postler/postler-folders.vala | 15 +++
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/postler/postler-accountsetup.vala
b/postler/postler-accountsetup.vala
index 9f00e76..ba213b2 100644
--- a/postler/postler-accountsetup.vala
+++ b/postler/postler-accountsetup.vala
@@ -28,18 +28,18 @@ public class Postler.AccountSetup : Gtk.Dialog {
content_area = get_content_area () as Gtk.Box;
realname = new Gtk.Entry ();
+realname.text = info.realname ?? ;
add_label_entry (_(Full Name), realname);
address = new Gtk.Entry ();
+address.text = info.address ?? ;
add_label_entry (_(Electronic Mail Address), address);
password = new Gtk.Entry ();
password.visibility = false;
+password.text = info.password ?? ;
add_label_entry (_(Password), password);
content_area.show_all ();
-add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
- _(_Create Account), Gtk.ResponseType.APPLY);
-set_default_response (Gtk.ResponseType.APPLY);
-
+add_button (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
response.connect (responded);
}
@@ -71,6 +71,16 @@ public class Postler.AccountSetup : Gtk.Dialog {
info.type = AccountType.IMAP;
var setup = new AccountSetup (info);
+setup.add_button (_(_Create Account), Gtk.ResponseType.APPLY);
+setup.set_default_response (Gtk.ResponseType.APPLY);
+setup.show ();
+return setup;
+}
+
+public static AccountSetup edit_account (AccountInfo info) {
+var setup = new AccountSetup (info);
+setup.add_button (_(_Save Account), Gtk.ResponseType.APPLY);
+setup.set_default_response (Gtk.ResponseType.APPLY);
setup.show ();
return setup;
}
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index b4e5134..ebd8494 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -369,6 +369,21 @@ public class Postler.Folders : Gtk.TreeView {
}
});
menu.append (menuitem);
+menuitem = new Gtk.MenuItem.with_mnemonic (_(Account
_Properties));
+menuitem.activate.connect ((menuitem) = {
+Gtk.TreeIter iter;
+ if (get_selection ().get_selected (null, out iter)) {
+ AccountInfo? account_info;
+ store.get (iter, Columns.INFO, out account_info);
+ AccountSetup.edit_account (account_info).done.connect (
+ (setup, info) = {
+ accounts.remove_info (info);
+ accounts.add_info (info);
+ populate ();
+ } );
+ }
+});
+menu.append (menuitem);
}
menu.show_all ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Build with threading enabled and require GThread
Updating branch refs/heads/master
to 59e73365e5048b33aeffa55536c5e8fa20b384d8 (commit)
from 8047d49e0be8ed8a4b4f3e37c5af223c13e03c65 (commit)
commit 59e73365e5048b33aeffa55536c5e8fa20b384d8
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 17 19:11:08 2010 +0200
Build with threading enabled and require GThread
postler/wscript_build |2 +-
wscript |2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/postler/wscript_build b/postler/wscript_build
index 9f1de5f..0e85405 100644
--- a/postler/wscript_build
+++ b/postler/wscript_build
@@ -13,7 +13,7 @@ obj.name = 'postler'
obj.target = 'postler'
obj.includes = '. ..'
obj.find_sources_in_dirs ('.')
-obj.uselib = 'GIO GTK UNIQUE WEBKIT'
+obj.uselib = 'GIO GTHREAD GTK UNIQUE WEBKIT'
obj.packages = 'config postler posix gio-2.0 gtk+-2.0 unique-1.0 webkit-1.0'
obj.vapi_dirs = '.'
diff --git a/wscript b/wscript
index 25bf16d..28ae393 100644
--- a/wscript
+++ b/wscript
@@ -98,6 +98,7 @@ def configure (conf):
return conf.env['HAVE_' + var]
check_pkg ('gio-2.0', '2.16.0')
+check_pkg ('gthread-2.0', '2.16.0')
check_pkg ('unique-1.0', '0.9')
check_pkg ('gtk+-2.0', '2.12.0', var='GTK')
check_pkg ('webkit-1.0', '1.1.1')
@@ -149,6 +150,7 @@ def configure (conf):
conf.env.append_value ('CCFLAGS', '-w -O0 -g'.split ())
elif debug_level == 'full':
conf.env.append_value ('CCFLAGS', '-w -O1 -g
-DG_ENABLE_DEBUG'.split ())
+conf.env.append_value ('VALAFLAGS', '--thread')
if debug_level == 'full':
conf.env.append_value ('VALAFLAGS', '--enable-checking'.split ())
elif debug_level == 'none':
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 99ab35b3a892065041f9e7abcda3675559f23196 (commit) from 3d3f5245e1a4e00c9a83ed0cd1495f0a5461261f (commit) commit 99ab35b3a892065041f9e7abcda3675559f23196 Author: Cristian Marchi cri.pe...@gmail.com Date: Sun Jul 18 17:22:02 2010 +0200 l10n: Updated Italian (it) translation to 100% New status: 45 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 55 ++- 1 files changed, 18 insertions(+), 37 deletions(-) diff --git a/po/it.po b/po/it.po index f9658dc..68e3f8e 100644 --- a/po/it.po +++ b/po/it.po @@ -2,20 +2,19 @@ # Copyright (C) YEAR THE tumbler'S COPYRIGHT HOLDER # This file is distributed under the same license as the tumbler package. # Cristian Marchi cri.pe...@gmail.com, 2010. -# +# msgid msgstr Project-Id-Version: tumbler\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-07-16 17:09+0200\n +POT-Creation-Date: 2010-07-18 10:01+\n PO-Revision-Date: 2010-06-26 08:57+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n -Language-Team: Italian Translation Team xfce-it-translat...@googlegroups. -com\n -Language: \n +Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../tumblerd/tumbler-cache-service.c:383 #, c-format @@ -33,14 +32,13 @@ msgstr Nessun creatore di miniature disponibile per \%s\ msgid Another generic thumbnailer is already running msgstr Un altro creatore di miniature generico è già in esecuzione -#: ../tumblerd/tumbler-service.c:864 +#: ../tumblerd/tumbler-service.c:867 msgid Unsupported thumbnail flavor requested msgstr Richiesta di tipo di miniatura non valida #: ../tumblerd/tumbler-specialized-thumbnailer.c:461 msgid Failed to call the specialized thumbnailer: timeout -msgstr -Chiamata del creatore di miniature specializzato non riuscita: tempo scaduto +msgstr Chiamata del creatore di miniature specializzato non riuscita: tempo scaduto #: ../tumblerd/tumbler-specialized-thumbnailer.c:470 #, c-format @@ -60,12 +58,8 @@ msgstr Sezione malformata \%s\ nel file «%s»: %s #: ../tumblerd/tumbler-manager.c:526 #, c-format -msgid -Malformed section \%s\ in file \%s\: Mismatch between section name and -UriScheme/MimeType -msgstr -Sezione malformata \%s\ nel file «%s»: mancata corrispondenza tra il nome -della sezione e UriScheme/MimeType +msgid Malformed section \%s\ in file \%s\: Mismatch between section name and UriScheme/MimeType +msgstr Sezione malformata \%s\ nel file «%s»: mancata corrispondenza tra il nome della sezione e UriScheme/MimeType #: ../tumblerd/tumbler-manager.c:886 ../tumblerd/tumbler-manager.c:900 #: ../tumblerd/tumbler-manager.c:914 @@ -101,9 +95,7 @@ msgstr Avvio del servizio di cache per le miniature non riuscito: %s #: ../tumblerd/main.c:140 #, c-format msgid Failed to load specialized thumbnailers into the registry: %s -msgstr -Caricamento del creatore di miniature specializzato nel registro non -riuscito:%s +msgstr Caricamento del creatore di miniature specializzato nel registro non riuscito:%s #: ../tumblerd/main.c:158 #, c-format @@ -175,14 +167,11 @@ msgstr Chiusura del plugin di Tumbler Pixbuf Thumbnailer in corso... #: ../plugins/font-thumbnailer/font-thumbnailer-plugin.c:62 msgid Initializing the Tumbler Font Thumbnailer plugin -msgstr -Inizializzazione del plugin di Tumbler per la creazione delle miniature del -carattere +msgstr Inizializzazione del plugin di Tumbler per la creazione delle miniature del carattere #: ../plugins/font-thumbnailer/font-thumbnailer-plugin.c:79 msgid Shutting down the Tumbler Font Thumbnailer plugin -msgstr -Chiusura del plugin di Tumbler per la creazione delle miniature del carattere +msgstr Chiusura del plugin di Tumbler per la creazione delle miniature del carattere #. there was an error in the freetype initialization, abort #: ../plugins/font-thumbnailer/font-thumbnailer.c:463 @@ -223,32 +212,24 @@ msgid Thumbnail could not be inferred from file contents msgstr La miniatura non può essere creata dal contenuto di un file #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c:63 -#, fuzzy msgid Initializing the Tumbler ffmpeg video thumbnailer plugin -msgstr -Inizializzazione del plugin di Tumbler per la creazione delle miniature del -carattere +msgstr Inizializzazione del plugin ffmpeg di Tumbler per la creazione delle miniature del video #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c:80 -#, fuzzy msgid Shutting down the Tumbler ffmpeg video thumbnailer plugin -msgstr -Chiusura del plugin di Tumbler per la creazione delle miniature del carattere +msgstr Chiusura del plugin ffmpeg di Tumbler per la creazione delle miniature del video #:
[Xfce4-commits] xfce4-session:master Fix typo in shutdown code.
Updating branch refs/heads/master
to dddf3232a52dd770b0d726e2ce7658e5ac40fe47 (commit)
from c45e8278b8fff5d3d41c480c6e51a04ce6a6c448 (commit)
commit dddf3232a52dd770b0d726e2ce7658e5ac40fe47
Author: Nick Schermer n...@xfce.org
Date: Sun Jul 18 19:54:06 2010 +0200
Fix typo in shutdown code.
xfce4-session/xfsm-shutdown-helper.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xfce4-session/xfsm-shutdown-helper.c
b/xfce4-session/xfsm-shutdown-helper.c
index ed687a0..b88e07b 100644
--- a/xfce4-session/xfsm-shutdown-helper.c
+++ b/xfce4-session/xfsm-shutdown-helper.c
@@ -1033,8 +1033,8 @@ xfsm_shutdown_helper_check_backends (XfsmShutdownHelper
*helper)
if ( helper-devkit_is_upower )
{
- action_hibernate = org.freedesktop.upower.suspend;
- action_suspend = org.freedesktop.upower.hibernate;
+ action_hibernate = org.freedesktop.upower.hibernate;
+ action_suspend = org.freedesktop.upower.suspend;
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Add a toplevel monitor for newly created folders
Updating branch refs/heads/master
to c6d8169c7f32151d96923e7a275c3249d634c7c3 (commit)
from 19406c01840b840ceb69aee5ebb904c1d32b9e0e (commit)
commit c6d8169c7f32151d96923e7a275c3249d634c7c3
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Jul 18 20:30:28 2010 +0200
Add a toplevel monitor for newly created folders
postler/postler-folders.vala | 20 +++-
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index cae5245..b574cb0 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -48,16 +48,17 @@ public class Postler.Folders : Gtk.TreeView {
NAME,
LOCATION,
INFO,
+TOPLEVEL_MONITOR,
FOLDER_MONITOR,
UNREAD_MONITOR,
}
public Folders (Accounts accounts) {
this.accounts = accounts;
-store = new Gtk.TreeStore (6,
+store = new Gtk.TreeStore (7,
typeof (string), typeof (string), typeof (string),
typeof (AccountInfo),
-typeof (GLib.FileMonitor), typeof (GLib.FileMonitor));
+typeof (GLib.FileMonitor), typeof (GLib.FileMonitor), typeof
(GLib.FileMonitor));
set_model (store);
insert_column_with_attributes (-1, Icon,
new Gtk.CellRendererPixbuf (), stock-id, Columns.ICON);
@@ -113,6 +114,8 @@ public class Postler.Folders : Gtk.TreeView {
}
try {
+var folder_dir = File.new_for_path (account_info.path);
+
Gtk.TreeIter account_iter;
bool existing_iter = false;
if (store.iter_children (out account_iter, null)) {
@@ -134,14 +137,21 @@ public class Postler.Folders : Gtk.TreeView {
while (store.iter_children (out iter, account_iter))
store.remove (iter);
}
-else
+else {
+var monitor = folder_dir.monitor_directory (0, null);
+monitor.changed.connect ((monitor, file, other, event) = {
+var account_infos = new GLib.ListAccountInfo ();
+account_infos.prepend (account_info);
+populate_accounts (account_infos);
+});
store.insert_with_values (out account_iter, null, -1,
Columns.ICON, Gtk.STOCK_DIRECTORY,
Columns.NAME, account_info.name,
Columns.LOCATION, null,
-Columns.INFO, account_info);
+Columns.INFO, account_info,
+Columns.TOPLEVEL_MONITOR, monitor);
+}
-var folder_dir = File.new_for_path (account_info.path);
var folder_enumerator = folder_dir.enumerate_children (
FILE_ATTRIBUTE_STANDARD_NAME, 0, null);
FileInfo info;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Adapt the Korean encoding quirk to work again
Updating branch refs/heads/master
to 19406c01840b840ceb69aee5ebb904c1d32b9e0e (commit)
from d2fd92ed91a13d86b879a1553fa0a011d3852ab8 (commit)
commit 19406c01840b840ceb69aee5ebb904c1d32b9e0e
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Jul 18 20:12:16 2010 +0200
Adapt the Korean encoding quirk to work again
postler/postler-messages.vala |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala
index 2b53951..47a7895 100644
--- a/postler/postler-messages.vala
+++ b/postler/postler-messages.vala
@@ -251,8 +251,9 @@ public class Postler.Messages : Gtk.TreeView {
token++;
charset = encoded[token1:token].up ();
/* Encoding aliases */
-if (charset == KS_C_5601-1987)
-charset = CP949;
+if (charset == ?KS_C_5601-1987)
+charset = ?CP949;
+
token++;
unichar encoding = encoded[token].toupper ();
if (encoding != 'Q' encoding != 'B')
@@ -277,7 +278,7 @@ public class Postler.Messages : Gtk.TreeView {
(pieces[1] != null ? pieces[1] : );
}
catch (GLib.ConvertError error) {
-GLib.message (_(Failed to convert \%s\: %s), encoded,
error.message);
+GLib.warning (_(Failed to convert \%s\: %s), encoded,
error.message);
return encoded.substring (0, token1 - 1)
+ pieces[0] + (pieces[1] != null ? pieces[1] : );
}
@@ -289,6 +290,7 @@ public class Postler.Messages : Gtk.TreeView {
string[] pieces = encoded.strip ().split (?=);
if (pieces == null || pieces[0] == null)
return encoded;
+
var decoded = new GLib.StringBuilder ();
foreach (var piece in pieces)
decoded.append (decode_piece (piece, out charset));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Store folder and unread monitor in the model
Updating branch refs/heads/master
to d2fd92ed91a13d86b879a1553fa0a011d3852ab8 (commit)
from 59e73365e5048b33aeffa55536c5e8fa20b384d8 (commit)
commit d2fd92ed91a13d86b879a1553fa0a011d3852ab8
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Jul 18 20:00:06 2010 +0200
Store folder and unread monitor in the model
This ties monitors to row lifespan just like we need it.
postler/postler-folders.vala | 33 +++--
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index ebd8494..cae5245 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -19,8 +19,6 @@ public class Postler.Folders : Gtk.TreeView {
Accounts accounts;
Gtk.TreeStore store;
string last_location;
-FileMonitor[] unread_monitors = {};
-uint unread_monitors_count = 0;
public Postler.Messages messages { get; set; }
public string? selected_location {
@@ -49,13 +47,17 @@ public class Postler.Folders : Gtk.TreeView {
ICON,
NAME,
LOCATION,
-INFO
+INFO,
+FOLDER_MONITOR,
+UNREAD_MONITOR,
}
public Folders (Accounts accounts) {
this.accounts = accounts;
-store = new Gtk.TreeStore (4,
-typeof (string), typeof (string), typeof (string), typeof
(AccountInfo));
+store = new Gtk.TreeStore (6,
+typeof (string), typeof (string), typeof (string),
+typeof (AccountInfo),
+typeof (GLib.FileMonitor), typeof (GLib.FileMonitor));
set_model (store);
insert_column_with_attributes (-1, Icon,
new Gtk.CellRendererPixbuf (), stock-id, Columns.ICON);
@@ -92,9 +94,6 @@ public class Postler.Folders : Gtk.TreeView {
public bool populate () {
store.clear ();
-unread_monitors = {};
-unread_monitors_count = 0;
-
return populate_accounts (accounts.get_infos ());
}
@@ -152,33 +151,31 @@ public class Postler.Folders : Gtk.TreeView {
if (account_info.hide != null name in account_info.hide)
continue;
-/* FIXME: Handle duplicate or obsolete unread monitor */
var account_dir = folder_dir.resolve_relative_path (name);
-unread_monitors += account_dir.monitor_directory (0, null);
-unread_monitors_count++;
-unread_monitors[unread_monitors_count - 1].changed.connect
(
-(monitor, file, other, event) = {
+var monitor = account_dir.monitor_directory (0, null);
+monitor.changed.connect ((monitor, file, other, event) = {
var account_infos = new GLib.ListAccountInfo ();
account_infos.prepend (account_info);
populate_accounts (account_infos);
});
+store.set (account_iter,
+Columns.FOLDER_MONITOR, monitor);
Gtk.TreeIter folder_iter;
if (name == INBOX) {
var msg_dir = folder_dir.resolve_relative_path (
account_info.path + / + name + /new);
-unread_monitors += msg_dir.monitor_directory (0, null);
-unread_monitors_count++;
+monitor = msg_dir.monitor_directory (0, null);
string path = store.get_string_from_iter
(account_iter);
-unread_monitors[unread_monitors_count -
1].changed.connect (
-(monitor, file, other, event) = {
+monitor.changed.connect ((monitor, file, other, event)
= {
unread_monitor_changed (msg_dir, path,
account_info.name);
});
unread_monitor_changed (msg_dir, path,
account_info.name);
store.set (account_iter,
Columns.ICON, STOCK_INBOX,
-Columns.LOCATION, account_info.path + / + name);
+Columns.LOCATION, account_info.path + / + name,
+Columns.UNREAD_MONITOR, monitor);
continue;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Remove conditional guards for sqlite
Updating branch refs/heads/master
to 94fbf158f6e12a970147eb247ee1b508989c52ba (commit)
from 57683d45b16fbf8455c29743778a82a3b57bb003 (commit)
commit 94fbf158f6e12a970147eb247ee1b508989c52ba
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 17 21:31:29 2010 +0200
Remove conditional guards for sqlite
extensions/formhistory.c | 16 +---
midori/main.c | 19 +--
midori/midori-browser.c| 30 +-
midori/midori-locationaction.c | 14 +-
midori/midori-view.c |2 --
panels/midori-bookmarks.c | 13 -
panels/midori-bookmarks.h |7 +--
panels/midori-history.c| 20 ++--
wscript|1 -
9 files changed, 7 insertions(+), 115 deletions(-)
diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index c0eb857..446e534 100644
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -21,9 +21,7 @@
#include unistd.h
#endif
-#if HAVE_SQLITE
-#include sqlite3.h
-#endif
+#include sqlite3.h
static GHashTable* global_keys;
static gchar* jsforms;
@@ -130,7 +128,6 @@ formhistory_update_database (gpointer db,
const gchar* key,
const gchar* value)
{
-#if HAVE_SQLITE
gchar* sqlcmd;
gchar* errmsg;
gint success;
@@ -146,7 +143,6 @@ formhistory_update_database (gpointer db,
g_free (errmsg);
return;
}
-#endif
}
static gboolean
@@ -372,9 +368,7 @@ formhistory_deactivate_cb (MidoriExtension* extension,
MidoriBrowser* browser)
{
MidoriApp* app = midori_extension_get_app (extension);
-#if HAVE_SQLITE
sqlite3* db;
-#endif
g_signal_handlers_disconnect_by_func (
browser, formhistory_add_tab_cb, extension);
@@ -389,13 +383,10 @@ formhistory_deactivate_cb (MidoriExtension* extension,
if (global_keys)
g_hash_table_destroy (global_keys);
-#if HAVE_SQLITE
if ((db = g_object_get_data (G_OBJECT (extension), formhistory-db)))
sqlite3_close (db);
-#endif
}
-#if HAVE_SQLITE
static int
formhistory_add_field (gpointer data,
int argc,
@@ -423,18 +414,15 @@ formhistory_add_field (gpointer data,
}
return 0;
}
-#endif
static void
formhistory_activate_cb (MidoriExtension* extension,
MidoriApp* app)
{
-#if HAVE_SQLITE
const gchar* config_dir;
gchar* filename;
sqlite3* db;
char* errmsg = NULL, *errmsg2 = NULL;
-#endif
KatzeArray* browsers;
MidoriBrowser* browser;
guint i;
@@ -444,7 +432,6 @@ formhistory_activate_cb (MidoriExtension* extension,
(GDestroyNotify)g_free);
if(!jsforms)
formhistory_prepare_js ();
-#if HAVE_SQLITE
config_dir = midori_extension_get_config_dir (extension);
katze_mkdir_with_parents (config_dir, 0700);
filename = g_build_filename (config_dir, forms.db, NULL);
@@ -475,7 +462,6 @@ formhistory_activate_cb (MidoriExtension* extension,
}
sqlite3_close (db);
}
-#endif
browsers = katze_object_get_object (app, browsers);
i = 0;
diff --git a/midori/main.c b/midori/main.c
index 243d8d0..b8c823c 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -33,10 +33,7 @@
#include string.h
#include glib/gstdio.h
#include webkit/webkit.h
-
-#if HAVE_SQLITE
-#include sqlite3.h
-#endif
+#include sqlite3.h
#if ENABLE_NLS
#include libintl.h
@@ -351,7 +348,6 @@ search_engines_save_to_file (KatzeArray* search_engines,
return saved;
}
-#if HAVE_SQLITE
static sqlite3*
midori_history_initialize (KatzeArray* array,
const gchar* filename,
@@ -471,7 +467,6 @@ midori_bookmarks_import (const gchar* filename,
}
midori_bookmarks_import_array_db (db, bookmarks, );
}
-#endif
static void
midori_session_add_delay (KatzeArray* session)
@@ -1561,11 +1556,9 @@ main (intargc,
gchar* uri;
KatzeItem* item;
gchar* uri_ready;
-#if HAVE_SQLITE
gchar* errmsg;
sqlite3* db;
gint max_history_age;
-#endif
gint clear_prefs = MIDORI_CLEAR_NONE;
#ifdef G_ENABLE_DEBUG
gboolean startup_timer = g_getenv (MIDORI_STARTTIME) != NULL;
@@ -1888,7 +1881,6 @@ main (intargc,
midori_startup_timer (Search read: \t%f);
bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
-#if HAVE_SQLITE
katze_assign (config_file, build_config_filename (bookmarks.db));
errmsg = NULL;
if ((db = midori_bookmarks_initialize (bookmarks, config_file, errmsg))
== NULL)
@@ -1908,7 +1900,6 @@ main (intargc,
g_free (old_bookmarks);
g_object_set_data (G_OBJECT (bookmarks), db, db);
}
-#endif
midori_startup_timer (Bookmarks read: \t%f);
[Xfce4-commits] xfce4-panel:master l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 95%
Updating branch refs/heads/master to ff015accc9ae1548757da6eb135e8ff469bd3339 (commit) from c6b18eae4325c194ad640a24b1fb168639a9f6c2 (commit) commit ff015accc9ae1548757da6eb135e8ff469bd3339 Author: Michael Martins michaelf...@gmail.com Date: Mon Jul 19 01:39:48 2010 +0200 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 95% New status: 324 messages complete with 1 fuzzy and 13 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt_BR.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 62a6d74..9cc89f8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11,7 +11,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-07-17 22:06+\n +POT-Creation-Date: 2010-07-18 22:06+\n PO-Revision-Date: 2009-01-19 17:26-0200\n Last-Translator: Henrique P. Machado zehri...@gmail.com\n Language-Team: Brazilian Portuguese xfce-i...@xfce.org\n @@ -904,7 +904,7 @@ msgstr vinte passados de %0 #: ../plugins/clock/clock-fuzzy.c:105 #, no-c-format msgid twenty five past %0 -msgstr vinte e cinto passados de %0 +msgstr vinte e cinco passados de %0 #: ../plugins/clock/clock-fuzzy.c:106 #, no-c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 99%
Updating branch refs/heads/master to 8b01f689a9c5194831f0e9d413a5422a238b769e (commit) from ff015accc9ae1548757da6eb135e8ff469bd3339 (commit) commit 8b01f689a9c5194831f0e9d413a5422a238b769e Author: Michael Martins michaelf...@gmail.com Date: Mon Jul 19 01:47:18 2010 +0200 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 99% New status: 337 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt_BR.po | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 9cc89f8..5be5c4a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -947,79 +947,79 @@ msgstr %1 horas #, no-c-format msgctxt one msgid %0 o'clock -msgstr +msgstr %0 horas #: ../plugins/clock/clock-fuzzy.c:120 #, no-c-format msgctxt one msgid five past %0 -msgstr +msgstr cinco passados de %0 #: ../plugins/clock/clock-fuzzy.c:121 #, no-c-format msgctxt one msgid ten past %0 -msgstr +msgstr dez passados de %0 #: ../plugins/clock/clock-fuzzy.c:122 #, no-c-format msgctxt one msgid quarter past %0 -msgstr +msgstr quinze passados de %0 #: ../plugins/clock/clock-fuzzy.c:123 #, no-c-format msgctxt one msgid twenty past %0 -msgstr +msgstr vinte passados de %0 #: ../plugins/clock/clock-fuzzy.c:124 #, no-c-format msgctxt one msgid twenty five past %0 -msgstr +msgstr vinte e cinco passados de %0 #: ../plugins/clock/clock-fuzzy.c:125 #, no-c-format msgctxt one msgid half past %0 -msgstr +msgstr trinta passados de %0 #: ../plugins/clock/clock-fuzzy.c:126 #, no-c-format msgctxt one msgid twenty five to %1 -msgstr +msgstr vinte e cinco para %1 #: ../plugins/clock/clock-fuzzy.c:127 #, no-c-format msgctxt one msgid twenty to %1 -msgstr +msgstr vinte para %1 #: ../plugins/clock/clock-fuzzy.c:128 #, no-c-format msgctxt one msgid quarter to %1 -msgstr +msgstr quinze para %1 #: ../plugins/clock/clock-fuzzy.c:129 #, no-c-format msgctxt one msgid ten to %1 -msgstr +msgstr dez para %1 #: ../plugins/clock/clock-fuzzy.c:130 #, no-c-format msgctxt one msgid five to %1 -msgstr +msgstr cinco para %1 #: ../plugins/clock/clock-fuzzy.c:131 #, no-c-format msgctxt one msgid %1 o'clock -msgstr +msgstr %1 horas #: ../plugins/clock/clock-fuzzy.c:136 msgid one ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 011e061acecd3481dd1a6dcb06c5daa84f08ef32 (commit) from 99ab35b3a892065041f9e7abcda3675559f23196 (commit) commit 011e061acecd3481dd1a6dcb06c5daa84f08ef32 Author: Bauzhan Muftakhidinov baurthefi...@gmail.com Date: Mon Jul 19 06:09:14 2010 +0200 l10n: Updated Kazakh (kk) translation to 100% New status: 45 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 33 + 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/po/kk.po b/po/kk.po index b397318..20fa8d9 100644 --- a/po/kk.po +++ b/po/kk.po @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Baurzhan Muftakhidinov baurthefi...@gmail.com, 2010. -# +# msgid msgstr Project-Id-Version: trunk\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-07-16 17:09+0200\n +POT-Creation-Date: 2010-07-19 04:01+\n PO-Revision-Date: 2010-03-11 12:52+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n -Language: kk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: kk\n Plural-Forms: nplurals=1; plural=0\n #: ../tumblerd/tumbler-cache-service.c:383 @@ -33,7 +33,7 @@ msgstr \%s\ үшін таңбашалар қолданбасы қолжете msgid Another generic thumbnailer is already running msgstr Басқа жалпы таңбашалар қызметі қосулы тұр -#: ../tumblerd/tumbler-service.c:864 +#: ../tumblerd/tumbler-service.c:867 msgid Unsupported thumbnail flavor requested msgstr Қолдауы жоқ таңбаша түрі сұранды @@ -59,12 +59,8 @@ msgstr \%s\ секциясы қате, ол \%s\ файлында: %s #: ../tumblerd/tumbler-manager.c:526 #, c-format -msgid -Malformed section \%s\ in file \%s\: Mismatch between section name and -UriScheme/MimeType -msgstr -\%s\ секциясы қате, ол \%s\ файлында: Секция аты мен UriScheme/MimeType -арасында сәйкестік жоқ +msgid Malformed section \%s\ in file \%s\: Mismatch between section name and UriScheme/MimeType +msgstr \%s\ секциясы қате, ол \%s\ файлында: Секция аты мен UriScheme/MimeType арасында сәйкестік жоқ #: ../tumblerd/tumbler-manager.c:886 ../tumblerd/tumbler-manager.c:900 #: ../tumblerd/tumbler-manager.c:914 @@ -217,27 +213,24 @@ msgid Thumbnail could not be inferred from file contents msgstr Таңбаша файл құрамасынан алынуы мүмкін емес #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c:63 -#, fuzzy msgid Initializing the Tumbler ffmpeg video thumbnailer plugin -msgstr Tumbler Font Thumbnailer плагинді қосу +msgstr Tumbler ffmpeg видео thumbnailer плагинді қосу #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c:80 -#, fuzzy msgid Shutting down the Tumbler ffmpeg video thumbnailer plugin -msgstr Tumbler Font Thumbnailer плагинді сөндіру +msgstr Tumbler ffmpeg видео thumbnailer плагинді сөндіру #: ../plugins/poppler-thumbnailer/poppler-thumbnailer-plugin.c:62 -#, fuzzy msgid Initializing the Tumbler Poppler PDF/PS Thumbnailer plugin -msgstr Tumbler Font Thumbnailer плагинді қосу +msgstr Tumbler Poppler PDF/PS Thumbnailer плагинді қосу -#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:182 +#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:212 msgid The document is empty -msgstr +msgstr Құжат бос -#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:193 +#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:224 msgid First page of the document could not be read -msgstr +msgstr Құжаттың бірінші бетін оқу мүмкін емес #: ../plugins/xdg-cache/xdg-cache-thumbnail.c:382 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to 0cb2d9c003b466fe2c1d6496f3738fc1e2d283f4 (commit) from 9226bfc565bc092cf53f92fade4b4abb4cd16f70 (commit) commit 0cb2d9c003b466fe2c1d6496f3738fc1e2d283f4 Author: Bauzhan Muftakhidinov baurthefi...@gmail.com Date: Mon Jul 19 06:14:12 2010 +0200 l10n: Updated Kazakh (kk) translation to 100% New status: 669 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/kk.po b/po/kk.po index ba49c71..42e4601 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: 4.6\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-06-03 04:05+\n +POT-Creation-Date: 2010-07-19 04:05+\n PO-Revision-Date: 2010-03-20 16:58+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n @@ -309,7 +309,7 @@ msgstr Жөнелткішті өші_ру #: ../thunar/thunar-chooser-dialog.c:649 #, c-format msgid Open i%s/i and other files of type \%s\ with: -msgstr i%s/i пен \%s\ түрдегі барлық файлдарды көмегімен ашу: +msgstr i%s/i және \%s\ түрдегі барлық файлдарды көмегімен ашу: #: ../thunar/thunar-chooser-dialog.c:657 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
