[Xfce4-commits] gigolo:master Fix mnemonics in the Connect dialog
Updating branch refs/heads/master to 103e4d103dc5580c11d0c404d002b710a0aaacc3 (commit) from 95a37d4ce28187b90c175edcd6230ec2b7f9f5d8 (commit) commit 103e4d103dc5580c11d0c404d002b710a0aaacc3 Author: Enrico Tröger enr...@xfce.org 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] gigolo:master Remove fuzzy mark for previous change
Updating branch refs/heads/master to 32f34ac17215174f99d6540adfad43c1d68fb5ca (commit) from 103e4d103dc5580c11d0c404d002b710a0aaacc3 (commit) commit 32f34ac17215174f99d6540adfad43c1d68fb5ca Author: Enrico Tröger enr...@xfce.org 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 marcoscosta...@gmail.com\n Language-Team: Asturian alministrado...@softastur.org\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 enzo...@abv.bg\n Language-Team: Bulgarian xfce-i...@xfce.org\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 redcr...@gmail.com\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 miko.v...@gmail.com\n Language-Team: Czech c...@li.org\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 p_kongs...@op.pl\n Language-Team: Danish da...@dansk-gruppen.dk\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 enr...@xfce.org, 2008-2009. # Fabian Nowak timyst...@arcor.de, 2009. -# +# msgid msgstr Project-Id-Version: gigolo 0.3.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-07-31 22:04+\n +POT-Creation-Date: 2010-08-01 12:06+0200\n PO-Revision-Date: 2009-04-13 14:30+0200\n Last-Translator: Fabian Nowak timyst...@arcor.de\n Language-Team: German xfce-i18n...@xfce.org\n +Language: de\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: de\n Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../src/main.c:46 msgid Ignore running instances, enforce opening a new instance -msgstr Laufende Instanzen nicht beachten,
[Xfce4-commits] postler:master Render nested blocks of quotes
Updating branch refs/heads/master
to a0b632ee8bdb94f548dbf90bc6162a8c5df567ec (commit)
from d2184aa24128fb47ab42da46fb99209b11bc873a (commit)
commit a0b632ee8bdb94f548dbf90bc6162a8c5df567ec
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Jul 28 13:31:57 2010 +0200
Render nested blocks of quotes
postler/postler-content.vala | 39 +--
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 084cd5f..9dd34b9 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -550,7 +550,7 @@ public class Postler.Content : WebKit.WebView {
}
bool plain_text = mime_type == text/plain;
-bool in_quote = false;
+int in_quote = 0;
bool in_signature = false;
string inner_boundary = ;
while ((line = stream.read_line (null, null)) != null) {
@@ -633,17 +633,36 @@ public class Postler.Content : WebKit.WebView {
line = ;
}
/* Looks like quoting */
-if (in_quote !line.has_prefix ()) {
-body[body_parts].append (/blockquote);
-in_quote = false;
+if (in_quote 0 || line.has_prefix ( )) {
+/* Determine level of nesting */
+int quote_mark = 0;
+int position = 0;
+do {
+if (line[position] == '')
+quote_mark++;
+else if (line[position] != ' ')
+break;
+position++;
+} while (true);
+
+if (quote_mark in_quote)
+body[body_parts].append (/blockquote);
+else if (quote_mark in_quote)
+body[body_parts].append (blockquote);
+in_quote = quote_mark;
}
-else if (!in_quote line.has_prefix ()) {
-body[body_parts].append (blockquote);
-in_quote = true;
-}
-if (in_quote line[0] == '' line[1] == ' ')
+
+if (in_quote 0 line[0] == '' line[1] == ' ') {
line = line.substring (2);
-else if (in_quote line[0] == '' line[1] == '\0')
+int position = 0;
+do {
+if (line[position] != '' line[position] != ' ')
+break;
+position++;
+} while (true);
+line = line.substring (position);
+}
+else if (in_quote 0 line[0] == '' line[1] == '\0')
line = line.substring (1);
}
body[body_parts].append (line);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Always decode =20 as a space, not hex, for quote handling
Updating branch refs/heads/master
to 39e066da975c2e0532159d87bd66fa2d6d9e0603 (commit)
from a0b632ee8bdb94f548dbf90bc6162a8c5df567ec (commit)
commit 39e066da975c2e0532159d87bd66fa2d6d9e0603
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Jul 28 13:48:09 2010 +0200
Always decode =20 as a space, not hex, for quote handling
postler/postler-content.vala |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 9dd34b9..b69f6e9 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -268,7 +268,9 @@ public class Postler.Content : WebKit.WebView {
};
internal static string quoted_printable_decode (string quoted) {
-string unquoted = quoted.replace ( =, ).replace (_, );
+/* =20 is not hex-encoded, to faciliate quote handling */
+string unquoted = quoted.replace ( =, )
+.replace (_, ).replace (=20, );
try {
var regex = new GLib.Regex (([=]([0-9A-F][0-9A-F])));
return regex.replace (unquoted, -1, 0, #x\\2;);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Omit empty and non-helpful decorative lines when replying
Updating branch refs/heads/master
to e47a1a2da8830a3b9d277b46902d658b6abcfa9e (commit)
from 39e066da975c2e0532159d87bd66fa2d6d9e0603 (commit)
commit e47a1a2da8830a3b9d277b46902d658b6abcfa9e
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Jul 28 14:11:36 2010 +0200
Omit empty and non-helpful decorative lines when replying
postler/postler-content.vala | 27 ++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index b69f6e9..cc7b8b8 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -310,14 +310,39 @@ public class Postler.Content : WebKit.WebView {
break;
}
+bool last_line_empty = true;
while ((line = stream.read_line (null, null)) != null) {
+/* Skip effectively empty lines */
+int position = 0;
+do {
+if (line[position] != '' line[position] != ' ')
+break;
+position++;
+} while (true);
+string effective = line.substring (position);
+if (effective == ) {
+if (last_line_empty)
+continue;
+last_line_empty = true;
+body.append ( \n);
+continue;
+}
+/* Skip non-helpful decorative lines */
+if (effective == -BEGIN PGP SIGNED MESSAGE-
+ || effective.has_prefix (Hash: SHA)
+ || effective == -END PGP SIGNATURE-
+ || effective == -BEGIN PGP SIGNATURE-)
+continue;
+last_line_empty = false;
+
size_t length = line.len ();
/* TODO: Handle encoding */
for (int i = 0; i length; i += (quote ? 78 : 80))
body.append ((quote ? : )
+ line.substring (i, (long)(length - i)) + \n);
}
-body.append_c ('\n');
+if (!last_line_empty)
+body.append_c ('\n');
} catch (GLib.Error error) {
display_error (_(Failed to quote message \%s\: %s).printf (
contents.get_path (), error.message));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Store address of bookmarks for tooltip as a string in the model
Updating branch refs/heads/master
to 5b640c7f46ce454c71011e3f123478933cb42c98 (commit)
from 1550c9d9f237587482c71a979dfe6d7b50421c0c (commit)
commit 5b640c7f46ce454c71011e3f123478933cb42c98
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 31 01:21:50 2010 +0200
Store address of bookmarks for tooltip as a string in the model
katze/katze-utils.c |4 +++-
panels/midori-bookmarks.c |3 ++-
panels/midori-history.c |3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index 39c7058..dc7f794 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -1138,8 +1138,10 @@ katze_bookmark_populate_tree_view (KatzeArray* array,
{
if (KATZE_ITEM_IS_BOOKMARK (child))
{
+gchar* tooltip = g_markup_escape_text (katze_item_get_uri (child),
-1);
gtk_tree_store_insert_with_values (model, NULL, parent,
- 0, 0, child, -1);
+ 0, 0, child, 1, tooltip, -1);
+g_free (tooltip);
}
else
{
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 1f94c89..b572a98 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -941,9 +941,10 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks)
gtk_box_pack_start (GTK_BOX (bookmarks), box, FALSE, FALSE, 5);
/* Create the treeview */
-model = gtk_tree_store_new (1, KATZE_TYPE_ITEM);
+model = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_STRING);
treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
+gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1);
column = gtk_tree_view_column_new ();
renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
diff --git a/panels/midori-history.c b/panels/midori-history.c
index 1af9542..d8aed73 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -892,9 +892,10 @@ midori_history_init (MidoriHistory* history)
gtk_box_pack_start (GTK_BOX (history), box, FALSE, FALSE, 5);
/* Create the treeview */
-model = gtk_tree_store_new (1, KATZE_TYPE_ITEM);
+model = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_STRING);
treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
+gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1);
column = gtk_tree_view_column_new ();
renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Do NULL-safe address comparison when loading the session
Updating branch refs/heads/master to 60eca91b74449e511041432ddfcd0268bab6bc6f (commit) from 5b640c7f46ce454c71011e3f123478933cb42c98 (commit) commit 60eca91b74449e511041432ddfcd0268bab6bc6f Author: Christian Dywan christ...@twotoasts.de Date: Sat Jul 31 01:29:57 2010 +0200 Do NULL-safe address comparison when loading the session midori/main.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/midori/main.c b/midori/main.c index fd5ec98..35ac8c7 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1259,7 +1259,7 @@ midori_load_session (gpointer data) midori_browser_set_current_page (browser, current); if (!(item = katze_array_get_nth_item (_session, current))) item = katze_array_get_nth_item (_session, 0); -if (!strcmp (katze_item_get_uri (item), )) +if (!g_strcmp0 (katze_item_get_uri (item), )) midori_browser_activate_action (browser, Location); g_object_unref (settings); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Use KatzeArray* to signal new items to MidoriHistory
Updating branch refs/heads/master
to 34d7a8033bf718a815130e8a7e682cdeae1485e2 (commit)
from 60eca91b74449e511041432ddfcd0268bab6bc6f (commit)
commit 34d7a8033bf718a815130e8a7e682cdeae1485e2
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 31 01:42:14 2010 +0200
Use KatzeArray* to signal new items to MidoriHistory
midori/midori-browser.c |4 +++
panels/midori-history.c | 51 ++-
2 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 91b6d9e..f3d1d71 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -5389,6 +5389,10 @@ midori_browser_new_history_item (MidoriBrowser* browser,
sqlite3_errmsg (db));
sqlite3_reset (stmt);
sqlite3_clear_bindings (stmt);
+
+/* FIXME: Workaround for the lack of a database interface */
+katze_array_add_item (browser-history, item);
+katze_array_remove_item (browser-history, item);
}
static void
diff --git a/panels/midori-history.c b/panels/midori-history.c
index d8aed73..f681ddc 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -409,6 +409,51 @@ midori_history_viewable_iface_init (MidoriViewableIface*
iface)
}
static void
+midori_history_add_item_cb (KatzeArray*array,
+KatzeItem* item,
+MidoriHistory* history)
+{
+GtkTreeView* treeview = GTK_TREE_VIEW (history-treeview);
+GtkTreeModel* model = gtk_tree_view_get_model (treeview);
+GtkTreeIter iter;
+KatzeItem* today;
+time_t current_time;
+
+current_time = time (NULL);
+if (gtk_tree_model_iter_children (model, iter, NULL))
+{
+gint64 day;
+gboolean has_today;
+
+gtk_tree_model_get (model, iter, 0, today, -1);
+
+day = katze_item_get_added (today);
+has_today = sokoke_days_between ((time_t*)day, current_time) == 0;
+g_object_unref (today);
+if (has_today)
+{
+gchar* tooltip = g_markup_escape_text (katze_item_get_uri (item),
-1);
+KatzeItem* copy = katze_item_copy (item);
+gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), NULL,
iter,
+ 0, 0, copy, 1, tooltip, -1);
+g_object_unref (copy);
+g_free (tooltip);
+return;
+}
+}
+
+today = (KatzeItem*)katze_array_new (KATZE_TYPE_ITEM);
+katze_item_set_added (today, current_time);
+katze_item_set_meta_integer (today, day,
+ sokoke_time_t_to_julian (current_time));
+gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), iter, NULL,
+ 0, 0, today, -1);
+/* That's an invisible dummy, so we always have an expander */
+gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), NULL, iter,
+ 0, 0, NULL, -1);
+}
+
+static void
midori_history_set_app (MidoriHistory* history,
MidoriApp* app)
{
@@ -416,7 +461,9 @@ midori_history_set_app (MidoriHistory* history,
if (history-array)
{
-g_object_unref (history-array);
+g_signal_handlers_disconnect_by_func (history-array,
+midori_history_add_item_cb, history);
+katze_object_assign (history-array, NULL);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (history-treeview));
gtk_tree_store_clear (GTK_TREE_STORE (model));
}
@@ -427,6 +474,8 @@ midori_history_set_app (MidoriHistory* history,
g_object_ref (app);
history-array = katze_object_get_object (app, history);
+g_signal_connect (history-array, add-item,
+ G_CALLBACK (midori_history_add_item_cb), history);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (history-treeview));
if (history-array)
midori_history_read_from_db_to_model (history, GTK_TREE_STORE (model),
NULL, 0, NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Remove freeze, thaw and set_uri from MidoriLocationAction
Updating branch refs/heads/master
to 2d1d19de23be79c7274b55fd1507fde126adb022 (commit)
from 34d7a8033bf718a815130e8a7e682cdeae1485e2 (commit)
commit 2d1d19de23be79c7274b55fd1507fde126adb022
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Jul 31 13:59:48 2010 +0200
Remove freeze, thaw and set_uri from MidoriLocationAction
midori/midori-browser.c| 10
midori/midori-locationaction.c | 47
midori/midori-locationaction.h | 10
3 files changed, 5 insertions(+), 62 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index f3d1d71..0e3e763 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -406,7 +406,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION
(action);
if (text *text)
{
-midori_location_action_set_uri (location_action,
browser-statusbar_text);
+midori_location_action_set_text (location_action,
browser-statusbar_text);
midori_location_action_set_icon (location_action, NULL);
midori_location_action_set_secondary_icon (location_action, NULL);
}
@@ -421,7 +421,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
else
midori_location_action_set_secondary_icon (
location_action, GTK_STOCK_JUMP_TO);
-midori_location_action_set_uri (location_action,
+midori_location_action_set_text (location_action,
midori_view_get_display_uri (MIDORI_VIEW (view)));
midori_location_action_set_icon (location_action,
midori_view_get_icon (MIDORI_VIEW (view)));
@@ -556,7 +556,7 @@ midori_view_notify_load_status_cb (GtkWidget* widget,
{
if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED)
{
-midori_location_action_set_uri (
+midori_location_action_set_text (
MIDORI_LOCATION_ACTION (action), uri);
midori_location_action_set_secondary_icon (
MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO);
@@ -601,7 +601,7 @@ midori_view_notify_uri_cb (GtkWidget* view,
{
const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view));
GtkAction* action = _action_by_name (browser, Location);
-midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri);
+midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
}
}
@@ -3492,7 +3492,7 @@ _action_location_reset_uri (GtkAction* action,
const gchar* uri;
uri = midori_browser_get_current_uri (browser);
-midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri);
+midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
}
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 29484d9..5b77ac5 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -568,34 +568,6 @@ midori_location_action_entry_for_proxy (GtkWidget* proxy)
return entry;
}
-/**
- * midori_location_action_freeze:
- * @location_action: a #MidoriLocationAction
- *
- * Freezing of the action doesn't do anything.
- *
- * Deprecated: 0.2.3
- **/
-void
-midori_location_action_freeze (MidoriLocationAction* location_action)
-{
-/* Nothing to do */
-}
-
-/**
- * midori_location_action_thaw:
- * @location_action: a #MidoriLocationAction
- *
- * Thawing of the action doesn't do anything.
- *
- * Deprecated: 0.2.3
- **/
-void
-midori_location_action_thaw (MidoriLocationAction* location_action)
-{
-/* Nothing to do */
-}
-
static void
midori_location_action_init (MidoriLocationAction* location_action)
{
@@ -1434,25 +1406,6 @@ midori_location_action_set_text (MidoriLocationAction*
location_action,
}
/**
- * midori_location_action_set_uri:
- * @location_action: a #MidoriLocationAction
- * @uri: an URI string
- *
- * Sets the entry URI to @uri and, if applicable, updates the icon.
- *
- * Deprecated: 0.2.0
- **/
-void
-midori_location_action_set_uri (MidoriLocationAction* location_action,
-const gchar* uri)
-{
-g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
-g_return_if_fail (uri != NULL);
-
-midori_location_action_set_text (location_action, uri);
-}
-
-/**
* midori_location_action_set_icon:
* @location_action: a #MidoriLocationAction
* @icon: a #GdkPixbuf or %NULL
diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h
index 3decc54..fd70e9c 100644
--- a/midori/midori-locationaction.h
+++ b/midori/midori-locationaction.h
@@ -36,12 +36,6 @@ typedef struct _MidoriLocationActionClass
MidoriLocationActionClass;
GType
midori_location_action_get_type
[Xfce4-commits] xfce4-panel:master Add workspace settings option to pager submenu.
Updating branch refs/heads/master
to 29dde6440ce40fcc0bc89a2dfa0952977794afe8 (commit)
from f72fb6c9f3335dae80a8c660fa066f229d5dc45f (commit)
commit 29dde6440ce40fcc0bc89a2dfa0952977794afe8
Author: Nick Schermer n...@xfce.org
Date: Sun Aug 1 21:47:23 2010 +0200
Add workspace settings option to pager submenu.
Also drop the find in path check, we don't really care about that.
plugins/pager/pager.c | 62 ++--
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index d034bd4..1dbee72 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -41,26 +41,27 @@
-static void pager_plugin_get_property (GObject
*object,
-guint
prop_id,
-GValue
*value,
-GParamSpec
*pspec);
-static void pager_plugin_set_property (GObject
*object,
-guint
prop_id,
-const GValue
*value,
-GParamSpec
*pspec);
-static gboolean pager_plugin_scroll_event (GtkWidget
*widget,
-GdkEventScroll
*event);
-static void pager_plugin_screen_changed(GtkWidget
*widget,
-GdkScreen
*previous_screen);
-static void pager_plugin_construct (XfcePanelPlugin
*panel_plugin);
-static void pager_plugin_free_data (XfcePanelPlugin
*panel_plugin);
-static gboolean pager_plugin_size_changed (XfcePanelPlugin
*panel_plugin,
-gint
size);
-static void pager_plugin_orientation_changed (XfcePanelPlugin
*panel_plugin,
-GtkOrientation
orientation);
-static void pager_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin);
-static void pager_plugin_screen_layout_changed (PagerPlugin
*plugin);
+static void pager_plugin_get_property (GObject
*object,
+ guint
prop_id,
+ GValue
*value,
+ GParamSpec
*pspec);
+static void pager_plugin_set_property (GObject
*object,
+ guint
prop_id,
+ const GValue
*value,
+ GParamSpec
*pspec);
+static gboolean pager_plugin_scroll_event (GtkWidget
*widget,
+ GdkEventScroll
*event);
+static void pager_plugin_screen_changed (GtkWidget
*widget,
+ GdkScreen
*previous_screen);
+static void pager_plugin_construct(XfcePanelPlugin
*panel_plugin);
+static void pager_plugin_free_data(XfcePanelPlugin
*panel_plugin);
+static gboolean pager_plugin_size_changed (XfcePanelPlugin
*panel_plugin,
+ gint
size);
+static void pager_plugin_orientation_changed (XfcePanelPlugin
*panel_plugin,
+ GtkOrientation
orientation);
+static void pager_plugin_configure_workspace_settings (GtkWidget
*button);
+static void pager_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin);
+static void pager_plugin_screen_layout_changed(PagerPlugin
*plugin);
@@ -334,7 +335,8 @@ pager_plugin_screen_changed (GtkWidget *widget,
static void
pager_plugin_construct (XfcePanelPlugin *panel_plugin)
{
- PagerPlugin *plugin = XFCE_PAGER_PLUGIN (panel_plugin);
+ PagerPlugin *plugin = XFCE_PAGER_PLUGIN (panel_plugin);
+ GtkWidget *mi, *image;
const PanelProperty properties[] =
{
{ workspace-scrolling, G_TYPE_BOOLEAN },
@@ -343,7 +345,17 @@ pager_plugin_construct (XfcePanelPlugin *panel_plugin)
{ NULL }
};
- xfce_panel_plugin_menu_show_configure (XFCE_PANEL_PLUGIN (plugin));
+ xfce_panel_plugin_menu_show_configure (panel_plugin);
+
+ mi =
[Xfce4-commits] ristretto:master Remove g_file_get_path stuff, work with URI's or not at all
Updating branch refs/heads/master
to c5f540c66b5172560f9343d0e75da845241fffc9 (commit)
from a7784687b4a1cf384405725ff618f5f038b6ae76 (commit)
commit c5f540c66b5172560f9343d0e75da845241fffc9
Author: Stephan Arts step...@xfce.org
Date: Sun Aug 1 23:42:21 2010 +0200
Remove g_file_get_path stuff, work with URI's or not at all
src/main_window.c | 20
src/thumbnail.c | 11 +--
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/main_window.c b/src/main_window.c
index 157028a..a96e94f 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -752,7 +752,7 @@ rstto_main_window_new (RsttoImageList *image_list, gboolean
fullscreen)
static void
rstto_main_window_image_list_iter_changed (RsttoMainWindow *window)
{
-gchar *path, *path_basename, *title, *status;
+gchar *file_basename, *title, *status;
GFile *file = NULL;
GFileInfo *file_info = NULL;
RsttoImage *cur_image;
@@ -793,21 +793,19 @@ rstto_main_window_image_list_iter_changed
(RsttoMainWindow *window)
height = rstto_image_get_height(cur_image);
-path = g_file_get_path (file);
-path_basename = g_path_get_basename (path);
+file_basename = g_file_get_basename (file);
-title = g_strdup_printf (%s - %s [%d/%d], RISTRETTO_APP_TITLE,
path_basename, position+1, count);
+title = g_strdup_printf (%s - %s [%d/%d], RISTRETTO_APP_TITLE,
file_basename, position+1, count);
if (width 0)
{
status = g_strdup_printf (%d x %d, width, height);
}
else
{
-status = g_strdup_printf (Loading '%s', path_basename);
+status = g_strdup_printf (Loading '%s', file_basename);
}
-g_free (path_basename);
-g_free (path);
+g_free (file_basename);
}
else
{
@@ -2263,8 +2261,7 @@ cb_rstto_main_window_delete (GtkWidget *widget,
RsttoMainWindow *window)
{
RsttoImage *image = rstto_image_list_iter_get_image (window-priv-iter);
GFile *file = rstto_image_get_file (image);
-gchar *path = g_file_get_path (file);
-gchar *path_basename = g_path_get_basename (path);
+gchar *file_basename = g_file_get_basename (file);
GtkWidget *dialog;
g_return_if_fail (rstto_image_list_get_n_images
(window-priv-props.image_list) 0);
@@ -2273,7 +2270,7 @@ cb_rstto_main_window_delete (GtkWidget *widget,
RsttoMainWindow *window)
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK_CANCEL,
N_(Are you sure you want to
delete image '%s' from disk?),
-path_basename);
+file_basename);
g_object_ref (image);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
@@ -2288,8 +2285,7 @@ cb_rstto_main_window_delete (GtkWidget *widget,
RsttoMainWindow *window)
}
}
gtk_widget_destroy (dialog);
-g_free (path_basename);
-g_free (path);
+g_free (file_basename);
g_object_unref (image);
}
diff --git a/src/thumbnail.c b/src/thumbnail.c
index 2438985..7c0a362 100644
--- a/src/thumbnail.c
+++ b/src/thumbnail.c
@@ -288,7 +288,7 @@ rstto_thumbnail_paint(RsttoThumbnail *thumb)
GtkWidget *
rstto_thumbnail_new (RsttoImage *image)
{
-gchar *path, *path_basename;
+gchar *file_basename;
GFile *file = NULL;
RsttoThumbnail *thumb;
@@ -301,13 +301,12 @@ rstto_thumbnail_new (RsttoImage *image)
file = rstto_image_get_file (image);
-path = g_file_get_path (file);
-path_basename = g_path_get_basename (path);
+file_basename = g_file_get_basename (file);
-gtk_widget_set_tooltip_text(GTK_WIDGET(thumb), path_basename);
+gtk_widget_set_tooltip_text(GTK_WIDGET(thumb), file_basename);
+
+g_free (file_basename);
-g_free (path_basename);
-g_free (path);
return GTK_WIDGET(thumb);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto
Updating branch refs/heads/master to bce4ed706435dda06c22388c4e2ac092d27664c4 (commit) from c5f540c66b5172560f9343d0e75da845241fffc9 (commit) commit bce4ed706435dda06c22388c4e2ac092d27664c4 Merge: c5f540c66b5172560f9343d0e75da845241fffc9 86ced18deba858df554c7d3ec83f20d0c41c8533 Author: Stephan Arts step...@xfce.org Date: Sun Aug 1 23:42:29 2010 +0200 Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto commit 86ced18deba858df554c7d3ec83f20d0c41c8533 Author: Cristian Marchi cri.pe...@gmail.com Date: Sat Jul 24 11:48:11 2010 +0200 l10n: Updated Italian (it) translation to 100% New status: 126 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit e102506338d957946409f76ed439129059df4624 Author: Per Kongstad p_kongs...@op.pl Date: Tue Jul 20 20:47:12 2010 +0200 l10n: Updated Danish (da) translation to 100% New status: 126 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 57432e599fc53832fb52094157f6eb8825880c33 Author: Sergio Marques smarque...@gmail.com Date: Fri Jul 16 20:19:13 2010 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 126 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 1ce147696207cb35ed5005b95933aa6015ff7c6e Author: Harald Servat redcr...@gmail.com Date: Fri Jul 16 18:11:02 2010 +0200 l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 126 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ca.po | 16 +--- po/da.po | 23 --- po/it.po | 23 --- po/pt.po | 14 ++ 4 files changed, 27 insertions(+), 49 deletions(-) diff --git a/po/ca.po b/po/ca.po index 2e95888..10d6522 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ # This file is distributed under the same license as the ristretto package. # Carles Muñoz Gorriz carle...@internautas.org, 2008-2010. # Harald Servat redcr...@gmail.com, 2009. -# +# msgid msgstr Project-Id-Version: ristretto\n @@ -273,9 +273,8 @@ msgid _Recently used msgstr Emprats _recentment #: ../src/main_window.c:444 -#, fuzzy msgid Recently used -msgstr Emprats _recentment +msgstr Emprats recentment #: ../src/main_window.c:531 ../src/main_window.c:827 msgid Press open to select an image @@ -471,7 +470,7 @@ msgstr Habilita la memòria cau #: ../src/preferences_dialog.c:473 msgid Enable preloading -msgstr +msgstr Activar la precàrrega #: ../src/preferences_dialog.c:535 msgid Preferences @@ -560,11 +559,9 @@ msgstr Visualitzador de fotografies Ristretto #~ msgid Preload images #~ msgstr Càrrega prèvia d'imatges -#, fuzzy #~ msgid Ristretto #~ msgstr Ristretto -#, fuzzy #~ msgid _Thumbnail Bar #~ msgstr Miniatures @@ -586,17 +583,14 @@ msgstr Visualitzador de fotografies Ristretto #~ msgid H_ide #~ msgstr _Amaga -#~ msgid -#~ One or more images have been modified, do you want to save the changes? +#~ msgid One or more images have been modified, do you want to save the changes? #~ msgstr S'ha modificat alguna imatge, voleu desar els canvis? #~ msgid Image viewer Preferences #~ msgstr Preferències del visor d'imatges #~ msgid _Preload images (GUI more responsive but more CPU-intensive) -#~ msgstr -#~ Càrrega _prèvia d'imatges (La GUI respondrà millor però emprarà més la -#~ CPU) +#~ msgstr Càrrega _prèvia d'imatges (La GUI respondrà millor però emprarà més la CPU) #~ msgid Hide the thumbnails bar during slideshow #~ msgstr Amaga les miniatures durant la seqüència d'imatges diff --git a/po/da.po b/po/da.po index eef3fb0..98d0f40 100644 --- a/po/da.po +++ b/po/da.po @@ -2,7 +2,7 @@ # Copyright (C) 2007 Stephan Arts step...@xfce.org # This file is distributed under the same license as the Ristretto package. # Per Kongstad p_kongs...@op.pl, 2008, 2009. -# +# msgid msgstr Project-Id-Version: ristretto 0.0.90\n @@ -15,8 +15,8 @@ msgstr Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n X-Poedit-Language: Danish\n -X-Poedit-Country: DENMARK\n X-Poedit-SourceCharset: utf-8\n +X-Poedit-Country: DENMARK\n #: ../src/main.c:59 msgid Version information @@ -37,8 +37,7 @@ msgid Try %s --help to see a full list of available command line options.\n msgstr %s: %s\n -Prøv %s --help for at se en fuld liste over tilgængelige -kommandolinjetilvalg.\n +Prøv %s --help for at se en fuld liste over tilgængelige kommandolinjetilvalg.\n #. File Menu #: ../src/main_window.c:266 @@ -272,9 +271,8 @@ msgid _Recently used msgstr _Senest brugte #: ../src/main_window.c:444 -#, fuzzy msgid Recently used -msgstr _Senest brugte +msgstr Senest brugte #: ../src/main_window.c:531 ../src/main_window.c:827 msgid Press
