[Xfce4-commits] thunar:master Clear mutex to avoid memleak with 2.32 api.
Updating branch refs/heads/master to 2921f6241d8e34b7ea22310b161868e84782330b (commit) from 834ed0c407016c2760d9f7cad12f6f8343f0964f (commit) commit 2921f6241d8e34b7ea22310b161868e84782330b Author: Nick Schermer n...@xfce.org Date: Sat Dec 8 11:33:50 2012 +0100 Clear mutex to avoid memleak with 2.32 api. Tiny leak, but still.. thunar/thunar-thumbnail-cache.c |4 +++- thunar/thunar-thumbnailer.c |6 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/thunar/thunar-thumbnail-cache.c b/thunar/thunar-thumbnail-cache.c index d29b475..c7ff0c8 100644 --- a/thunar/thunar-thumbnail-cache.c +++ b/thunar/thunar-thumbnail-cache.c @@ -174,8 +174,10 @@ thunar_thumbnail_cache_finalize (GObject *object) /* release the cache lock */ _thumbnail_cache_unlock (cache); -#if !GLIB_CHECK_VERSION (2, 32, 0) /* release the mutex itself */ +#if GLIB_CHECK_VERSION (2, 32, 0) + g_mutex_clear (cache-lock); +#else g_mutex_free (cache-lock); #endif #endif diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c index 8e2faaf..195dc21 100644 --- a/thunar/thunar-thumbnailer.c +++ b/thunar/thunar-thumbnailer.c @@ -320,8 +320,10 @@ thunar_thumbnailer_finalize (GObject *object) /* release the thumbnailer lock */ _thumbnailer_unlock (thumbnailer); -#if !GLIB_CHECK_VERSION (2, 32, 0) - /* release the mutex */ +/* release the mutex */ +#if GLIB_CHECK_VERSION (2, 32, 0) + g_mutex_clear (thumbnailer-lock); +#else g_mutex_free (thumbnailer-lock); #endif #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix file menu displacement after a forced update (bug #9604).
Updating branch refs/heads/master
to 8ffbf7a58f9f4d9fa2d352a8669c831a8db21cf9 (commit)
from 2921f6241d8e34b7ea22310b161868e84782330b (commit)
commit 8ffbf7a58f9f4d9fa2d352a8669c831a8db21cf9
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 8 11:57:28 2012 +0100
Fix file menu displacement after a forced update (bug #9604).
The menu position was triggered before the ui update, do
recalculate this again after the menu it updated.
thunar/thunar-launcher.c | 19 +--
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 700eaf3..10b5c46 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -1075,9 +1075,11 @@ thunar_launcher_update_idle_destroy (gpointer data)
static void
-thunar_launcher_update_check (ThunarLauncher *launcher)
+thunar_launcher_update_check (ThunarLauncher *launcher,
+ GtkWidget *menu)
{
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
+ _thunar_return_if_fail (menu == NULL || GTK_IS_MENU (menu));
/* check if the menu is in a dirty state */
if (launcher-launcher_idle_id != 0)
@@ -1090,6 +1092,11 @@ thunar_launcher_update_check (ThunarLauncher *launcher)
/* ui update */
gtk_ui_manager_ensure_update (launcher-ui_manager);
+
+ /* make sure the menu is positioned correctly after the
+ * interface update */
+ if (menu != NULL)
+gtk_menu_reposition (GTK_MENU (menu));
}
}
@@ -1108,7 +1115,7 @@ thunar_launcher_update (ThunarLauncher *launcher)
instant_update = (proxies == NULL);
for (lp = proxies; lp != NULL; lp = lp-next)
{
- menu = gtk_widget_get_toplevel (lp-data);
+ menu = gtk_widget_get_ancestor (lp-data, GTK_TYPE_MENU);
if (G_LIKELY (menu != NULL))
{
/* instant update if a menu is visible */
@@ -1328,7 +1335,7 @@ thunar_launcher_action_open (GtkAction *action,
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* force update if still dirty */
- thunar_launcher_update_check (launcher);
+ thunar_launcher_update_check (launcher, NULL);
if (!gtk_action_get_sensitive (action))
return;
@@ -1370,7 +1377,7 @@ thunar_launcher_action_open_with_other (GtkAction
*action,
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* force update if still dirty */
- thunar_launcher_update_check (launcher);
+ thunar_launcher_update_check (launcher, NULL);
if (!gtk_action_get_visible (action))
return;
@@ -1392,7 +1399,7 @@ thunar_launcher_action_open_in_new_window (GtkAction
*action,
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* force update if still dirty */
- thunar_launcher_update_check (launcher);
+ thunar_launcher_update_check (launcher, NULL);
if (!gtk_action_get_visible (action))
return;
@@ -1413,7 +1420,7 @@ thunar_launcher_action_open_in_new_tab (GtkAction
*action,
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* force update if still dirty */
- thunar_launcher_update_check (launcher);
+ thunar_launcher_update_check (launcher, NULL);
if (!gtk_action_get_visible (action))
return;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Clear 2.32 mutex memory leak.
Updating branch refs/heads/master
to 5aebd52444a0e15bb07af1fe5f54a3a5180e8cd3 (commit)
from 4255750cb05bea0e01115fd2a5f91cdff3b1d829 (commit)
commit 5aebd52444a0e15bb07af1fe5f54a3a5180e8cd3
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 8 11:32:49 2012 +0100
Clear 2.32 mutex memory leak.
tumblerd/tumbler-utils.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tumblerd/tumbler-utils.h b/tumblerd/tumbler-utils.h
index 4553de9..6d02d9d 100644
--- a/tumblerd/tumbler-utils.h
+++ b/tumblerd/tumbler-utils.h
@@ -43,7 +43,7 @@ G_BEGIN_DECLS
#if GLIB_CHECK_VERSION (2, 32, 0)
#define TUMBLER_MUTEX(mtx)GMutex mtx
-#define tumbler_mutex_free(mtx) G_STMT_START{ (void)0; }G_STMT_END
+#define tumbler_mutex_free(mtx) g_mutex_clear ((mtx))
#define tumbler_mutex_lock(mtx) g_mutex_lock ((mtx))
#define tumbler_mutex_unlock(mtx) g_mutex_unlock ((mtx))
#define tumbler_mutex_create(mtx) g_mutex_init ((mtx))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Don't abort with warnings in debug mode.
Updating branch refs/heads/master to c8ad987bcf1639909c8545efcfc7acc9dec5928b (commit) from 5aebd52444a0e15bb07af1fe5f54a3a5180e8cd3 (commit) commit c8ad987bcf1639909c8545efcfc7acc9dec5928b Author: Nick Schermer n...@xfce.org Date: Sat Dec 8 11:33:07 2012 +0100 Don't abort with warnings in debug mode. Makes debugging a bit hard, criticals is enough. tumblerd/main.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tumblerd/main.c b/tumblerd/main.c index c42989d..8ac93b8 100644 --- a/tumblerd/main.c +++ b/tumblerd/main.c @@ -76,7 +76,7 @@ main (intargc, #ifdef DEBUG /* if something doesn't work, fix your code instead! */ - g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); + g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); #endif /* set the application name. Translators: Don't translate Tumbler. */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Don't use collate to check strings.
Updating branch refs/heads/master
to ac181a2f954dce0e243eb467d3e20dcb81bca9e5 (commit)
from 27fb36bca2d3a94cd3d486bcd7117f07f1abe3d0 (commit)
commit ac181a2f954dce0e243eb467d3e20dcb81bca9e5
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 8 12:13:54 2012 +0100
Don't use collate to check strings.
Valgrind shows a lot of context errors in this
code and it makes no sence to do this because
uri are not locale strings.
plugins/xdg-cache/xdg-cache-cache.c |5 +++--
plugins/xdg-cache/xdg-cache-thumbnail.c |2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/plugins/xdg-cache/xdg-cache-cache.c
b/plugins/xdg-cache/xdg-cache-cache.c
index fb0d59a..435726e 100644
--- a/plugins/xdg-cache/xdg-cache-cache.c
+++ b/plugins/xdg-cache/xdg-cache-cache.c
@@ -640,13 +640,14 @@ xdg_cache_cache_read_thumbnail_info (const gchar
*filename,
{
if (!text_ptr[i].key)
continue;
- else if (g_utf8_collate (Thumb::URI, text_ptr[i].key)
== 0)
+
+ if (strcmp (Thumb::URI, text_ptr[i].key) == 0)
{
/* remember the Thumb::URI value */
*uri = g_strdup (text_ptr[i].text);
has_uri = TRUE;
}
- else if (g_utf8_collate (Thumb::MTime,
text_ptr[i].key) == 0)
+ else if (strcmp (Thumb::MTime, text_ptr[i].key) == 0)
{
/* remember the Thumb::MTime value */
if (text_ptr[i].text != NULL)
diff --git a/plugins/xdg-cache/xdg-cache-thumbnail.c
b/plugins/xdg-cache/xdg-cache-thumbnail.c
index 71448a8..ea6a0d8 100644
--- a/plugins/xdg-cache/xdg-cache-thumbnail.c
+++ b/plugins/xdg-cache/xdg-cache-thumbnail.c
@@ -281,7 +281,7 @@ xdg_cache_thumbnail_needs_update (TumblerThumbnail
*thumbnail,
if (cache_thumbnail-cached_mtime == 0)
return TRUE;
- return g_utf8_collate (cache_thumbnail-uri, uri) != 0
+ return strcmp (cache_thumbnail-uri, uri) != 0
|| cache_thumbnail-cached_mtime != mtime;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Plug small leak.
Updating branch refs/heads/master to 52013db8e95c5964967e06016d4ca6b91828ad8a (commit) from ac181a2f954dce0e243eb467d3e20dcb81bca9e5 (commit) commit 52013db8e95c5964967e06016d4ca6b91828ad8a Author: Nick Schermer n...@xfce.org Date: Sat Dec 8 12:20:28 2012 +0100 Plug small leak. tumblerd/tumbler-lifo-scheduler.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tumblerd/tumbler-lifo-scheduler.c b/tumblerd/tumbler-lifo-scheduler.c index 8445872..04c74d4 100644 --- a/tumblerd/tumbler-lifo-scheduler.c +++ b/tumblerd/tumbler-lifo-scheduler.c @@ -473,6 +473,7 @@ tumbler_lifo_scheduler_thread (gpointer data, tumbler_mutex_lock (scheduler-mutex); tumbler_lifo_scheduler_finish_request (scheduler, request); tumbler_mutex_unlock (scheduler-mutex); + g_list_free (missing_uris); return; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Release lifecycle manager during early exit.
Updating branch refs/heads/master
to 27fb36bca2d3a94cd3d486bcd7117f07f1abe3d0 (commit)
from c8ad987bcf1639909c8545efcfc7acc9dec5928b (commit)
commit 27fb36bca2d3a94cd3d486bcd7117f07f1abe3d0
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 8 11:49:39 2012 +0100
Release lifecycle manager during early exit.
tumblerd/main.c | 43 --
tumblerd/tumbler-lifecycle-manager.c |4 +--
2 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/tumblerd/main.c b/tumblerd/main.c
index 8ac93b8..046c13f 100644
--- a/tumblerd/main.c
+++ b/tumblerd/main.c
@@ -70,6 +70,7 @@ main (intargc,
GList *thumbnailers;
GList *lp;
GList *tp;
+ gint retval = EXIT_SUCCESS;
/* set the program name */
g_set_prgname (G_LOG_DOMAIN);
@@ -162,14 +163,9 @@ main (intargc,
error-message);
g_error_free (error);
- g_object_unref (service);
- g_object_unref (manager);
- g_object_unref (cache_service);
- g_object_unref (registry);
-
- dbus_g_connection_unref (connection);
-
- return EXIT_FAILURE;
+ /* something failed */
+ retval = EXIT_FAILURE;
+ goto exit_tumbler;
}
/* try to start the service and exit if that fails */
@@ -178,15 +174,8 @@ main (intargc,
g_warning (_(Failed to start the thumbnail cache service: %s),
error-message);
g_error_free (error);
- g_object_unref (service);
- g_object_unref (manager);
- g_object_unref (cache_service);
- g_object_unref (registry);
-
- dbus_g_connection_unref (connection);
-
/* service already running, exit gracefully to not break clients */
- return EXIT_SUCCESS;
+ goto exit_tumbler;
}
/* try to start the service and exit if that fails */
@@ -195,15 +184,8 @@ main (intargc,
g_warning (_(Failed to start the thumbnailer manager: %s),
error-message);
g_error_free (error);
- g_object_unref (service);
- g_object_unref (manager);
- g_object_unref (cache_service);
- g_object_unref (registry);
-
- dbus_g_connection_unref (connection);
-
/* service already running, exit gracefully to not break clients */
- return EXIT_SUCCESS;
+ goto exit_tumbler;
}
/* try to start the service and exit if that fails */
@@ -212,15 +194,8 @@ main (intargc,
g_warning (_(Failed to start the thumbnailer service: %s),
error-message);
g_error_free (error);
- g_object_unref (service);
- g_object_unref (manager);
- g_object_unref (cache_service);
- g_object_unref (registry);
-
- dbus_g_connection_unref (connection);
-
/* service already running, exit gracefully to not break clients */
- return EXIT_SUCCESS;
+ goto exit_tumbler;
}
/* create a new main loop */
@@ -236,6 +211,8 @@ main (intargc,
/* enter the main loop, thereby making the tumbler service available */
g_main_loop_run (main_loop);
+ exit_tumbler:
+
/* shut our services down and release all objects */
g_object_unref (service);
g_object_unref (manager);
@@ -247,5 +224,5 @@ main (intargc,
dbus_g_connection_unref (connection);
/* we're done, all fine */
- return EXIT_SUCCESS;
+ return retval;
}
diff --git a/tumblerd/tumbler-lifecycle-manager.c
b/tumblerd/tumbler-lifecycle-manager.c
index ee4ae10..4df8118 100644
--- a/tumblerd/tumbler-lifecycle-manager.c
+++ b/tumblerd/tumbler-lifecycle-manager.c
@@ -115,11 +115,9 @@ tumbler_lifecycle_manager_init (TumblerLifecycleManager
*manager)
static void
tumbler_lifecycle_manager_finalize (GObject *object)
{
-#if !GLIB_CHECK_VERSION (2, 32, 0)
TumblerLifecycleManager *manager = TUMBLER_LIFECYCLE_MANAGER (object);
-#endif
- tumbler_mutex_free (TUMBLER_LIFECYCLE_MANAGER (object)-lock);
+ tumbler_mutex_free (manager-lock);
(*G_OBJECT_CLASS (tumbler_lifecycle_manager_parent_class)-finalize)
(object);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Set 10 seconds timeout on app_normal and tab_special tests
Updating branch refs/heads/master
to 74885402f324eef93a34f725c884a63cbcbc5a02 (commit)
from 6f8c01c367e15b188289c94320015a6cd019ba79 (commit)
commit 74885402f324eef93a34f725c884a63cbcbc5a02
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Dec 8 13:13:22 2012 +0100
Set 10 seconds timeout on app_normal and tab_special tests
These tests tend to hang indefinitely in rare conditions.
tests/app.vala | 10 --
tests/extensions.c |8
tests/tab.vala |6 +-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/tests/app.vala b/tests/app.vala
index bad74b8..774721a 100644
--- a/tests/app.vala
+++ b/tests/app.vala
@@ -10,6 +10,9 @@
*/
void app_normal () {
+uint test_timeout = GLib.Timeout.add_seconds (10, ()={
+stdout.printf (Timed out\n); Process.exit (0); return false; });
+
Midori.Test.idle_timeouts ();
Midori.Test.log_set_fatal_handler_for_icons ();
Midori.Paths.Test.reset_runtime_mode ();
@@ -22,9 +25,12 @@ void app_normal () {
do { loop.iteration (true); } while (loop.pending ());
}
Midori.normal_app_on_quit (app);
+for (var i = 0 ; i 7; i++) {
+app.settings.maximum_cache_size++;
+do { loop.iteration (true); } while (loop.pending ());
+}
-string filename = Midori.Paths.get_extension_config_dir (adblock);
-assert (Posix.access (filename, Posix.F_OK) == 0);
+GLib.Source.remove (test_timeout);
}
void app_custom_config () {
diff --git a/tests/extensions.c b/tests/extensions.c
index 0489ae6..5bf886f 100644
--- a/tests/extensions.c
+++ b/tests/extensions.c
@@ -190,6 +190,13 @@ extension_load (const gchar* extension_path,
}
}
+static void
+extension_config (void)
+{
+gchar* filename = midori_paths_get_extension_config_dir (adblock);
+g_assert (g_access (filename, F_OK) == 0);
+}
+
int
main (intargc,
char** argv)
@@ -202,6 +209,7 @@ main (intargc,
g_test_add_func (/extensions/create, extension_create);
g_test_add_func (/extensions/settings, extension_settings);
+g_test_add_func (/extensions/config, extension_config);
if (g_module_supported ())
{
diff --git a/tests/tab.vala b/tests/tab.vala
index 1b63761..58a0732 100644
--- a/tests/tab.vala
+++ b/tests/tab.vala
@@ -76,8 +76,10 @@ static void tab_display_ellipsize () {
}
void tab_special () {
-Midori.Test.log_set_fatal_handler_for_icons ();
+uint test_timeout = GLib.Timeout.add_seconds (10, ()={
+stdout.printf (Timed out\n); Process.exit (0); return false; });
+Midori.Test.log_set_fatal_handler_for_icons ();
var test_address = new Soup.Address (127.0.0.1, Soup.ADDRESS_ANY_PORT);
test_address.resolve_sync (null);
var test_server = new Soup.Server (interface, test_address, null);
@@ -164,6 +166,8 @@ void tab_special () {
browser.activate_action (TabMoveBackward);
browser.activate_action (TabDuplicate);
browser.activate_action (TabCloseOther);
+
+GLib.Source.remove (test_timeout);
}
void tab_download_dialog () {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Require Granite 0.2 due to dynamic notebook and API changes
Updating branch refs/heads/master
to 6f8c01c367e15b188289c94320015a6cd019ba79 (commit)
from c68a42bb658199a48710b5f276a409bfd5e756e5 (commit)
commit 6f8c01c367e15b188289c94320015a6cd019ba79
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Dec 8 13:12:45 2012 +0100
Require Granite 0.2 due to dynamic notebook and API changes
README |2 +-
wscript |5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/README b/README
index cc78dc9..c9cbc2c 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ Midori is a lightweight web browser.
Requirements: GLib 2.22, GTK+ 2.16, WebkitGTK+ 1.1.17, libXML2,
libsoup 2.27.90, sqlite 3.0, Vala 0.14
-Optional: GTK+ 3.0, Unique 0.9, libnotify, gcr
+Optional: GTK+ 3.0, Unique 0.9, libnotify, gcr, Granite 0.2
For installation instructions read INSTALL.
diff --git a/wscript b/wscript
index dee3705..7ea9ca1 100644
--- a/wscript
+++ b/wscript
@@ -228,7 +228,7 @@ def configure (conf):
else:
granite = 'no (requires --enable-gtk3)'
else:
-check_pkg ('granite', '0.1', mandatory=False)
+check_pkg ('granite', '0.2', mandatory=False)
granite = ['N/A', 'yes'][conf.env['HAVE_GRANITE'] == 1]
if granite != 'yes':
option_checkfatal ('granite', 'new notebook, pop-overs')
@@ -247,7 +247,6 @@ def configure (conf):
conf.check (lib='m')
check_pkg ('gmodule-2.0')
-check_pkg ('gthread-2.0')
check_pkg ('gio-2.0', '2.22.0')
if check_version (conf.env['GIO_VERSION'], 2, 30, 0) \
and check_version (conf.env['VALAC_VERSION'], 0, 16, 0):
@@ -421,7 +420,7 @@ def set_options (opt):
add_enable_option ('libnotify', 'notification support', group)
add_enable_option ('granite', 'new notebook, pop-overs', group)
add_enable_option ('addons', 'building of extensions', group)
-add_enable_option ('tests', 'building of tests', group, disable=True)
+add_enable_option ('tests', 'install tests', group, disable=True)
add_enable_option ('gtk3', 'GTK+3 and WebKitGTK+3 support', group,
disable=True)
add_enable_option ('zeitgeist', 'Zeitgeist history integration', group,
disable=is_win32 (os.environ))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Add TabMoveFirst/Last hotkeys on Ctrl+Shift+Home/End
Updating branch refs/heads/master
to cb9900d237be9ee9310c0b69e61606cce88d740c (commit)
from 74885402f324eef93a34f725c884a63cbcbc5a02 (commit)
commit cb9900d237be9ee9310c0b69e61606cce88d740c
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Dec 8 13:41:38 2012 +0100
Add TabMoveFirst/Last hotkeys on Ctrl+Shift+Home/End
midori/midori-browser.c | 56 +-
tests/app.vala |2 +-
tests/tab.vala |4 ++-
3 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0d5ff7a..6102b03 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4515,37 +4515,35 @@ _action_inspect_page_activate (GtkAction* action,
}
static void
-_action_tab_move_backward_activate (GtkAction* action,
-MidoriBrowser* browser)
+_action_tab_move_activate (GtkAction* action,
+ MidoriBrowser* browser)
{
+const gchar* name = gtk_action_get_name (action);
gint new_pos;
gint cur_pos = midori_browser_get_current_page (browser);
GtkWidget* widget = midori_browser_get_nth_tab (browser, cur_pos);
-if (cur_pos 0)
-new_pos = cur_pos - 1;
-else
-new_pos = midori_browser_get_n_pages (browser) - 1;
-#ifdef HAVE_GRANITE
-granite_widgets_dynamic_notebook_set_tab_position (
-GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser-notebook),
-midori_view_get_tab (MIDORI_VIEW (widget)), new_pos);
-#else
-gtk_notebook_reorder_child (GTK_NOTEBOOK (browser-notebook), widget,
new_pos);
-#endif
-g_signal_emit (browser, signals[MOVE_TAB], 0, browser-notebook, cur_pos,
new_pos);
-}
-static void
-_action_tab_move_forward_activate (GtkAction* action,
- MidoriBrowser* browser)
-{
-gint new_pos;
-gint cur_pos = midori_browser_get_current_page (browser);
-GtkWidget* widget = midori_browser_get_nth_tab (browser, cur_pos);
-if (cur_pos == (midori_browser_get_n_pages (browser) - 1))
+if (!strcmp (name, TabMoveFirst))
new_pos = 0;
+else if (!strcmp (name, TabMoveBackward))
+{
+if (cur_pos 0)
+new_pos = cur_pos - 1;
+else
+new_pos = midori_browser_get_n_pages (browser) - 1;
+}
+else if (!strcmp (name, TabMoveForward))
+{
+if (cur_pos == (midori_browser_get_n_pages (browser) - 1))
+new_pos = 0;
+else
+new_pos = cur_pos + 1;
+}
+else if (!strcmp (name, TabMoveLast))
+new_pos = midori_browser_get_n_pages (browser) - 1;
else
-new_pos = cur_pos + 1;
+g_assert_not_reached ();
+
#ifdef HAVE_GRANITE
granite_widgets_dynamic_notebook_set_tab_position (
GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser-notebook),
@@ -5349,10 +5347,14 @@ static const GtkActionEntry entries[] =
{ TabNext, GTK_STOCK_GO_FORWARD,
N_(_Next Tab), CtrlPage_Down,
NULL, G_CALLBACK (_action_tab_next_activate) },
+{ TabMoveFirst, NULL, N_(Move Tab to _first position),
CtrlShiftHome,
+ NULL, G_CALLBACK (_action_tab_move_activate) },
{ TabMoveBackward, NULL, N_(Move Tab _Backward),
CtrlShiftPage_Up,
- NULL, G_CALLBACK (_action_tab_move_backward_activate) },
+ NULL, G_CALLBACK (_action_tab_move_activate) },
{ TabMoveForward, NULL, N_(_Move Tab Forward),
CtrlShiftPage_Down,
- NULL, G_CALLBACK (_action_tab_move_forward_activate) },
+ NULL, G_CALLBACK (_action_tab_move_activate) },
+{ TabMoveLast, NULL, N_(Move Tab to _last position),
CtrlShiftEnd,
+ NULL, G_CALLBACK (_action_tab_move_activate) },
{ TabCurrent, NULL,
N_(Focus _Current Tab), CtrlAltHome,
NULL, G_CALLBACK (_action_tab_current_activate) },
@@ -5689,8 +5691,10 @@ static const gchar* ui_markup =
*somewhere* in the UI definition */
/* These also show up in Unity's HUD */
menu action='Dummy'
+menuitem action='TabMoveFirst'/
menuitem action='TabMoveBackward'/
menuitem action='TabMoveForward'/
+menuitem action='TabMoveLast'/
menuitem action='ScrollLeft'/
menuitem action='ScrollDown'/
menuitem action='ScrollUp'/
diff --git a/tests/app.vala b/tests/app.vala
index 774721a..d6b9234 100644
--- a/tests/app.vala
+++ b/tests/app.vala
@@ -11,7 +11,7 @@
void app_normal () {
uint test_timeout = GLib.Timeout.add_seconds (10, ()={
-stdout.printf (Timed out\n); Process.exit (0); return false; });
+stdout.printf (Timed out\n); Process.exit (0); });
Midori.Test.idle_timeouts ();
Midori.Test.log_set_fatal_handler_for_icons ();
diff --git a/tests/tab.vala b/tests/tab.vala
index 58a0732..da3c210 100644
--- a/tests/tab.vala
+++ b/tests/tab.vala
@@ -77,7 +77,7 @@ static void tab_display_ellipsize
[Xfce4-commits] midori:master Refactor test timeout as grab_max_timeout, try wakeup first
Updating branch refs/heads/master
to 22f6ef50d24d2a8edfef411161a13bdba8f68d8b (commit)
from cb9900d237be9ee9310c0b69e61606cce88d740c (commit)
commit 22f6ef50d24d2a8edfef411161a13bdba8f68d8b
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Dec 8 15:30:40 2012 +0100
Refactor test timeout as grab_max_timeout, try wakeup first
midori/midori-dialog.vala | 20
tests/app.vala| 13 ++---
tests/tab.vala|6 ++
wscript |1 +
4 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/midori/midori-dialog.vala b/midori/midori-dialog.vala
index d8c7146..a03d80d 100644
--- a/midori/midori-dialog.vala
+++ b/midori/midori-dialog.vala
@@ -24,6 +24,26 @@ namespace Midori {
}
namespace Test {
+internal static uint test_max_timeout = 0;
+internal static string? test_first_try = null;
+public void grab_max_timeout () {
+test_first_try = once;
+test_max_timeout = GLib.Timeout.add_seconds (3, ()={
+stdout.printf (Timed out %s%s\n, test_first_try,
+MainContext.default ().pending () ? (loop) : );
+if (test_first_try == twice)
+Process.exit (0);
+test_first_try = twice;
+MainContext.default ().wakeup ();
+return true;
+});
+}
+public void release_max_timeout () {
+assert (test_max_timeout 0);
+GLib.Source.remove (test_max_timeout);
+test_max_timeout = 0;
+}
+
internal static bool test_idle_timeouts = false;
public void idle_timeouts () {
test_idle_timeouts = true;
diff --git a/tests/app.vala b/tests/app.vala
index d6b9234..0ded6b0 100644
--- a/tests/app.vala
+++ b/tests/app.vala
@@ -10,8 +10,7 @@
*/
void app_normal () {
-uint test_timeout = GLib.Timeout.add_seconds (10, ()={
-stdout.printf (Timed out\n); Process.exit (0); });
+Midori.Test.grab_max_timeout ();
Midori.Test.idle_timeouts ();
Midori.Test.log_set_fatal_handler_for_icons ();
@@ -30,18 +29,16 @@ void app_normal () {
do { loop.iteration (true); } while (loop.pending ());
}
-GLib.Source.remove (test_timeout);
+Midori.Test.release_max_timeout ();
}
void app_custom_config () {
Midori.Test.log_set_fatal_handler_for_icons ();
-/*
Midori.Paths.Test.reset_runtime_mode ();
var app = Midori.normal_app_new (/tmp/mylittlepony, false, false, null,
null, null, -1, null);
var loop = MainContext.default ();
do { loop.iteration (true); } while (loop.pending ());
Midori.normal_app_on_quit (app);
-*/
}
void app_private () {
Midori.Test.log_set_fatal_handler_for_icons ();
@@ -59,7 +56,8 @@ void app_web () {
}
void app_extensions () {
-/*
+Midori.Test.grab_max_timeout ();
+
Midori.Test.idle_timeouts ();
Midori.Test.log_set_fatal_handler_for_icons ();
Midori.Paths.Test.reset_runtime_mode ();
@@ -72,7 +70,8 @@ void app_extensions () {
app.browser.close_tab (tab);
do { loop.iteration (true); } while (loop.pending ());
}
-*/
+
+Midori.Test.release_max_timeout ();
}
void main (string[] args) {
diff --git a/tests/tab.vala b/tests/tab.vala
index da3c210..b117641 100644
--- a/tests/tab.vala
+++ b/tests/tab.vala
@@ -76,9 +76,7 @@ static void tab_display_ellipsize () {
}
void tab_special () {
-uint test_timeout = GLib.Timeout.add_seconds (10, ()={
-stdout.printf (Timed out\n); Process.exit (0); });
-
+Midori.Test.grab_max_timeout ();
Midori.Test.log_set_fatal_handler_for_icons ();
var test_address = new Soup.Address (127.0.0.1, Soup.ADDRESS_ANY_PORT);
test_address.resolve_sync (null);
@@ -169,7 +167,7 @@ void tab_special () {
browser.activate_action (TabDuplicate);
browser.activate_action (TabCloseOther);
-GLib.Source.remove (test_timeout);
+Midori.Test.release_max_timeout ();
}
void tab_download_dialog () {
diff --git a/wscript b/wscript
index 7ea9ca1..ee10a0b 100644
--- a/wscript
+++ b/wscript
@@ -577,6 +577,7 @@ def shutdown ():
Utils.check_dir (os.environ[x])
# Avoid i18n-related false failures
os.environ['LC_ALL'] = 'C'
+os.environ['UNIQUE_BACKEND'] = 'bacon'
test = UnitTest.unit_test ()
if True:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-screenshooter:master Fix comment.
Updating branch refs/heads/master
to 7440ccd48d5426a36cfcd2359e8e2bad610e8170 (commit)
from 3770205bbe16d49825b3e0ce8429cf5c3a106d0e (commit)
commit 7440ccd48d5426a36cfcd2359e8e2bad610e8170
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sat Dec 8 16:00:34 2012 +0100
Fix comment.
src/main.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main.c b/src/main.c
index a0759fb..b503af9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -344,7 +344,7 @@ int main (int argc, char **argv)
{
GtkWidget *dialog;
- /* Use 0 as the minimal delay */
+ /* Use 1 as the minimal delay, 0 may show corrupted windows */
if (sd-delay == 0)
sd-delay = 1;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-screenshooter:master Increase transparency of selection background (bug #9592).
Updating branch refs/heads/master
to 0b22517f1ea788ba5b71872e980034051921ab0e (commit)
from 7440ccd48d5426a36cfcd2359e8e2bad610e8170 (commit)
commit 0b22517f1ea788ba5b71872e980034051921ab0e
Author: Sergio Cipolla secipo...@gmail.com
Date: Thu Dec 6 07:54:51 2012 -0200
Increase transparency of selection background (bug #9592).
lib/screenshooter-capture.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/screenshooter-capture.c b/lib/screenshooter-capture.c
index 52f7b5c..92e6f1b 100644
--- a/lib/screenshooter-capture.c
+++ b/lib/screenshooter-capture.c
@@ -523,7 +523,7 @@ static gboolean cb_expose (GtkWidget *widget,
for (i = 0; i n_rects; ++i)
{
/* Restore the transparent background */
- cairo_set_source_rgba (cr, 0, 0, 0, 0.8);
+ cairo_set_source_rgba (cr, 0, 0, 0, 0.4);
gdk_cairo_rectangle (cr, rects[i]);
cairo_fill (cr);
@@ -548,7 +548,7 @@ static gboolean cb_expose (GtkWidget *widget,
/* Draw the transparent background */
cr = gdk_cairo_create (GDK_DRAWABLE (widget-window));
- cairo_set_source_rgba (cr, 0, 0, 0, 0.8);
+ cairo_set_source_rgba (cr, 0, 0, 0, 0.4);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
for (i = 0; i n_rects; ++i)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-notifyd:master Fix integer wrap-around for short timeouts (bug #8580)
Updating branch refs/heads/master
to efafaeeb4d0b0a0c479bae3601716a78cdd8f2af (commit)
from 51cf55929933fa58c3439dc52e0e293f80bd8f21 (commit)
commit efafaeeb4d0b0a0c479bae3601716a78cdd8f2af
Author: Alec Moskvin al...@gmx.com
Date: Mon Jun 11 12:15:56 2012 -0400
Fix integer wrap-around for short timeouts (bug #8580)
xfce4-notifyd/xfce-notify-window.c | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/xfce4-notifyd/xfce-notify-window.c
b/xfce4-notifyd/xfce-notify-window.c
index 8364d7a..6df2512 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -268,6 +268,7 @@ xfce_notify_window_start_expiration(XfceNotifyWindow
*window)
{
if(window-expire_timeout) {
GTimeVal ct;
+guint timeout;
gboolean fade_transparent;
g_get_current_time(ct);
@@ -275,10 +276,15 @@ xfce_notify_window_start_expiration(XfceNotifyWindow
*window)
fade_transparent =
gdk_screen_is_composited(gtk_window_get_screen(GTK_WINDOW
(window)));
+if(!fade_transparent)
+timeout = window-expire_timeout;
+else if(window-expire_timeout FADE_TIME)
+timeout = window-expire_timeout - FADE_TIME;
+else
+timeout = FADE_TIME;
+
window-expire_start_timestamp = ct.tv_sec * 1000 + ct.tv_usec / 1000;
-window-expire_id = g_timeout_add(fade_transparent
- ? window-expire_timeout - FADE_TIME
- : window-expire_timeout,
+window-expire_id = g_timeout_add(timeout,
xfce_notify_window_expire_timeout,
window);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-notifyd:master Update NEWS.
Updating branch refs/heads/master to a27059e3198ab3b4bd92dd60e5ed44779a956e25 (commit) from efafaeeb4d0b0a0c479bae3601716a78cdd8f2af (commit) commit a27059e3198ab3b4bd92dd60e5ed44779a956e25 Author: Jérôme Guelfucci jero...@xfce.org Date: Sat Dec 8 16:28:37 2012 +0100 Update NEWS. NEWS |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index e4c6406..9c0c2e4 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,8 @@ Version 0.2.3git: * Fix notifications not disappearing after clicking an action button. +* Add a category to the settings dialog for Xfce4 Settings Manager. +* Handle timeout correctly when smaller than fading time (bug #8580). Version 0.2.2 (06 August 2011): ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-notifyd:master Parse body with g_markup_escape_text (bug #7773, #8187).
Updating branch refs/heads/master
to a5f0108f7a1dd679338cd5cc185169b86955592d (commit)
from a27059e3198ab3b4bd92dd60e5ed44779a956e25 (commit)
commit a5f0108f7a1dd679338cd5cc185169b86955592d
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sat Dec 8 18:01:50 2012 +0100
Parse body with g_markup_escape_text (bug #7773, #8187).
NEWS |3 +
xfce4-notifyd/xfce-notify-window.c | 164 +---
2 files changed, 4 insertions(+), 163 deletions(-)
diff --git a/NEWS b/NEWS
index 9c0c2e4..743b4b8 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ Version 0.2.3git:
* Fix notifications not disappearing after clicking an action button.
* Add a category to the settings dialog for Xfce4 Settings Manager.
* Handle timeout correctly when smaller than fading time (bug #8580).
+* Parse body with g_markup_escape_text which allows us to handle
+ span attributes missused by some clients and to parse strings with
+ unusual caracters such as (bug #7773, #8187).
Version 0.2.2 (06 August 2011):
diff --git a/xfce4-notifyd/xfce-notify-window.c
b/xfce4-notifyd/xfce-notify-window.c
index 6df2512..496c08f 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -751,168 +751,6 @@ elem_to_string(gconstpointer elem_p)
}
}
-static gchar *
-xfce_notify_window_validate_escape_markup(const gchar *str)
-{
-GString *gstr;
-const gchar *p;
-GQueue *open_elems;
-gconstpointer tmp;
-
-if(!str)
-return NULL;
-
-open_elems = g_queue_new();
-gstr = g_string_sized_new(strlen(str));
-p = str;
-
-while(*p) {
-if('' == *p) {
-if('b' == *(p+1) '' == *(p+2)) {
-g_queue_push_head(open_elems, ELEM_B);
-g_string_append(gstr, b);
-p += 3;
-} else if('i' == *(p+1) '' == *(p+2)) {
-g_queue_push_head(open_elems, ELEM_I);
-g_string_append(gstr, i);
-p += 3;
-} else if('u' == *(p+1) '' == *(p+2)) {
-g_queue_push_head(open_elems, ELEM_U);
-g_string_append(gstr, u);
-p += 3;
-} else if('a' == *(p+1) ' ' == *(p+2)) {
-gchar *aend;
-
-g_queue_push_head(open_elems, ELEM_A);
-
-aend = strchr(p+3, '');
-if(!aend) {
-g_warning(Bad markup in a: %s, str);
-goto out_err;
-}
-#if GTK_CHECK_VERSION(2,16,0)
-/* only support links with gtk 2.16 */
-g_string_append_len(gstr, p, aend - p + 1);
-#endif
-p = aend + 1;
-} else if(!strncmp(p+1, img , 4)) {
-/* don't currently support images; extract alt text
- * if available */
-gchar *imgend, *altbegin, *altend = NULL;
-
-altbegin = strstr(p+5, alt=\);
-if(altbegin) {
-altbegin += 5;
-altend = strchr(altbegin, '');
-if(!altend) {
-g_warning(End of img alt text not found);
-goto out_err;
-}
-}
-
-imgend = strstr(altend ? altend+1 : p+4, /);
-if(!imgend) {
-g_warning(Unclosed img tag);
-goto out_err;
-}
-
-if(altbegin) {
-/* put the alt text in the label */
-g_string_append_c(gstr, '[');
-g_string_append(gstr, _(image: ));
-p = altbegin;
-while(p altend) {
-if(*p == '')
-g_string_append(gstr, lt;);
-else if(*p == '')
-g_string_append(gstr, gt;);
-else if(*p == '')
-g_string_append(gstr, amp;);
-else
-g_string_append_c(gstr, *p);
-p++;
-}
-g_string_append_c(gstr, ']');
-}
-
-p = imgend + 2;
-} else if('/' == *(p+1)) {
-if('b' == *(p+2) '' == *(p+3)) {
-tmp = g_queue_pop_head(open_elems);
-if(tmp != ELEM_B) {
-g_warning(Bad markup: closing b when %s expected,
- elem_to_string(tmp));
-goto out_err;
-}
-g_string_append(gstr, /b);
-p += 4;
-} else if('i' == *(p+2) '' == *(p+3)) {
-tmp = g_queue_pop_head(open_elems);
-if(tmp != ELEM_I) {
-g_warning(Bad markup:
[Xfce4-commits] xfce4-notifyd:master Add comment for translators.
Updating branch refs/heads/master
to 40c95620f657259bdcc37ae49fc4943a620d06fa (commit)
from a5f0108f7a1dd679338cd5cc185169b86955592d (commit)
commit 40c95620f657259bdcc37ae49fc4943a620d06fa
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sat Dec 8 18:17:15 2012 +0100
Add comment for translators.
xfce4-notifyd-config/main.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c
index 6ad623c..13bba2d 100644
--- a/xfce4-notifyd-config/main.c
+++ b/xfce4-notifyd-config/main.c
@@ -117,6 +117,8 @@ xfce4_notifyd_config_theme_changed(XfconfChannel *channel,
g_free(theme);
xfce4_notifyd_config_kill_daemon();
+/* TRANSLATORS: notify-send is a command name in the following
string,
+ * it must not be translated. */
if(!g_spawn_command_line_async(_(notify-send \Notification
Preview\
\This is how notifications
will look like\),
error)) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Rotate jpeg thumbnails (bug #6730).
Updating branch refs/heads/master
to 4e2cc92682b3f741ef577be96cc7283028b98061 (commit)
from 52013db8e95c5964967e06016d4ca6b91828ad8a (commit)
commit 4e2cc92682b3f741ef577be96cc7283028b98061
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 8 18:20:25 2012 +0100
Rotate jpeg thumbnails (bug #6730).
Rotate the embedded thumbnails retreived from the exif data.
plugins/jpeg-thumbnailer/jpeg-thumbnailer.c | 97 --
1 files changed, 89 insertions(+), 8 deletions(-)
diff --git a/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
b/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
index 7a0a67e..1bfdc3c 100644
--- a/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
+++ b/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
@@ -384,6 +384,7 @@ typedef struct
{
guint length;
guint offset;
+ guint orientation;
} thumb_jpeg;
struct /* thumbnail TIFF */
{
@@ -520,6 +521,17 @@ tvtj_exif_parse_ifd (TvtjExif *exif,
exif-thumb.thumb_jpeg.length = value;
}
}
+ else if (tag == 0x112)
+{
+ /* verify that we have a 2-byte integer (format 3) */
+ if (tvtj_exif_get_ushort (exif, ifd_ptr + 2) == 3
+ tvtj_exif_get_ulong (exif, ifd_ptr + 4) == 1)
+{
+ /* determine the orientation value */
+ value = tvtj_exif_get_ushort (exif, ifd_ptr + 8);
+ exif-thumb.thumb_jpeg.orientation = MIN (value, 8);
+}
+}
}
/* check for link to next IFD */
@@ -533,13 +545,73 @@ tvtj_exif_parse_ifd (TvtjExif *exif,
+static GdkPixbuf *
+tvtj_rotate_pixbuf (GdkPixbuf *src,
+guint orientation)
+{
+ GdkPixbuf *dest = NULL;
+ GdkPixbuf *temp;
+
+ g_return_val_if_fail (GDK_IS_PIXBUF (src), NULL);
+
+ switch (orientation)
+{
+case 1:
+ dest = g_object_ref (src);
+ break;
+
+case 2:
+ dest = gdk_pixbuf_flip (src, TRUE);
+ break;
+
+case 3:
+ dest = gdk_pixbuf_rotate_simple (src, GDK_PIXBUF_ROTATE_UPSIDEDOWN);
+ break;
+
+case 4:
+ dest = gdk_pixbuf_flip (src, FALSE);
+ break;
+
+case 5:
+ temp = gdk_pixbuf_rotate_simple (src, GDK_PIXBUF_ROTATE_CLOCKWISE);
+ dest = gdk_pixbuf_flip (temp, TRUE);
+ g_object_unref (temp);
+ break;
+
+case 6:
+ dest = gdk_pixbuf_rotate_simple (src, GDK_PIXBUF_ROTATE_CLOCKWISE);
+ break;
+
+case 7:
+ temp = gdk_pixbuf_rotate_simple (src, GDK_PIXBUF_ROTATE_CLOCKWISE);
+ dest = gdk_pixbuf_flip (temp, FALSE);
+ g_object_unref (temp);
+ break;
+
+case 8:
+ dest = gdk_pixbuf_rotate_simple (src,
GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE);
+ break;
+
+default:
+ /* if no orientation tag was present */
+ dest = g_object_ref (src);
+ break;
+}
+
+ return dest;
+}
+
+
+
static GdkPixbuf*
tvtj_exif_extract_thumbnail (const guchar *data,
guint length,
gint size)
{
- TvtjExif exif;
- guintoffset;
+ TvtjExif exif;
+ guint offset;
+ GdkPixbuf *thumb = NULL;
+ GdkPixbuf *rotated;
/* make sure we have enough data */
if (G_UNLIKELY (length 6 + 8))
@@ -587,7 +659,7 @@ tvtj_exif_extract_thumbnail (const guchar *data,
exif.thumb.thumb_jpeg.offset + exif.thumb.thumb_jpeg.length
= length)
{
/* try to load the embedded thumbnail JPEG */
- return tvtj_jpeg_load (data + exif.thumb.thumb_jpeg.offset,
exif.thumb.thumb_jpeg.length, size);
+ thumb = tvtj_jpeg_load (data + exif.thumb.thumb_jpeg.offset,
exif.thumb.thumb_jpeg.length, size);
}
}
else if (exif.thumb_compression == 1) /* Uncompressed */
@@ -599,15 +671,24 @@ tvtj_exif_extract_thumbnail (const guchar *data,
exif.thumb.thumb_tiff.height * exif.thumb.thumb_tiff.width ==
exif.thumb.thumb_tiff.length)
{
/* plain RGB data, just what we need for a GdkPixbuf */
- return gdk_pixbuf_new_from_data (g_memdup (data +
exif.thumb.thumb_tiff.offset, exif.thumb.thumb_tiff.length),
- GDK_COLORSPACE_RGB, FALSE, 8,
exif.thumb.thumb_tiff.width,
- exif.thumb.thumb_tiff.height,
exif.thumb.thumb_tiff.width,
- (GdkPixbufDestroyNotify)
g_free, NULL);
+ thumb = gdk_pixbuf_new_from_data (g_memdup (data +
exif.thumb.thumb_tiff.offset, exif.thumb.thumb_tiff.length),
+GDK_COLORSPACE_RGB, FALSE, 8,
exif.thumb.thumb_tiff.width,
+exif.thumb.thumb_tiff.height,
exif.thumb.thumb_tiff.width,
+(GdkPixbufDestroyNotify)
g_free, NULL);
}
[Xfce4-commits] tumbler:master Add support for MPEG2 transport streams (bug #7421).
Updating branch refs/heads/master
to 237528f3831ddcf168da959bb5df3b00f3121287 (commit)
from 4e2cc92682b3f741ef577be96cc7283028b98061 (commit)
commit 237528f3831ddcf168da959bb5df3b00f3121287
Author: Mathias Brodala i...@noctus.net
Date: Sat Dec 8 18:37:21 2012 +0100
Add support for MPEG2 transport streams (bug #7421).
.../ffmpeg-thumbnailer-provider.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
index 02389b8..b76adee 100644
--- a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
+++ b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
@@ -105,6 +105,7 @@ ffmpeg_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provid
{
video/jpeg,
video/mp4,
+video/mp2t,
video/mpeg,
video/quicktime,
video/x-ms-asf,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Disable http and cdda schemes as well.
Updating branch refs/heads/master
to df93ffb651100b18ec2896ae2f7d995ddcf155f6 (commit)
from 237528f3831ddcf168da959bb5df3b00f3121287 (commit)
commit df93ffb651100b18ec2896ae2f7d995ddcf155f6
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 8 18:46:41 2012 +0100
Disable http and cdda schemes as well.
tumbler/tumbler-util.c | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tumbler/tumbler-util.c b/tumbler/tumbler-util.c
index b601364..bb36be4 100644
--- a/tumbler/tumbler-util.c
+++ b/tumbler/tumbler-util.c
@@ -61,10 +61,12 @@ tumbler_util_get_supported_uri_schemes (void)
for (i = 0; vfs_schemes[i] != NULL; ++i)
{
/* skip unneeded schemes */
- if (strcmp (file, vfs_schemes[i]) != 0
- strcmp (computer, vfs_schemes[i]) != 0
- strcmp (localtest, vfs_schemes[i]) != 0
- strcmp (network, vfs_schemes[i]) != 0)
+ if (strcmp (file, vfs_schemes[i]) != 0 /* always first
scheme */
+ strcmp (computer, vfs_schemes[i]) != 0 /* only devices
here */
+ strcmp (localtest, vfs_schemes[i]) != 0 /* test fs */
+ strcmp (http, vfs_schemes[i]) != 0 /* not a fs you can
browse */
+ strcmp (cdda, vfs_schemes[i]) != 0 /* audio cds */
+ strcmp (network, vfs_schemes[i]) != 0) /* only to list
remotes, not files */
uri_schemes[n++] = g_strdup (vfs_schemes[i]);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master New gstreamer thumbnailer based on totem-thumbnailer.
Updating branch refs/heads/master
to 27c1d836b6e14083fe6c4e0da0255a3ead40eb31 (commit)
from df93ffb651100b18ec2896ae2f7d995ddcf155f6 (commit)
commit 27c1d836b6e14083fe6c4e0da0255a3ead40eb31
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 8 22:55:16 2012 +0100
New gstreamer thumbnailer based on totem-thumbnailer.
Better code that should fix most of the existing bugs
in the bug tracker. Improved cancellation and handling
of aborted streams.
Also depend on gstreamer-1.0.
acinclude.m4 |2 +-
plugins/gst-thumbnailer/Makefile.am |4 +-
plugins/gst-thumbnailer/gst-helper.c | 194 -
plugins/gst-thumbnailer/gst-helper.h | 37 --
plugins/gst-thumbnailer/gst-thumbnailer.c | 673 +++--
5 files changed, 451 insertions(+), 459 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 9841563..e84b8c3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -158,7 +158,7 @@ if test x$ac_tumbler_gstreamer_thumbnailer = xyes; then
PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 = 2.14],
[
dnl Check for libgstreamerthumbnailer
-PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10], [],
[ac_tumbler_gstreamer_thumbnailer=no])
+PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], [],
[ac_tumbler_gstreamer_thumbnailer=no])
], [ac_tumbler_gstreamer_thumbnailer=no])
fi
diff --git a/plugins/gst-thumbnailer/Makefile.am
b/plugins/gst-thumbnailer/Makefile.am
index a4d2ac1..87c33c3 100644
--- a/plugins/gst-thumbnailer/Makefile.am
+++ b/plugins/gst-thumbnailer/Makefile.am
@@ -28,9 +28,7 @@ tumbler_gst_thumbnailer_la_SOURCES =
\
gst-thumbnailer-provider.c \
gst-thumbnailer-provider.h \
gst-thumbnailer.c \
- gst-thumbnailer.h \
- gst-helper.c\
- gst-helper.h
+ gst-thumbnailer.h
tumbler_gst_thumbnailer_la_CFLAGS =\
-I$(top_builddir) \
diff --git a/plugins/gst-thumbnailer/gst-helper.c
b/plugins/gst-thumbnailer/gst-helper.c
deleted file mode 100644
index eab8185..000
--- a/plugins/gst-thumbnailer/gst-helper.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* vi:set et ai sw=2 sts=2 ts=2: */
-/*
- * Originally from Bickley - a meta data management framework.
- * Copyright © 2008, 2011 Intel Corporation.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include config.h
-#include string.h
-
-#include gdk-pixbuf/gdk-pixbuf.h
-#include gst/gst.h
-#include tumbler/tumbler.h
-#include gst-helper.h
-
-static void
-push_buffer (GstElement *element,
- GstBuffer *out_buffer,
- GstPad *pad,
- GstBuffer *in_buffer)
-{
- gst_buffer_set_caps (out_buffer, GST_BUFFER_CAPS (in_buffer));
- GST_BUFFER_SIZE (out_buffer) = GST_BUFFER_SIZE (in_buffer);
- memcpy (GST_BUFFER_DATA (out_buffer), GST_BUFFER_DATA (in_buffer),
- GST_BUFFER_SIZE (in_buffer));
-}
-
-static void
-pull_buffer (GstElement *element,
- GstBuffer *in_buffer,
- GstPad *pad,
- GstBuffer **out_buffer)
-{
- *out_buffer = gst_buffer_ref (in_buffer);
-}
-
-GdkPixbuf *
-gst_helper_convert_buffer_to_pixbuf (GstBuffer*buffer,
- GCancellable *cancellable,
- TumblerThumbnailFlavor *flavour)
-{
- GstCaps *pb_caps;
- GstElement *pipeline;
- GstBuffer *out_buffer = NULL;
- GstElement *src, *sink, *colorspace, *scale, *filter;
- GstBus *bus;
- GstMessage *msg;
- gboolean ret;
- int thumb_size = 0, width, height, dw, dh, i;
- GstStructure *s;
-
- /* TODO: get the width and height, and handle them being different when
- scaling */
- tumbler_thumbnail_flavor_get_size (flavour, thumb_size, NULL);
-
- s = gst_caps_get_structure (GST_BUFFER_CAPS (buffer), 0);
- gst_structure_get_int (s, width, width);
- gst_structure_get_int (s, height, height);
-
- if (width height)
-{
-
[Xfce4-commits] xfce4-notifyd:master Add widget names for summary and body widgets (bug #8431).
Updating branch refs/heads/master
to 6f45653e6cd519327e7166b8b3f3b5e3b982fc42 (commit)
from 40c95620f657259bdcc37ae49fc4943a620d06fa (commit)
commit 6f45653e6cd519327e7166b8b3f3b5e3b982fc42
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sat Dec 8 23:23:06 2012 +0100
Add widget names for summary and body widgets (bug #8431).
This way we can remove the old summary-bold style property. The two
widgets can be fully themed in a more convenient way.
xfce4-notifyd/xfce-notify-window.c | 36 +++-
1 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/xfce4-notifyd/xfce-notify-window.c
b/xfce4-notifyd/xfce-notify-window.c
index 496c08f..0459f40 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -108,9 +108,6 @@ static gboolean xfce_notify_window_button_release(GtkWidget
*widget,
GdkEventButton *evt);
static gboolean xfce_notify_window_configure_event(GtkWidget *widget,
GdkEventConfigure *evt);
-static void xfce_notify_window_style_set(GtkWidget *widget,
- GtkStyle *previous_style);
-
static gboolean xfce_notify_window_expire_timeout(gpointer data);
static gboolean xfce_notify_window_fade_timeout(gpointer data);
@@ -138,7 +135,6 @@ xfce_notify_window_class_init(XfceNotifyWindowClass *klass)
widget_class-leave_notify_event = xfce_notify_window_enter_leave;
widget_class-button_release_event = xfce_notify_window_button_release;
widget_class-configure_event = xfce_notify_window_configure_event;
-widget_class-style_set = xfce_notify_window_style_set;
signals[SIG_CLOSED] = g_signal_new(closed,
XFCE_TYPE_NOTIFY_WINDOW,
@@ -181,12 +177,6 @@ xfce_notify_window_class_init(XfceNotifyWindowClass *klass)
0.0, 8.0,
DEFAULT_BORDER_WIDTH,
G_PARAM_READABLE));
-gtk_widget_class_install_style_property(widget_class,
-
g_param_spec_boolean(summary-bold,
- summary
bold,
- whether or
not to display the notification summary field in bold text,
- FALSE,
-
G_PARAM_READABLE));
}
static void
@@ -198,8 +188,6 @@ xfce_notify_window_init(XfceNotifyWindow *window)
window-expire_timeout = DEFAULT_EXPIRE_TIMEOUT;
window-normal_opacity = DEFAULT_NORMAL_OPACITY;
-/* The summary widget needs to be initialized before style_set is called.
gtk_widget_ensure_style calls style_set */
-window-summary = gtk_label_new(NULL);
gtk_window_set_keep_above(GTK_WINDOW(window), TRUE);
gtk_window_stick(GTK_WINDOW(window));
@@ -246,11 +234,14 @@ xfce_notify_window_init(XfceNotifyWindow *window)
gtk_widget_show(vbox);
gtk_box_pack_start(GTK_BOX(tophbox), vbox, TRUE, TRUE, 0);
+window-summary = gtk_label_new(NULL);
+gtk_widget_set_name (window-summary, summary);
gtk_label_set_line_wrap(GTK_LABEL(window-summary), TRUE);
gtk_misc_set_alignment(GTK_MISC(window-summary), 0.0, 0.0);
gtk_box_pack_start(GTK_BOX(vbox), window-summary, FALSE, FALSE, 0);
window-body = gtk_label_new(NULL);
+gtk_widget_set_name (window-body, body);
gtk_label_set_line_wrap(GTK_LABEL(window-body), TRUE);
gtk_misc_set_alignment(GTK_MISC(window-body), 0.0, 0.0);
gtk_box_pack_start(GTK_BOX(vbox), window-body, TRUE, TRUE, 0);
@@ -643,27 +634,6 @@ xfce_notify_window_configure_event(GtkWidget *widget,
return ret;
}
-static void
-xfce_notify_window_style_set(GtkWidget *widget,
- GtkStyle *previous_style)
-{
-XfceNotifyWindow *window = XFCE_NOTIFY_WINDOW(widget);
-gboolean summary_bold = FALSE;
-GtkStyle *style;
-PangoFontDescription *pfd;
-
-gtk_widget_style_get(widget,
- summary-bold, summary_bold,
- NULL);
-if(summary_bold) {
-style = gtk_widget_get_style(window-summary);
-pfd = pango_font_description_copy(style-font_desc);
-pango_font_description_set_weight(pfd, PANGO_WEIGHT_BOLD);
-gtk_widget_modify_font(window-summary, pfd);
-pango_font_description_free(pfd);
-}
-}
-
static gboolean
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:master Update translators, week 49.
Updating branch refs/heads/master
to 10b654fca35482db6fb2380fba693d087f1b41e0 (commit)
from 0f1adc8711512f230fef092c07e36459a1147f6f (commit)
commit 10b654fca35482db6fb2380fba693d087f1b41e0
Author: Transifex nore...@xfce.org
Date: Sun Dec 9 00:21:15 2012 +0100
Update translators, week 49.
xfce4-about/translators.h |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h
index fb2a3ef..ff6fa47 100644
--- a/xfce4-about/translators.h
+++ b/xfce4-about/translators.h
@@ -24,7 +24,7 @@
#include gtk/gtk.h
#include libxfce4util/libxfce4util.h
-#define TRANSLATORS_H_STAMP 2012-12-02 00:21:08
+#define TRANSLATORS_H_STAMP 2012-12-09 00:21:14
#define ATSIGN @
#define DOTSIGN .
@@ -211,6 +211,7 @@ static const TranslatorInfo xfce_translators_es[] =
{ lbazan, bazanluis20 ATSIGN gmail DOTSIGN com, FALSE },
{ ma7as, colonizare ATSIGN gmail DOTSIGN com, FALSE },
{ Matias De lellis, mati86dl ATSIGN gmail DOTSIGN com, FALSE },
+ { Eduardo Mayorga Téllez, mayorgalinux ATSIGN fedoraproject DOTSIGN
org, FALSE },
{ Octavio Bernal Quiroz, octavio DOTSIGN bernal DOTSIGN q ATSIGN
gmail DOTSIGN com, FALSE },
{ Sergio García, oigres200 ATSIGN gmail DOTSIGN com, FALSE },
{ prflr88, prflr88 ATSIGN gmail DOTSIGN com, FALSE },
@@ -277,7 +278,7 @@ static const TranslatorInfo xfce_translators_fr[] =
{ Louis Moureaux, m_louis30 ATSIGN yahoo DOTSIGN com, FALSE },
{ Maximilian Schleiss, maximilian ATSIGN xfce DOTSIGN org, FALSE },
{ marc doutreloux, mdoutreloux ATSIGN yahoo DOTSIGN fr, FALSE },
- { douart patrick, patrick DOTSIGN 2 ATSIGN laposte DOTSIGN net,
FALSE },
+ { patricktwo, , FALSE },
{ Anthony Jorion, pingax ATSIGN frugalware DOTSIGN fr, FALSE },
{ Saïd Bouras, said DOTSIGN bouras ATSIGN gmail DOTSIGN com, FALSE
},
{ Steve Dodier, sidnioulz ATSIGN gmail DOTSIGN com, FALSE },
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:master Update translators, week 49.
Updating branch refs/heads/master to fec1cc06dcc5b43626bdd17aed28e388a328d705 (commit) from d1f6802fed973d777a00f6b4f665f8c167f7379f (commit) commit fec1cc06dcc5b43626bdd17aed28e388a328d705 Author: Transifex nore...@xfce.org Date: Sun Dec 9 00:21:23 2012 +0100 Update translators, week 49. lib/translators.php |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/translators.php b/lib/translators.php index 25747ee..6efceba 100644 --- a/lib/translators.php +++ b/lib/translators.php @@ -4,7 +4,7 @@ * DO NOT EDIT IT MANUALLY! */ -$translators_stamp = 2012-12-02 00:21:15; +$translators_stamp = 2012-12-09 00:21:23; $translators = array ( 'Amharic [am]' = array ( @@ -131,6 +131,7 @@ $translators = array ( 'lbazan' = 'bazanluis20'.ATSIGN.'gmail'.DOTSIGN.'com', 'ma7as' = 'colonizare'.ATSIGN.'gmail'.DOTSIGN.'com', 'Matias De lellis' = 'mati86dl'.ATSIGN.'gmail'.DOTSIGN.'com', +'Eduardo Mayorga Téllez' = 'mayorgalinux'.ATSIGN.'fedoraproject'.DOTSIGN.'org', 'Octavio Bernal Quiroz' = 'octavio'.DOTSIGN.'bernal'.DOTSIGN.'q'.ATSIGN.'gmail'.DOTSIGN.'com', 'Sergio García' = 'oigres200'.ATSIGN.'gmail'.DOTSIGN.'com', 'prflr88' = 'prflr88'.ATSIGN.'gmail'.DOTSIGN.'com', @@ -179,7 +180,7 @@ $translators = array ( 'Louis Moureaux' = 'm_louis30'.ATSIGN.'yahoo'.DOTSIGN.'com', 'Maximilian Schleiss' = 'maximilian'.ATSIGN.'xfce'.DOTSIGN.'org', 'marc doutreloux' = 'mdoutreloux'.ATSIGN.'yahoo'.DOTSIGN.'fr', -'douart patrick' = 'patrick'.DOTSIGN.'2'.ATSIGN.'laposte'.DOTSIGN.'net', +'patricktwo' = '', 'Anthony Jorion' = 'pingax'.ATSIGN.'frugalware'.DOTSIGN.'fr', 'Saïd Bouras' = 'said'.DOTSIGN.'bouras'.ATSIGN.'gmail'.DOTSIGN.'com', 'Steve Dodier' = 'sidnioulz'.ATSIGN.'gmail'.DOTSIGN.'com', ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Fix and simplify news feed fallback pixbuf
Updating branch refs/heads/master
to 59c957ac47d8c094d19c035bb9a780d162d480c9 (commit)
from 22f6ef50d24d2a8edfef411161a13bdba8f68d8b (commit)
commit 59c957ac47d8c094d19c035bb9a780d162d480c9
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Dec 9 00:44:33 2012 +0100
Fix and simplify news feed fallback pixbuf
extensions/feed-panel/feed-panel.c | 21 +
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/extensions/feed-panel/feed-panel.c
b/extensions/feed-panel/feed-panel.c
index ed2d292..9657c15 100644
--- a/extensions/feed-panel/feed-panel.c
+++ b/extensions/feed-panel/feed-panel.c
@@ -24,7 +24,6 @@ struct _FeedPanel
GtkWidget* treeview;
GtkWidget* webview;
GtkWidget* delete;
-GdkPixbuf* pixbuf;
};
struct _FeedPanelClass
@@ -82,22 +81,17 @@ feed_panel_treeview_render_icon_cb (GtkTreeViewColumn*
column,
else
pitem = item;
-uri = katze_item_get_uri (pitem);
-if (uri)
+if ((uri = katze_item_get_uri (pitem)))
{
-pixbuf = midori_paths_get_icon (uri, panel-treeview);
-if (!pixbuf)
-pixbuf = panel-pixbuf;
+if (!(pixbuf = midori_paths_get_icon (uri, NULL)))
+pixbuf = gtk_widget_render_icon (panel-treeview, STOCK_NEWS_FEED,
GTK_ICON_SIZE_MENU, NULL);
}
else
-{
-pixbuf = gtk_widget_render_icon (panel-treeview,
- GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU, NULL);
-}
+pixbuf = gtk_widget_render_icon (panel-treeview,
GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU, NULL);
g_object_set (renderer, pixbuf, pixbuf, NULL);
-if (pixbuf != panel-pixbuf)
+if (pixbuf)
g_object_unref (pixbuf);
}
@@ -727,8 +721,6 @@ static void
feed_panel_finalize (GObject* object)
{
FeedPanel* panel = FEED_PANEL (object);
-
-g_object_unref (panel-pixbuf);
}
static void
@@ -873,9 +865,6 @@ feed_panel_init (FeedPanel* panel)
gtk_box_pack_start (GTK_BOX (panel), paned, TRUE, TRUE, 0);
gtk_widget_show (webview);
gtk_widget_show (paned);
-
-panel-pixbuf = gtk_widget_render_icon (treeview,
- STOCK_NEWS_FEED, GTK_ICON_SIZE_MENU, NULL);
}
GtkWidget*
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Reflect custom app name in instance name
Updating branch refs/heads/master
to 44667c8fe0e127b906d1b82b03707ef6e6ea1e06 (commit)
from 59c957ac47d8c094d19c035bb9a780d162d480c9 (commit)
commit 44667c8fe0e127b906d1b82b03707ef6e6ea1e06
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Dec 9 00:49:18 2012 +0100
Reflect custom app name in instance name
midori/main.c|3 +-
midori/midori-app.c | 67 ++---
midori/midori-app.h |2 +-
midori/midori-frontend.c | 10 ---
midori/midori-frontend.h |2 +-
midori/midori.vapi |4 +-
tests/app.vala |9 --
tests/browser.c |2 +-
tests/extensions.c |6 ++--
9 files changed, 43 insertions(+), 62 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 7fb8a7a..433bf3d 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -323,7 +323,8 @@ main (intargc,
return 0;
}
-MidoriApp* app = midori_normal_app_new (config, portable,
diagnostic_dialog, webapp,
+MidoriApp* app = midori_normal_app_new (config,
+portable ? portable : normal, diagnostic_dialog, webapp,
execute ? NULL : uris, execute ? uris : NULL, inactivity_reset,
block_uris);
if (app == NULL)
return 0;
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 7017a5f..b661c64 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -221,7 +221,6 @@ _midori_app_add_browser (MidoriApp* app,
NULL);
g_signal_connect_swapped (browser, send-notification,
G_CALLBACK (midori_app_send_notification), app);
-
katze_array_add_item (app-browsers, browser);
#if GTK_CHECK_VERSION (3, 0, 0)
@@ -692,7 +691,6 @@ midori_app_create_instance (MidoriApp* app)
GdkDisplay* display;
gchar* display_name;
gchar* instance_name;
-guint i, n;
#if !HAVE_UNIQUE
gboolean exists;
GIOChannel* channel;
@@ -704,14 +702,16 @@ midori_app_create_instance (MidoriApp* app)
{
#if HAVE_UNIQUE
const gchar* config = midori_paths_get_config_dir_for_reading ();
-gchar* name_hash;
-name_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, config, -1);
-katze_assign (app_name, g_strconcat (midori, _, name_hash, NULL));
+gchar* config_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5,
config, -1);
+gchar* name_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5,
app_name, -1);
+katze_assign (app_name, g_strconcat (PACKAGE_NAME,
+_, config_hash, _, name_hash, NULL));
+g_free (config_hash);
g_free (name_hash);
-g_object_notify (G_OBJECT (app), name);
#else
katze_assign (app_name, g_strdup (PACKAGE_NAME));
#endif
+g_object_notify (G_OBJECT (app), name);
}
#ifdef GDK_WINDOWING_X11
@@ -720,10 +720,7 @@ midori_app_create_instance (MidoriApp* app)
#else
display_name = g_strdup (gdk_display_get_name (display));
#endif
-n = strlen (display_name);
-for (i = 0; i n; i++)
-if (strchr (:.\\/, display_name[i]))
-display_name[i] = '_';
+g_strdelimit (display_name, :.\\/, '_');
instance_name = g_strdup_printf (de.twotoasts.%s_%s, app_name,
display_name);
g_free (display_name);
katze_assign (app_name, instance_name);
@@ -807,7 +804,6 @@ midori_app_init (MidoriApp* app)
#else
app-program_notify_send = g_find_program_in_path (notify-send);
#endif
-
}
static void
@@ -935,12 +931,9 @@ midori_app_get_property (GObject*object,
* Return value: a new #MidoriApp
**/
MidoriApp*
-midori_app_new (void)
+midori_app_new (const gchar* name)
{
-MidoriApp* app = g_object_new (MIDORI_TYPE_APP,
- NULL);
-
-return app;
+return g_object_new (MIDORI_TYPE_APP, name, name, NULL);
}
/**
@@ -964,12 +957,10 @@ midori_app_instance_is_running (MidoriApp* app)
app-instance = midori_app_create_instance (app);
#if HAVE_UNIQUE
-if (app-instance)
-return unique_app_is_running (app-instance);
+return app-instance unique_app_is_running (app-instance);
#else
-return g_object_get_data (G_OBJECT (app), sock-exists) != NULL;
+return g_object_get_data (G_OBJECT (app), sock-exists) != NULL;
#endif
-return FALSE;
}
/**
@@ -986,17 +977,13 @@ midori_app_instance_is_running (MidoriApp* app)
gboolean
midori_app_instance_send_activate (MidoriApp* app)
{
-#if HAVE_UNIQUE
-UniqueResponse response;
-#endif
-
-/* g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); */
+g_return_val_if_fail (MIDORI_IS_APP (app), FALSE);
g_return_val_if_fail (midori_app_instance_is_running (app), FALSE);
#if HAVE_UNIQUE
if (app-instance)
{
-response = unique_app_send_message (app-instance, UNIQUE_ACTIVATE,
NULL);
+UniqueResponse response = unique_app_send_message (app-instance,
[Xfce4-commits] midori:master Add missing assertions to public Midori.View methods
Updating branch refs/heads/master
to a3602439a8c7eea844a80d3691f1d6ec038c820e (commit)
from 44667c8fe0e127b906d1b82b03707ef6e6ea1e06 (commit)
commit a3602439a8c7eea844a80d3691f1d6ec038c820e
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Dec 9 02:09:22 2012 +0100
Add missing assertions to public Midori.View methods
midori/midori-view.c | 43 +++
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index c48a752..a0d5a9d 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1201,6 +1201,9 @@ midori_view_set_html (MidoriView* view,
const gchar*uri,
WebKitWebFrame* web_frame)
{
+g_return_if_fail (MIDORI_IS_VIEW (view));
+g_return_if_fail (data != NULL);
+
WebKitWebView* web_view = WEBKIT_WEB_VIEW (view-web_view);
if (!uri)
uri = about:blank;
@@ -1516,7 +1519,7 @@ midori_view_ensure_link_uri (MidoriView* view,
{
g_return_if_fail (MIDORI_IS_VIEW (view));
-if (view-web_view gtk_widget_get_window (view-web_view))
+if (gtk_widget_get_window (view-web_view))
{
GdkEventButton ev;
@@ -2008,6 +2011,8 @@ midori_web_view_menu_image_new_tab_activate_cb
(GtkWidget* widget,
GList*
midori_view_get_resources (MidoriView* view)
{
+g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+
WebKitWebView* web_view = WEBKIT_WEB_VIEW (view-web_view);
WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
WebKitWebDataSource* data_source = webkit_web_frame_get_data_source
(frame);
@@ -2288,6 +2293,9 @@ midori_view_populate_popup (MidoriView* view,
GtkWidget* menu,
gbooleanmanual)
{
+g_return_if_fail (MIDORI_IS_VIEW (view));
+g_return_if_fail (GTK_IS_MENU_SHELL (menu));
+
WebKitWebView* web_view = WEBKIT_WEB_VIEW (view-web_view);
GtkWidget* widget = GTK_WIDGET (view);
MidoriBrowser* browser = midori_browser_get_for_widget (widget);
@@ -3099,9 +3107,7 @@ midori_view_init (MidoriView* view)
static void
midori_view_finalize (GObject* object)
{
-MidoriView* view;
-
-view = MIDORI_VIEW (object);
+MidoriView* view = MIDORI_VIEW (object);
if (view-settings)
g_signal_handlers_disconnect_by_func (view-settings,
@@ -3129,9 +3135,7 @@ midori_view_set_property (GObject* object,
const GValue* value,
GParamSpec* pspec)
{
-MidoriView* view;
-
-view = MIDORI_VIEW (object);
+MidoriView* view = MIDORI_VIEW (object);
switch (prop_id)
{
@@ -3230,8 +3234,6 @@ _midori_view_set_settings (MidoriView*view,
g_signal_connect (settings, notify,
G_CALLBACK (midori_view_settings_notify_cb), view);
-g_object_set (view-web_view, settings, settings, NULL);
-
g_object_get (view-settings,
zoom-text-and-images, zoom_text_and_images,
kinetic-scrolling, kinetic_scrolling,
@@ -3241,8 +3243,10 @@ _midori_view_set_settings (MidoriView*view,
open-tabs-in-the-background, view-open_tabs_in_the_background,
NULL);
-g_object_set (view-web_view,
- full-content-zoom, zoom_text_and_images, NULL);
+g_object_set (view-web_view,
+ settings, settings,
+ full-content-zoom, zoom_text_and_images,
+ NULL);
g_object_set (view-scrolled_window, kinetic-scrolling,
kinetic_scrolling, NULL);
}
@@ -4353,6 +4357,8 @@ midori_view_tab_label_menu_duplicate_tab_cb (GtkWidget*
menuitem,
GtkWidget*
midori_view_duplicate (MidoriView* view)
{
+g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+
MidoriNewView where = MIDORI_NEW_VIEW_TAB;
GtkWidget* new_view = midori_view_new_with_item (view-item,
view-settings);
g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where, TRUE);
@@ -4474,6 +4480,7 @@ void
midori_view_set_tab (MidoriView*view,
GraniteWidgetsTab* tab)
{
+g_return_if_fail (MIDORI_IS_VIEW (view));
g_return_if_fail (view-tab == NULL);
view-tab = tab;
@@ -4488,6 +4495,8 @@ midori_view_set_tab (MidoriView*view,
GtkWidget*
midori_view_get_proxy_tab_label (MidoriView* view)
{
+g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
+
GtkWidget* tab = GTK_WIDGET (midori_view_get_tab (view));
GList* children = gtk_container_get_children (GTK_CONTAINER (tab));
GtkWidget* label = NULL;
@@ -4649,10 +4658,7 @@ static void midori_view_tab_label_data_received
(GtkWidget* widget,
guint timestamp,
MidoriView* view)
{
-gchar **uri;
-gchar* text;
-
-uri = gtk_selection_data_get_uris (data);
+gchar** uri =
[Xfce4-commits] midori:master Add 1.3.13 IconDatabase code path equivalent to 1.8.0
Updating branch refs/heads/master
to b391161e3fae9bc5aa8337b820ffb64cbfc7b63d (commit)
from a3602439a8c7eea844a80d3691f1d6ec038c820e (commit)
commit b391161e3fae9bc5aa8337b820ffb64cbfc7b63d
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Dec 9 02:10:11 2012 +0100
Add 1.3.13 IconDatabase code path equivalent to 1.8.0
Also ensure that themed icon size is used.
katze/katze-net.c |2 +-
katze/katze-net.h |2 +-
katze/midori-paths.vala | 20 ++--
midori/midori-browser.c |2 +-
midori/midori-view.c | 24
midori/webkitgtk-3.0.vapi |8
wscript |2 ++
7 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/katze/katze-net.c b/katze/katze-net.c
index fc82510..75a9949 100644
--- a/katze/katze-net.c
+++ b/katze/katze-net.c
@@ -77,7 +77,7 @@ katze_net_priv_free (KatzeNetPriv* priv)
g_slice_free (KatzeNetPriv, priv);
}
-#if !WEBKIT_CHECK_VERSION (1, 8, 0)
+#if !WEBKIT_CHECK_VERSION (1, 3, 13)
gchar*
katze_net_get_cached_path (KatzeNet*net,
const gchar* uri,
diff --git a/katze/katze-net.h b/katze/katze-net.h
index 87c0912..a6371fb 100644
--- a/katze/katze-net.h
+++ b/katze/katze-net.h
@@ -67,7 +67,7 @@ katze_net_load_uri (KatzeNet*
net,
KatzeNetTransferCb transfer_cb,
gpointer user_data);
-#if !WEBKIT_CHECK_VERSION (1, 8, 0)
+#if !WEBKIT_CHECK_VERSION (1, 3, 13)
gchar*
katze_net_get_cached_path(KatzeNet* net,
const gchar* uri,
diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index 2f62a90..cc475e8 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -119,6 +119,9 @@ namespace Midori {
#if HAVE_WEBKIT_1_8_0
if (user_data_dir != null)
WebKit.get_favicon_database ().set_path (Path.build_filename
(user_data_dir, webkit, icondatabase));
+#elif HAVE_WEBKIT_1_3_13
+if (user_data_dir != null)
+WebKit.get_icon_database ().set_path (Path.build_filename
(user_data_dir, webkit, icondatabase));
#endif
if (strcmp (Environment.get_variable (MIDORI_DEBUG), paths) ==
0) {
stdout.printf (config: %s\ncache: %s\nuser_data: %s\ntmp:
%s\n,
@@ -373,6 +376,8 @@ namespace Midori {
assert (user_data_dir != null);
#if HAVE_WEBKIT_1_8_0
WebKit.get_favicon_database ().clear ();
+#elif HAVE_WEBKIT_1_3_13
+WebKit.get_icon_database ().clear ();
#endif
/* FIXME: Exclude search engine icons */
remove_path (Path.build_filename (cache_dir, icons));
@@ -383,11 +388,22 @@ namespace Midori {
if (!Midori.URI.is_resource (uri))
return null;
#if HAVE_WEBKIT_1_8_0
-/* FIXME: Don't hard-code icon size */
+int icon_width = 16, icon_height = 16;
+if (widget != null)
+Gtk.icon_size_lookup_for_settings (widget.get_settings (),
+Gtk.IconSize.MENU, out icon_width, out icon_height);
Gdk.Pixbuf? pixbuf = WebKit.get_favicon_database ()
-.try_get_favicon_pixbuf (uri, 16, 16);
+.try_get_favicon_pixbuf (uri, icon_width, icon_height);
if (pixbuf != null)
return pixbuf;
+#elif HAVE_WEBKIT_1_3_13
+int icon_width = 16, icon_height = 16;
+if (widget != null)
+Gtk.icon_size_lookup_for_settings (widget.get_settings (),
+Gtk.IconSize.MENU, out icon_width, out icon_height);
+Gdk.Pixbuf? pixbuf = WebKit.get_icon_database ().get_icon_pixbuf
(uri);
+if (pixbuf != null)
+return pixbuf.scale_simple (icon_width, icon_height,
Gdk.InterpType.BILINEAR);
#endif
return Katze.load_cached_icon (uri, widget);
}
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 6102b03..96520c0 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2415,7 +2415,7 @@ _action_add_desktop_shortcut_activate (GtkAction*
action,
GKeyFile* keyfile = g_key_file_new ();
gchar* filename = g_strdelimit (g_strconcat (app_name, .desktop, NULL),
/, '_');
gchar* app_dir = g_build_filename (g_get_user_data_dir (), applications,
filename, NULL);
-#if WEBKIT_CHECK_VERSION (1, 8, 0)
+#if WEBKIT_CHECK_VERSION (1, 3, 13)
/* FIXME: midori_paths_get_icon */
gchar* app_icon = g_strdup (STOCK_WEB_BROWSER);
#else
diff --git a/midori/midori-view.c b/midori/midori-view.c
index a0d5a9d..653c93b 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -473,7 +473,7 @@ midori_view_unset_icon (MidoriView* view)
midori_view_apply_icon (view, pixbuf,
[Xfce4-commits] xfce4-indicator-plugin:andrzejr/tmp2 Making the plugin a library and a subclass of XfcePanelPlugin
Updating branch refs/heads/andrzejr/tmp2 to d2c4a1fb154362c53ccd957cee3e7594492562dd (commit) from 1b13cca086cf1259b3d427c5121201de1a778c17 (commit) commit d2c4a1fb154362c53ccd957cee3e7594492562dd Author: Andrzej ndrwr...@gmail.com Date: Sat Mar 31 21:57:43 2012 +0900 Making the plugin a library and a subclass of XfcePanelPlugin The plugin is now installed as a library and to a different directory (following convention of other plugins). The plugin is now an object of IndicatorPlugin class, which extends XfcePanelPlugin. This is for making definition of properties and integration with xfconf easier. configure.in.in|7 + panel-plugin/Makefile.am | 55 --- panel-plugin/indicator.c | 167 +++ ...ndicator.desktop.in.in = indicator.desktop.in} |4 +- panel-plugin/indicator.h | 32 ++-- 5 files changed, 159 insertions(+), 106 deletions(-) diff --git a/configure.in.in b/configure.in.in index 3280c7f..b308dbd 100644 --- a/configure.in.in +++ b/configure.in.in @@ -30,6 +30,7 @@ dnl *** AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE() +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl dnl *** Check for basic programs *** @@ -40,6 +41,12 @@ AC_PROG_INSTALL() AC_PROG_LIBTOOL() AC_PROG_INTLTOOL() +dnl ** +dnl *** Initialize libtool *** +dnl ** +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) + dnl ** dnl *** Check for standard headers *** dnl ** diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index c07a45c..0010923 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -1,19 +1,24 @@ + INCLUDES = \ -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\xfce4-indicator-plugin\ \ + -DG_LOG_DOMAIN=\libindicator-plugin\ \ -DPACKAGE_LOCALE_DIR=\$(localedir)\ \ $(PLATFORM_CPPFLAGS) # # Indicator plugin # -plugin_PROGRAMS = \ - xfce4-indicator-plugin +plugindir = \ + $(libdir)/xfce4/panel/plugins + +plugin_LTLIBRARIES = \ + libindicator-plugin.la -plugindir = \ - $(libexecdir)/xfce4/panel-plugins +libindicator_built_sources = \ + indicator-dialog_ui.h -xfce4_indicator_plugin_SOURCES = \ +libindicator_plugin_la_SOURCES = \ + $(libindicator_built_sources) \ indicator-button.c \ indicator-button.h \ indicator-box.c \ @@ -21,7 +26,7 @@ xfce4_indicator_plugin_SOURCES = \ indicator.c \ indicator.h -xfce4_indicator_plugin_CFLAGS =\ +libindicator_plugin_la_CFLAGS = \ $(GTK_CFLAGS) \ $(EXO_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ @@ -33,8 +38,14 @@ xfce4_indicator_plugin_CFLAGS = \ -DINDICATOR_ICONS_DIR=\$(INDICATORICONSDIR)\ \ -DINDICATOR_DIR=\$(INDICATORDIR)\ +libindicator_plugin_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ + $(PLATFORM_LDFLAGS) -xfce4_indicator_plugin_LDADD = \ +libindicator_plugin_la_LIBADD = \ $(GTK_LIBS) \ $(EXO_LIBS) \ $(LIBXFCE4UTIL_LIBS)\ @@ -46,16 +57,10 @@ xfce4_indicator_plugin_LDADD = \ # Desktop file # desktopdir = \ - $(datadir)/xfce4/panel-plugins - -desktop_in_in_files = \ - indicator.desktop.in.in - -desktop_in_files = \ - $(desktop_in_in_files:.desktop.in.in=.desktop.in) + $(datadir)/xfce4/panel/plugins -%.desktop.in: %.desktop.in.in - sed -e s,\@libexecdir\@,$(libexecdir),g $ $@ +desktop_in_files = \ + indicator.desktop.in
[Xfce4-commits] xfce4-indicator-plugin:andrzejr/tmp3 Fixed menu positioning.
Updating branch refs/heads/andrzejr/tmp3
to 1c76403a300e778ca5e170acbbf3f01dde9c8c18 (commit)
from 707ad099934c2e3ff7aab18c0601b6072e23f782 (commit)
commit 1c76403a300e778ca5e170acbbf3f01dde9c8c18
Author: Andrzej ndrwr...@gmail.com
Date: Sun Dec 9 02:46:58 2012 +
Fixed menu positioning.
Occasionally, e.g. when indicator was placed near the bottom
of a vertical panel, the first click on a button resulted
in an incorrect position/size of the menu. Subsequent clicks
were fixing this behavior.
This commit repositions the menu to reset its position and size.
panel-plugin/indicator-button.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index 8c2aaa7..109544f 100644
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -503,6 +503,7 @@ xfce_indicator_button_button_press (GtkWidget *widget,
if(event-button == 1 button-menu != NULL) /* left click only */
{
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),TRUE);
+ gtk_menu_reposition (GTK_MENU (button-menu));
gtk_menu_popup (button-menu, NULL, NULL,
xfce_panel_plugin_position_menu,
xfce_indicator_box_get_plugin (button-buttonbox),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-indicator-plugin:andrzejr/tmp2 Deleting branch andrzejr/tmp2
Deleting branch refs/heads/andrzejr/tmp2 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 8fb207e8024e050c05db615eaa993c8049856cdc (commit) from 77caf1d8e9b221db2d67eaf425e1c7434cc73cea (commit) commit 8fb207e8024e050c05db615eaa993c8049856cdc Author: Masato Hashimoto hash...@xfce.org Date: Sun Dec 9 07:33:23 2012 +0100 l10n: Updated Japanese (ja) translation to 100% New status: 212 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 261 +- 1 files changed, 174 insertions(+), 87 deletions(-) diff --git a/po/ja.po b/po/ja.po index de5af98..6f9ef48 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,10 +8,10 @@ msgid msgstr Project-Id-Version: parole 0.1.90\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-11-28 22:29+0900\n -PO-Revision-Date: 2012-11-28 22:29+0900\n +POT-Creation-Date: 2012-12-09 15:28+0900\n +PO-Revision-Date: 2012-12-09 15:29+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n -Language-Team: Japanese xfce-users...@ml.fdiary.net\n +Language-Team: Japanese xfce-users...@googlegroups.com\n Language: ja\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -28,116 +28,132 @@ msgid _Media msgstr メディア(_M) #: ../data/interfaces/parole.ui.h:3 -msgid Open _location +msgid Open _Location msgstr 場所を開く(_L) -#: ../data/interfaces/parole.ui.h:4 ../src/parole-disc.c:147 -#: ../src/parole-disc.c:465 +#: ../data/interfaces/parole.ui.h:4 +msgid Open Recent +msgstr 最近開いたファイル + +#: ../data/interfaces/parole.ui.h:5 ../src/parole-disc.c:111 +#: ../src/parole-disc.c:157 msgid Insert Disc msgstr ディスクを挿入してください -#: ../data/interfaces/parole.ui.h:5 +#: ../data/interfaces/parole.ui.h:6 msgid _Edit msgstr 編集(_E) -#: ../data/interfaces/parole.ui.h:6 +#: ../data/interfaces/parole.ui.h:7 msgid _Repeat msgstr 繰り返し(_R) -#: ../data/interfaces/parole.ui.h:7 +#: ../data/interfaces/parole.ui.h:8 msgid _Shuffle msgstr シャッフル(_S) -#: ../data/interfaces/parole.ui.h:8 +#: ../data/interfaces/parole.ui.h:9 msgid Pl_ugins msgstr プラグイン(_U) -#: ../data/interfaces/parole.ui.h:9 +#: ../data/interfaces/parole.ui.h:10 msgid _View msgstr 表示(_V) -#: ../data/interfaces/parole.ui.h:10 +#: ../data/interfaces/parole.ui.h:11 msgid _Aspect Ratio msgstr アスペクト比(_A) -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:12 msgid None msgstr なし -#: ../data/interfaces/parole.ui.h:12 +#: ../data/interfaces/parole.ui.h:13 msgid Auto msgstr 自動 -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:14 msgid Square msgstr スクエア -#: ../data/interfaces/parole.ui.h:14 +#: ../data/interfaces/parole.ui.h:15 msgid 4:3 (TV) msgstr 4:3 (TV) -#: ../data/interfaces/parole.ui.h:15 +#: ../data/interfaces/parole.ui.h:16 msgid 16:9 (Widescreen) msgstr 16:9 (ワイドスクリーン) -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:17 msgid 20:9 (DVB) msgstr 20:9 (DVB) -#: ../data/interfaces/parole.ui.h:17 +#: ../data/interfaces/parole.ui.h:18 msgid Subtitles msgstr 字幕 -#: ../data/interfaces/parole.ui.h:18 +#: ../data/interfaces/parole.ui.h:19 msgid Select Text Subtitles... msgstr 字幕の選択... -#: ../data/interfaces/parole.ui.h:19 +#: ../data/interfaces/parole.ui.h:20 msgid Show _playlist msgstr プレイリストを表示(_P) -#: ../data/interfaces/parole.ui.h:20 ../src/misc/parole-filters.c:64 +#: ../data/interfaces/parole.ui.h:21 ../src/misc/parole-filters.c:64 msgid Audio msgstr オーディオ -#: ../data/interfaces/parole.ui.h:21 +#: ../data/interfaces/parole.ui.h:22 msgid Languages msgstr 言語 -#: ../data/interfaces/parole.ui.h:22 ../src/parole-player.c:681 +#: ../data/interfaces/parole.ui.h:23 ../src/parole-player.c:707 msgid Empty msgstr 空 -#: ../data/interfaces/parole.ui.h:23 +#: ../data/interfaces/parole.ui.h:24 msgid Volume _Up msgstr ボリュームを上げる(_U) -#: ../data/interfaces/parole.ui.h:24 +#: ../data/interfaces/parole.ui.h:25 msgid Volume _Down msgstr ボリュームを下げる(_D) -#: ../data/interfaces/parole.ui.h:25 +#: ../data/interfaces/parole.ui.h:26 msgid _Mute msgstr ミュート(_M) -#: ../data/interfaces/parole.ui.h:26 +#: ../data/interfaces/parole.ui.h:27 msgid _Help msgstr ヘルプ(_H) -#: ../data/interfaces/parole.ui.h:27 +#: ../data/interfaces/parole.ui.h:28 msgid Audio Track: msgstr オーディオトラック: -#: ../data/interfaces/parole.ui.h:28 +#: ../data/interfaces/parole.ui.h:29 msgid Subtitles: msgstr 字幕: #: ../data/interfaces/parole.ui.h:30 +msgid span color='#F4F4F4'bbigUnknown Song/big/b/span +msgstr span color='#F4F4F4'bbig未知の楽曲/big/b/span + +#: ../data/interfaces/parole.ui.h:31 +msgid bigspan color='#BB'ion/i/span span color='#F4F4F4'Unknown Album/span/big +msgstr bigspan color='#BB'ion/i/span span color='#F4F4F4'未知のアルバム/span/big + +#: ../data/interfaces/parole.ui.h:32 +msgid bigspan color='#BB'iby/i/span span color='#F4F4F4'Unknown Artist/span/big +msgstr bigspan color='#BB'iby/i/span span
