[Xfce4-commits] xfce4-power-manager:master Prepare 0.8.4
Updating branch refs/heads/master
to e701f3498aa8e47f832c41e59fec0afe0b645475 (commit)
from 40b01c3a4993d0054f9d85b8869b4d7a457a1a48 (commit)
commit e701f3498aa8e47f832c41e59fec0afe0b645475
Author: Ali Abdallah a...@ali-xfce.org
Date: Tue Sep 29 09:17:41 2009 +
Prepare 0.8.4
NEWS |2 +-
configure.ac.in |8
libxfpm/Makefile.am |3 ++-
libxfpm/xfpm-common.c |2 +-
libxfpm/xfpm-common.h |2 +-
src/xfpm-dpms.c |2 +-
src/xfpm-engine.c |2 +-
7 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/NEWS b/NEWS
index b78879f..e020918 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-0.9.90
+0.8.4
===
- Don't lock screen on lid event when multiple monitor are connected.
- Force DPMSModeOff on lid close event if it is not done in Hardware.
diff --git a/configure.ac.in b/configure.ac.in
index 22f0b0f..0e581bc 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,9 +1,9 @@
m4_define([intltool_minimum_version], [0.31])
m4_define([xfpm_version_major], [0])
-m4_define([xfpm_version_minor], [9])
-m4_define([xfpm_version_micro], [90])
-m4_define([xfpm_version_build], [...@revision@])
-m4_define([xfpm_version_tag],[git])
+m4_define([xfpm_version_minor], [8])
+m4_define([xfpm_version_micro], [4])
+m4_define([xfpm_version_build], [])
+m4_define([xfpm_version_tag],[])
m4_define([xfpm_version],
[xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(),
[git], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
diff --git a/libxfpm/Makefile.am b/libxfpm/Makefile.am
index 81a3aa2..ecdc403 100644
--- a/libxfpm/Makefile.am
+++ b/libxfpm/Makefile.am
@@ -36,7 +36,8 @@ libxfpmcommon_la_SOURCES =\
xfpm-common.c \
xfpm-common.h \
xfpm-notify.c \
- xfpm-notify.h
+ xfpm-notify.h \
+ xfpm-icons.h
libxfpmcommon_la_CFLAGS = \
$(GTK_CFLAGS) \
diff --git a/libxfpm/xfpm-common.c b/libxfpm/xfpm-common.c
index 76c8cf3..77da56a 100644
--- a/libxfpm/xfpm-common.c
+++ b/libxfpm/xfpm-common.c
@@ -146,7 +146,7 @@ xfpm_about (GtkWidget *widget, gpointer data)
}
-gboolean xfpm_guess_is_multimonitor (void)
+gboolean xfpm_is_multihead_connected (void)
{
GdkDisplay *dpy;
GdkScreen *screen;
diff --git a/libxfpm/xfpm-common.h b/libxfpm/xfpm-common.h
index 75d310e..dfd9faf 100644
--- a/libxfpm/xfpm-common.h
+++ b/libxfpm/xfpm-common.h
@@ -44,7 +44,7 @@ voidxfpm_quit (void);
void xfpm_about (GtkWidget *widget,
gpointer data);
-gboolean xfpm_guess_is_multimonitor (void);
+gboolean xfpm_is_multihead_connected (void);
G_END_DECLS
diff --git a/src/xfpm-dpms.c b/src/xfpm-dpms.c
index f9ecb3a..3022096 100644
--- a/src/xfpm-dpms.c
+++ b/src/xfpm-dpms.c
@@ -244,7 +244,7 @@ xfpm_dpms_force_off (gpointer data)
if ( power_level != DPMSModeOff )
{
- if ( xfpm_guess_is_multimonitor () )
+ if ( xfpm_is_multihead_connected () )
goto out;
TRACE (Checking if we have multiple monitor : no);
diff --git a/src/xfpm-engine.c b/src/xfpm-engine.c
index 9742493..5a3a962 100644
--- a/src/xfpm-engine.c
+++ b/src/xfpm-engine.c
@@ -246,7 +246,7 @@ xfpm_engine_lid_event (XfpmButtonHal *bt_hal, gboolean
pressed, XfpmEngine *engi
if ( action == LID_TRIGGER_LOCK_SCREEN )
{
- if ( !xfpm_guess_is_multimonitor () )
+ if ( !xfpm_is_multihead_connected () )
xfpm_lock_screen ();
}
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-power-manager|0.8.4 Creating annotated tag 0.8.4
Updating annotated tag refs/tags/0.8.4 as new annotated tag to 6dede646e2fcf8553db79d4805e99d8a775838ba (tag) succeeds 0.8.3.1-29-g40b01c3 tagged by Ali Abdallah a...@ali-xfce.org on 2009-09-29 09:29 + Ali Abdallah (1): Prepare 0.8.4 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:devel Implement removed signal in panel plugin.
Updating branch refs/heads/devel
to 582a62fcb6bee2df6e58113fe1f69cc4df574563 (commit)
from 741a69c403b2c6556536eb700f567951713eb99f (commit)
commit 582a62fcb6bee2df6e58113fe1f69cc4df574563
Author: Nick Schermer n...@xfce.org
Date: Tue Sep 29 11:12:11 2009 +0200
Implement removed signal in panel plugin.
This signal is only emitted when the user permanently removes
a plugin from the panel and can be used by developers to
removed custom settings. Bug #5694.
common/panel-dbus.h|1 +
libxfce4panel/xfce-panel-plugin-provider.c | 22 --
libxfce4panel/xfce-panel-plugin-provider.h |3 +
libxfce4panel/xfce-panel-plugin.c | 58 +++-
libxfce4panel/xfce-panel-plugin.h |1 +
panel/panel-application.c |3 +
panel/panel-plugin-external.c | 15 +++
wrapper/main.c |4 ++
wrapper/wrapper-plug.c |2 +-
9 files changed, 93 insertions(+), 16 deletions(-)
diff --git a/common/panel-dbus.h b/common/panel-dbus.h
index a659495..e4658e2 100644
--- a/common/panel-dbus.h
+++ b/common/panel-dbus.h
@@ -36,6 +36,7 @@ enum _DBusPropertyChanged
PROPERTY_CHANGED_PROVIDER_EMIT_SAVE,
PROPERTY_CHANGED_PROVIDER_EMIT_SHOW_CONFIGURE,
PROPERTY_CHANGED_PROVIDER_EMIT_SHOW_ABOUT,
+ PROPERTY_CHANGED_PROVIDER_REMOVE,
/* wrapper plug */
PROPERTY_CHANGED_WRAPPER_BACKGROUND_ALPHA,
diff --git a/libxfce4panel/xfce-panel-plugin-provider.c
b/libxfce4panel/xfce-panel-plugin-provider.c
index 5854e75..825c2a6 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.c
+++ b/libxfce4panel/xfce-panel-plugin-provider.c
@@ -36,7 +36,8 @@ enum
-static void xfce_panel_plugin_provider_class_init (gpointer klass);
+static void xfce_panel_plugin_provider_class_init (gpointer klass,
+ gpointer klass_data);
@@ -53,7 +54,7 @@ xfce_panel_plugin_provider_get_type (void)
{
type = g_type_register_static_simple (G_TYPE_INTERFACE,
I_(XfcePanelPluginProvider),
sizeof
(XfcePanelPluginProviderIface),
-(GClassInitFunc)
xfce_panel_plugin_provider_class_init,
+
xfce_panel_plugin_provider_class_init,
0, NULL, 0);
}
@@ -63,7 +64,8 @@ xfce_panel_plugin_provider_get_type (void)
static void
-xfce_panel_plugin_provider_class_init (gpointer klass)
+xfce_panel_plugin_provider_class_init (gpointer klass,
+ gpointer klass_data)
{
provider_signals[PROVIDER_SIGNAL] =
g_signal_new (I_(provider-signal),
@@ -167,7 +169,7 @@ xfce_panel_plugin_provider_show_configure
(XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
- return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)-show_configure)
(provider);
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)-show_configure)
(provider);
}
@@ -187,5 +189,15 @@ xfce_panel_plugin_provider_show_about
(XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
- return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)-show_about)
(provider);
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)-show_about) (provider);
+}
+
+
+
+void
+xfce_panel_plugin_provider_remove (XfcePanelPluginProvider *provider)
+{
+ panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
+
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)-remove) (provider);
}
diff --git a/libxfce4panel/xfce-panel-plugin-provider.h
b/libxfce4panel/xfce-panel-plugin-provider.h
index d433c0c..007db13 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.h
+++ b/libxfce4panel/xfce-panel-plugin-provider.h
@@ -67,6 +67,7 @@ struct _XfcePanelPluginProviderIface
void (*show_configure) (XfcePanelPluginProvider
*provider);
gboolean (*get_show_about) (XfcePanelPluginProvider
*provider);
void (*show_about) (XfcePanelPluginProvider
*provider);
+ void (*remove) (XfcePanelPluginProvider
*provider);
};
/* signals send from the plugin to the panel (possibly
@@ -121,6 +122,8 @@ gboolean xfce_panel_plugin_provider_get_show_about
(XfcePanelPluginProv
void xfce_panel_plugin_provider_show_about
(XfcePanelPluginProvider *provider);
+void xfce_panel_plugin_provider_remove
(XfcePanelPluginProvider *provider);
+
G_END_DECLS
#endif /* !__XFCE_PANEL_PLUGIN_PROVIDER_H__ */
diff --git a/libxfce4panel/xfce-panel-plugin.c
b/libxfce4panel/xfce-panel-plugin.c
index 70b50d7..d314fc2 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -77,6 +77,7 @@
[Xfce4-commits] parole:master Set the play button sensitive when media list isn't empty
Updating branch refs/heads/master
to 2133d31be66a99bafc7b27cf8b4f50997ea2bc19 (commit)
from ae52c422cdda334800f03b32a72f280b9043d15d (commit)
commit 2133d31be66a99bafc7b27cf8b4f50997ea2bc19
Author: Ali Abdallah a...@ali-xfce.org
Date: Tue Sep 29 11:25:53 2009 +
Set the play button sensitive when media list isn't empty
parole/parole-medialist.c | 94 -
parole/parole-medialist.h |2 +
parole/parole-player.c| 10 -
3 files changed, 60 insertions(+), 46 deletions(-)
diff --git a/parole/parole-medialist.c b/parole/parole-medialist.c
index ab5144f..4a97d6f 100644
--- a/parole/parole-medialist.c
+++ b/parole/parole-medialist.c
@@ -179,7 +179,7 @@ parole_media_list_set_widget_sensitive (ParoleMediaList
*list, gboolean sensitiv
}
static void
-parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean emit)
+parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean emit,
gboolean select_row)
{
GtkListStore *list_store;
GtkTreePath *path;
@@ -203,7 +203,16 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean emit)
row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list_store), path);
gtk_tree_path_free (path);
g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
+ gtk_tree_row_reference_free (row);
}
+
+if ( select_row )
+{
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
+ parole_media_list_select_path (list, path);
+ gtk_tree_path_free (path);
+}
+
/*
* Unref it as the list store will have
* a reference anyway.
@@ -211,6 +220,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean emit)
g_object_unref (file);
nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list-priv-store),
NULL);
+
if ( nch == 1 )
{
gtk_widget_set_sensitive (list-priv-up, FALSE);
@@ -220,6 +230,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean emit)
}
else
parole_media_list_set_widget_sensitive (list, TRUE);
+
}
static void
@@ -231,10 +242,16 @@ parole_media_list_files_opened_cb (ParoleMediaChooser
*chooser, GSList *files, P
len = g_slist_length (files);
-for ( i = 0; i len; i++)
+if ( len != 0 )
+{
+ file = g_slist_nth_data (files, 0);
+ parole_media_list_add (list, file, FALSE, TRUE);
+}
+
+for ( i = 1; i len; i++)
{
file = g_slist_nth_data (files, i);
- parole_media_list_add (list, file, FALSE);
+ parole_media_list_add (list, file, FALSE, FALSE);
}
}
@@ -250,7 +267,7 @@ parole_media_list_location_opened_cb (ParoleOpenLocation
*obj, const gchar *loca
else
{
file = parole_file_new (location);
- parole_media_list_add (list, file, TRUE);
+ parole_media_list_add (list, file, TRUE, TRUE);
}
}
@@ -285,7 +302,6 @@ parole_media_list_add_by_path (ParoleMediaList *list, const
gchar *path, gboolea
{
GSList *file_list = NULL;
GtkFileFilter *filter;
-ParoleFile *file;
guint len;
gboolean ret = FALSE;
@@ -294,12 +310,9 @@ parole_media_list_add_by_path (ParoleMediaList *list,
const gchar *path, gboolea
parole_get_media_files (filter, path, file_list);
-for ( len = 0; len g_slist_length (file_list); len++)
-{
- file = g_slist_nth_data (file_list, len);
- parole_media_list_add (list, file, len == 0 ? emit : FALSE);
- ret = TRUE;
-}
+parole_media_list_files_opened_cb (NULL, file_list, list);
+len = g_slist_length (file_list);
+ret = len == 0 ? FALSE : TRUE;
g_object_unref (filter);
g_slist_free (file_list);
@@ -1019,8 +1032,6 @@ parole_media_list_init (ParoleMediaList *list)
{
GtkBuilder *builder;
GtkWidget *box;
-gbooleanload_saved_list;
-GSList *fileslist = NULL;
list-priv = PAROLE_MEDIA_LIST_GET_PRIVATE (list);
@@ -1046,33 +1057,6 @@ parole_media_list_init (ParoleMediaList *list)
gtk_widget_show_all (GTK_WIDGET (list));
parole_media_list_dbus_init (list);
-
-load_saved_list = parole_rc_read_entry_bool (SAVE_LIST_ON_EXIT,
PAROLE_RC_GROUP_GENERAL, FALSE);
-
-if ( load_saved_list )
-{
- gchar *playlist_file;
- playlist_file = xfce_resource_save_location (XFCE_RESOURCE_DATA,
-
PAROLE_AUTO_SAVED_PLAYLIST,
-FALSE);
- if ( playlist_file )
- {
- fileslist = parole_pl_parser_load_file (playlist_file);
- g_free (playlist_file);
- if ( fileslist )
- {
- guint i, len;
- len = g_slist_length (fileslist);
- for ( i = 0; i len; i++)
-
[Xfce4-commits] parole:master Don't set the play button insensitive when stop is clicked and media list isn't empty
Updating branch refs/heads/master
to 9ed4c72d9422cb432271af63e6f749ad77095fc4 (commit)
from 2133d31be66a99bafc7b27cf8b4f50997ea2bc19 (commit)
commit 9ed4c72d9422cb432271af63e6f749ad77095fc4
Author: Ali Abdallah a...@ali-xfce.org
Date: Tue Sep 29 11:36:06 2009 +
Don't set the play button insensitive when stop is clicked and media list
isn't empty
parole/parole-medialist.c |5 +
parole/parole-medialist.h |2 ++
parole/parole-player.c|6 --
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/parole/parole-medialist.c b/parole/parole-medialist.c
index 4a97d6f..19cf63c 100644
--- a/parole/parole-medialist.c
+++ b/parole/parole-medialist.c
@@ -1198,6 +1198,11 @@ GtkTreeRowReference *parole_media_list_get_row_random
(ParoleMediaList *list)
return row;
}
+gboolean parole_media_list_is_selected_row (ParoleMediaList *list)
+{
+return gtk_tree_selection_count_selected_rows (list-priv-sel) 0;
+}
+
GtkTreeRowReference *parole_media_list_get_selected_row (ParoleMediaList *list)
{
return parole_media_list_get_first_selected_row (list);
diff --git a/parole/parole-medialist.h b/parole/parole-medialist.h
index 46259b6..4d0a922 100644
--- a/parole/parole-medialist.h
+++ b/parole/parole-medialist.h
@@ -69,6 +69,8 @@ GtkWidget *parole_media_list_new
(void);
voidparole_media_list_load
(ParoleMediaList *list);
+gbooleanparole_media_list_is_selected_row
(ParoleMediaList *list);
+
GtkTreeRowReference*parole_media_list_get_selected_row
(ParoleMediaList *list);
GtkTreeRowReference *parole_media_list_get_next_row
(ParoleMediaList *list,
diff --git a/parole/parole-player.c b/parole/parole-player.c
index 70d450b..391d211 100644
--- a/parole/parole-player.c
+++ b/parole/parole-player.c
@@ -563,9 +563,11 @@ parole_player_stopped (ParolePlayer *player)
player-priv-state = PAROLE_MEDIA_STATE_STOPPED;
-gtk_widget_set_sensitive (player-priv-play_pause, FALSE);
+gtk_widget_set_sensitive (player-priv-play_pause,
+ parole_media_list_is_selected_row
(player-priv-list));
-/* Set the stop widget insensitive only if we are not going to got to
playing
+/*
+ * Set the stop widget insensitive only if we are not going to got to
playing
* state, this give the possibility to press on it if the media get stuck
* for some reason.
*/
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix playlist interface name to correctly add media file from the command line
Updating branch refs/heads/master
to ae52c422cdda334800f03b32a72f280b9043d15d (commit)
from e6e9c2f47561081d3608f60f122250f5ba300b77 (commit)
commit ae52c422cdda334800f03b32a72f280b9043d15d
Author: Ali Abdallah a...@ali-xfce.org
Date: Tue Sep 29 10:46:58 2009 +
Fix playlist interface name to correctly add media file from the command
line
parole/main.c |4 ++--
parole/parole-dbus.c |6 +++---
parole/parole-dbus.h | 14 +-
parole/parole-medialist.c |2 +-
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/parole/main.c b/parole/main.c
index 12cf675..be22829 100644
--- a/parole/main.c
+++ b/parole/main.c
@@ -120,7 +120,7 @@ parole_send (gchar **filenames)
{
DBusGProxy *proxy;
-proxy = parole_get_proxy ();
+proxy = parole_get_proxy (PAROLE_DBUS_PLAYLIST_PATH,
PAROLE_DBUS_PLAYLIST_INTERFACE);
if ( !proxy )
g_error (Unable to create proxy for %s, PAROLE_DBUS_NAME);
@@ -139,7 +139,7 @@ parole_send_message (const gchar *message)
DBusGProxy *proxy;
GError *error = NULL;
-proxy = parole_get_proxy ();
+proxy = parole_get_proxy (PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE);
dbus_g_proxy_call (proxy, message, error,
G_TYPE_INVALID,
diff --git a/parole/parole-dbus.c b/parole/parole-dbus.c
index 3e8f0a3..8312422 100644
--- a/parole/parole-dbus.c
+++ b/parole/parole-dbus.c
@@ -58,7 +58,7 @@ parole_g_session_bus_get (void)
}
DBusGProxy *
-parole_get_proxy (void)
+parole_get_proxy (const gchar *path, const gchar *iface)
{
DBusGConnection *bus;
DBusGProxy *proxy;
@@ -67,8 +67,8 @@ parole_get_proxy (void)
proxy = dbus_g_proxy_new_for_name (bus,
PAROLE_DBUS_NAME,
- PAROLE_DBUS_PATH,
- PAROLE_DBUS_INTERFACE);
+ path,
+ iface);
if ( !proxy )
g_error (Unable to create proxy for %s, PAROLE_DBUS_NAME);
diff --git a/parole/parole-dbus.h b/parole/parole-dbus.h
index a70fcab..836ccae 100644
--- a/parole/parole-dbus.h
+++ b/parole/parole-dbus.h
@@ -23,14 +23,18 @@
#include dbus/dbus-glib.h
-#define PAROLE_DBUS_NAME org.Parole.Media.Player
-#define PAROLE_DBUS_PATH /org/Parole/Media/Player
-#define PAROLE_DBUS_LIST_PATH /org/Parole/Media/List
-#define PAROLE_DBUS_INTERFACE org.Parole.Media.Player
+#define PAROLE_DBUS_NAME org.Parole.Media.Player
+
+#define PAROLE_DBUS_PATH /org/Parole/Media/Player
+#define PAROLE_DBUS_PLAYLIST_PATH /org/Parole/Media/List
+
+#define PAROLE_DBUS_INTERFACE org.Parole.Media.Player
+#define PAROLE_DBUS_PLAYLIST_INTERFACE org.Parole.Media.List
DBusGConnection*parole_g_session_bus_get (void);
-DBusGProxy *parole_get_proxy (void);
+DBusGProxy *parole_get_proxy (const gchar
*path,
+const gchar
*iface);
gbooleanparole_dbus_name_has_owner (const gchar
*name);
diff --git a/parole/parole-medialist.c b/parole/parole-medialist.c
index 910adb3..ab5144f 100644
--- a/parole/parole-medialist.c
+++ b/parole/parole-medialist.c
@@ -1302,7 +1302,7 @@ static void
parole_media_list_dbus_init (ParoleMediaList *list)
{
dbus_g_connection_register_g_object (parole_g_session_bus_get (),
-PAROLE_DBUS_LIST_PATH,
+PAROLE_DBUS_PLAYLIST_PATH,
G_OBJECT (list));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Play the first row if no row selected
Updating branch refs/heads/master
to 4c516026911d35ba6a8d9f30bdecb4996a3e3c3b (commit)
from 9ed4c72d9422cb432271af63e6f749ad77095fc4 (commit)
commit 4c516026911d35ba6a8d9f30bdecb4996a3e3c3b
Author: Ali Abdallah a...@ali-xfce.org
Date: Tue Sep 29 11:57:06 2009 +
Play the first row if no row selected
parole/parole-medialist.c | 20
parole/parole-medialist.h |4
parole/parole-player.c| 15 ++-
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/parole/parole-medialist.c b/parole/parole-medialist.c
index 19cf63c..d4a7ae5 100644
--- a/parole/parole-medialist.c
+++ b/parole/parole-medialist.c
@@ -1203,6 +1203,26 @@ gboolean parole_media_list_is_selected_row
(ParoleMediaList *list)
return gtk_tree_selection_count_selected_rows (list-priv-sel) 0;
}
+gboolean parole_media_list_is_empty (ParoleMediaList *list)
+{
+GtkTreeIter iter;
+
+return !gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list-priv-store),
iter);
+}
+
+GtkTreeRowReference *parole_media_list_get_first_row (ParoleMediaList *list)
+{
+GtkTreeRowReference *row = NULL;
+GtkTreeIter iter;
+
+if ( gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list-priv-store),
iter) )
+{
+ row = parole_media_list_get_row_reference_from_iter (list, iter, TRUE);
+}
+
+return row;
+}
+
GtkTreeRowReference *parole_media_list_get_selected_row (ParoleMediaList *list)
{
return parole_media_list_get_first_selected_row (list);
diff --git a/parole/parole-medialist.h b/parole/parole-medialist.h
index 4d0a922..692144a 100644
--- a/parole/parole-medialist.h
+++ b/parole/parole-medialist.h
@@ -71,6 +71,10 @@ void parole_media_list_load
(ParoleMediaList *list);
gbooleanparole_media_list_is_selected_row
(ParoleMediaList *list);
+gbooleanparole_media_list_is_empty
(ParoleMediaList *list);
+
+GtkTreeRowReference *parole_media_list_get_first_row
(ParoleMediaList *list);
+
GtkTreeRowReference*parole_media_list_get_selected_row
(ParoleMediaList *list);
GtkTreeRowReference *parole_media_list_get_next_row
(ParoleMediaList *list,
diff --git a/parole/parole-player.c b/parole/parole-player.c
index 391d211..1289592 100644
--- a/parole/parole-player.c
+++ b/parole/parole-player.c
@@ -381,8 +381,11 @@ parole_player_uri_opened_cb (ParoleMediaList *list, const
gchar *uri, ParolePlay
static void
parole_player_media_cursor_changed_cb (ParoleMediaList *list, gboolean
media_selected, ParolePlayer *player)
{
-if (player-priv-state != PAROLE_MEDIA_STATE_PLAYING)
- gtk_widget_set_sensitive (player-priv-play_pause, media_selected);
+if (player-priv-state PAROLE_MEDIA_STATE_PAUSED)
+{
+ gtk_widget_set_sensitive (player-priv-play_pause,
+ media_selected || !parole_media_list_is_empty
(player-priv-list));
+}
}
static void
@@ -564,7 +567,8 @@ parole_player_stopped (ParolePlayer *player)
player-priv-state = PAROLE_MEDIA_STATE_STOPPED;
gtk_widget_set_sensitive (player-priv-play_pause,
- parole_media_list_is_selected_row
(player-priv-list));
+ parole_media_list_is_selected_row
(player-priv-list) ||
+ !parole_media_list_is_empty (player-priv-list));
/*
* Set the stop widget insensitive only if we are not going to got to
playing
@@ -599,10 +603,11 @@ parole_player_play_selected_row (ParolePlayer *player)
row = parole_media_list_get_selected_row (player-priv-list);
+if ( row == NULL )
+ row = parole_media_list_get_first_row (player-priv-list);
+
if ( row )
-{
parole_player_media_activated_cb (player-priv-list, row, player);
-}
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master For now add the generated desktop file to POTFILES.skip.
Updating branch refs/heads/master to 1fcf6769c9ae4b0298185d7f43214ac29652d533 (commit) from 4c060d04dd55b57e93f3903d9f05899703280539 (commit) commit 1fcf6769c9ae4b0298185d7f43214ac29652d533 Author: Nick Schermer n...@xfce.org Date: Tue Sep 29 12:07:11 2009 +0200 For now add the generated desktop file to POTFILES.skip. This won't be needed anymore until we drop the old plugin implementation. Frankly I don't really understand why this is needed at all, but atleast it makes the buildbot do its job. po/POTFILES.skip |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.skip b/po/POTFILES.skip new file mode 100644 index 000..73043bf --- /dev/null +++ b/po/POTFILES.skip @@ -0,0 +1,3 @@ +# temporarily needed to make distcheck work, until we drop the old +# panel plugin implementation. +panel-plugin/xfsm-logout-plugin.desktop.in ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix the compiler warnings in tdb.
Updating branch refs/heads/master
to 5c38ecbcf4f13e9921214580f1d514bcc5c21e0a (commit)
from 1775eff4f5182a11c551fbe708b2a8f9a7e7fe37 (commit)
commit 5c38ecbcf4f13e9921214580f1d514bcc5c21e0a
Author: Nick Schermer n...@xfce.org
Date: Tue Sep 29 12:48:21 2009 +0200
Fix the compiler warnings in tdb.
tdb/tdb.c |2 +-
tdb/tdb.h |2 ++
tdb/tdbtool.c | 30 +++---
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/tdb/tdb.c b/tdb/tdb.c
index fcef5b6..23d0bf0 100644
--- a/tdb/tdb.c
+++ b/tdb/tdb.c
@@ -745,7 +745,7 @@ update:
static int expand_file(TDB_CONTEXT *tdb, tdb_off size, tdb_off addition)
{
char buf[1024];
-#if HAVE_FTRUNCATE_EXTEND
+#ifdef HAVE_FTRUNCATE_EXTEND
if (ftruncate(tdb-fd, size+addition) != 0) {
TDB_LOG((tdb, 0, expand_file ftruncate to %d failed (%s)\n,
size+addition, strerror(errno)));
diff --git a/tdb/tdb.h b/tdb/tdb.h
index 84b83dc..5567d4a 100644
--- a/tdb/tdb.h
+++ b/tdb/tdb.h
@@ -147,6 +147,8 @@ void tdb_unlockall(TDB_CONTEXT *tdb);
void tdb_set_lock_alarm(sig_atomic_t *palarm);
int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
+int tdb_chainlock_read(TDB_CONTEXT *tdb, TDB_DATA key);
+int tdb_chainunlock_read(TDB_CONTEXT *tdb, TDB_DATA key);
/* Debug functions. Not used in production. */
void tdb_dump_all(TDB_CONTEXT *tdb);
diff --git a/tdb/tdbtool.c b/tdb/tdbtool.c
index 87d43c4..857a140 100644
--- a/tdb/tdbtool.c
+++ b/tdb/tdbtool.c
@@ -129,7 +129,7 @@ static char *get_token(int startover)
return start;
}
-static int open_dump_file()
+static int open_dump_file(void)
{
int retval = 0;
char *tok = get_token(0);
@@ -148,7 +148,7 @@ static int open_dump_file()
return(retval);
}
-static void close_dump_file()
+static void close_dump_file(void)
{
if(pDumpFile != NULL pDumpFile != stdout) {
fclose(pDumpFile);
@@ -340,7 +340,7 @@ static void delete_tdb(void)
}
}
-static int print_rec(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void
*state)
+static int print_rec(TDB_CONTEXT *context, TDB_DATA key, TDB_DATA dbuf, void
*state)
{
fprintf(pDumpFile,\nkey %u bytes\n, (unsigned) key.dsize);
print_asc((unsigned char*)key.dptr, key.dsize);
@@ -349,7 +349,7 @@ static int print_rec(TDB_CONTEXT *tdb, TDB_DATA key,
TDB_DATA dbuf, void *state)
return 0;
}
-static int print_key(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void
*state)
+static int print_key(TDB_CONTEXT *context, TDB_DATA key, TDB_DATA dbuf, void
*state)
{
print_asc((unsigned char*)key.dptr, key.dsize);
printf(\n);
@@ -358,7 +358,7 @@ static int print_key(TDB_CONTEXT *tdb, TDB_DATA key,
TDB_DATA dbuf, void *state)
static int total_bytes;
-static int traverse_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void
*state)
+static int traverse_fn(TDB_CONTEXT *context, TDB_DATA key, TDB_DATA dbuf, void
*state)
{
total_bytes += dbuf.dsize;
return 0;
@@ -387,34 +387,34 @@ static char *tdb_getline(char *prompt)
return p?line:NULL;
}
-static int do_delete_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf,
+static int do_delete_fn(TDB_CONTEXT *context, TDB_DATA key, TDB_DATA dbuf,
void *state)
{
-return tdb_delete(tdb, key);
+return tdb_delete(context, key);
}
-static void first_record(TDB_CONTEXT *tdb, TDB_DATA *pkey)
+static void first_record(TDB_CONTEXT *context, TDB_DATA *pkey)
{
TDB_DATA dbuf;
- *pkey = tdb_firstkey(tdb);
+ *pkey = tdb_firstkey(context);
- dbuf = tdb_fetch(tdb, *pkey);
+ dbuf = tdb_fetch(context, *pkey);
if (!dbuf.dptr) terror(fetch failed);
/* printf(%s : %*.*s\n, k, (int)dbuf.dsize, (int)dbuf.dsize, dbuf.dptr); */
- print_rec(tdb, *pkey, dbuf, NULL);
+ print_rec(context, *pkey, dbuf, NULL);
}
-static void next_record(TDB_CONTEXT *tdb, TDB_DATA *pkey)
+static void next_record(TDB_CONTEXT *context, TDB_DATA *pkey)
{
TDB_DATA dbuf;
- *pkey = tdb_nextkey(tdb, *pkey);
+ *pkey = tdb_nextkey(context, *pkey);
- dbuf = tdb_fetch(tdb, *pkey);
+ dbuf = tdb_fetch(context, *pkey);
if (!dbuf.dptr)
terror(fetch failed);
else
/* printf(%s : %*.*s\n, k, (int)dbuf.dsize, (int)dbuf.dsize, dbuf.dptr);
*/
-print_rec(tdb, *pkey, dbuf, NULL);
+print_rec(context, *pkey, dbuf, NULL);
}
int main(int argc, char *argv[])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add -Wno-sign-compare to the compiler flags used for gtk-doc.
Updating branch refs/heads/master to a887ee18e02d6d862767dceecfdde6e57e90155a (commit) from 5c38ecbcf4f13e9921214580f1d514bcc5c21e0a (commit) commit a887ee18e02d6d862767dceecfdde6e57e90155a Author: Jannis Pohlmann jan...@xfce.org Date: Tue Sep 29 14:32:27 2009 +0200 Add -Wno-sign-compare to the compiler flags used for gtk-doc. This workaround is borrowed from xfconf. gtkdoc-scangobj.in compares gint64 to gulong which causes a compiler error with -Wno-sign-compare. An upstream bug was filed on http://bugzilla.gnome.org/show_bug.cgi?id=596730 configure.in.in|6 ++ docs/reference/thunarx/Makefile.am |3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 50693c9..4cc3236 100644 --- a/configure.in.in +++ b/configure.in.in @@ -205,6 +205,12 @@ dnl *** Check for debugging support *** dnl *** XDT_FEATURE_DEBUG([thunar_debug_default]) +dnl * +dnl *** Compensate for broken gtk-doc *** +dnl * +XDT_SUPPORTED_FLAGS([GTK_DOC_EXTRA_CFLAGS], [-Wno-sign-compare]) +AC_SUBST([GTK_DOC_EXTRA_CFLAGS]) + dnl ** dnl *** Check for linker optimizations *** dnl ** diff --git a/docs/reference/thunarx/Makefile.am b/docs/reference/thunarx/Makefile.am index 92b1b01..e25361e 100644 --- a/docs/reference/thunarx/Makefile.am +++ b/docs/reference/thunarx/Makefile.am @@ -49,7 +49,8 @@ content_files = \ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(GTK_CFLAGS) + $(GTK_CFLAGS) \ + $(GTK_DOC_EXTRA_CFLAGS) GTKDOC_LIBS = \ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Prepare buildbot notifications in post-receive, send in post-update.
Updating branch refs/heads/master to c99304a2905cebfda3da74774b7e55b0d650102e (commit) from 1a3455349145bd8a8564a517c83a8402caf938b1 (commit) commit c99304a2905cebfda3da74774b7e55b0d650102e Author: Jannis Pohlmann jan...@xfce.org Date: Tue Sep 29 13:54:43 2009 +0200 Prepare buildbot notifications in post-receive, send in post-update. The post-receive hook now writes its three parameters into /var/spool/git-buildbot-updates and the post-update hook later reads these lines and passes them to the buildbot update script one by one. To avoid conflicts or corrupted files, we're using flock here. The post-receive hook obtains an exclusive lock while the post-update hook only needs a shared lock. hooks/post-receive-01-buildbot | 17 +++-- hooks/post-update-02-buildbot | 24 post-receive |5 + post-update| 11 +++ 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot index a63e550..9babcda 100755 --- a/hooks/post-receive-01-buildbot +++ b/hooks/post-receive-01-buildbot @@ -1,10 +1,23 @@ #!/bin/sh +QUEUE_FILE=/var/spool/git-buildbot-updates +LOCK_FILE=/var/spool/.git-buildbot-updates-lock + if echo $0 | grep -q '^/'; then mydir=`dirname $0` else mydir=`pwd`/`dirname $0` fi -# Do nothing for now until this is tested. -echo $1 $2 $3 | $mydir/git_buildbot.py /dev/null +( + # Obtain an exclusive lock for writing to the queue file + flock --exclusive --timeout 10 200 + + # Append the post-receive information to the queue file + echo $1 $2 $3 $QUEUE_FILE + + # Make sure to unlock the file when the command is aborted + trap 'flock --unlock 200' INT TERM EXIT +) 200$LOCK_FILE + +# echo $1 $2 $3 | $mydir/git_buildbot.py /dev/null diff --git a/hooks/post-update-02-buildbot b/hooks/post-update-02-buildbot new file mode 100755 index 000..2cba543 --- /dev/null +++ b/hooks/post-update-02-buildbot @@ -0,0 +1,24 @@ +#!/bin/sh + +QUEUE_FILE=/var/spool/git-buildbot-updates +LOCK_FILE=/var/spool/.git-buildbot-updates-lock + +if echo $0 | grep -q '^/'; then + mydir=`dirname $0` +else + mydir=`pwd`/`dirname $0` +fi + +( + # Obtain a shared lock for reading from the queue file + flock --shared --timeout 10 200 + + # Read the post-receive information from the file step by + # step and let the buildbot know about it + cat $QUEUE_FILE | while read P1 P2 P3; do +echo $P1 $P2 $P3 | $mydir/git_buildbot.py + done + + # Make sure to unlock the file when the command is aborted + trap 'flock --unlock 200' INT TERM EXIT +) 200$LOCK_FILE diff --git a/post-receive b/post-receive index cb15993..06041a3 100755 --- a/post-receive +++ b/post-receive @@ -2,8 +2,6 @@ XFCE_GIT_HOOK_DIR=/usr/local/share/xfce-git-hooks -XFCE_GIT_HOOK_DIR=/usr/local/share/xfce-git-hooks - if [ -z $GIT_DIR ]; then echo GIT_DIR is unset! 2 exit 1 @@ -15,6 +13,5 @@ export REPO=`basename $parent`/`basename $path` unset parent path while read oldrev newrev refname; do - $XFCE_GIT_HOOK_DIR/hooks/post-receive-01-buildbot \ -$oldrev $newrev $refname + $XFCE_GIT_HOOK_DIR/hooks/post-receive-01-buildbot $oldrev $newrev $refname done diff --git a/post-update b/post-update index daaf191..92a20ed 100755 --- a/post-update +++ b/post-update @@ -2,4 +2,15 @@ XFCE_GIT_HOOK_DIR=/usr/local/share/xfce-git-hooks +if [ -z $GIT_DIR ]; then + echo GIT_DIR is unset! 2 + exit 1 +fi + +[[ $GIT_DIR = . ]] path=`pwd` || path=$GIT_DIR +parent=`dirname $path` +export REPO=`basename $parent`/`basename $path` +unset parent path + $XFCE_GIT_HOOK_DIR/hooks/post-update-01-server-info +$XFCE_GIT_HOOK_DIR/hooks/post-update-02-buildbot ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Use /var/spool/git-buildbot/{updates, lockfile} for buildbot updates.
Updating branch refs/heads/master
to 8e17f7716b69e8b4bd9d72b79026183be2b27d82 (commit)
from c99304a2905cebfda3da74774b7e55b0d650102e (commit)
commit 8e17f7716b69e8b4bd9d72b79026183be2b27d82
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Sep 29 14:35:54 2009 +0200
Use /var/spool/git-buildbot/{updates,lockfile} for buildbot updates.
Otherwise: permission denied.
hooks/post-receive-01-buildbot |4 ++--
hooks/post-update-02-buildbot |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot
index 9babcda..884a490 100755
--- a/hooks/post-receive-01-buildbot
+++ b/hooks/post-receive-01-buildbot
@@ -1,7 +1,7 @@
#!/bin/sh
-QUEUE_FILE=/var/spool/git-buildbot-updates
-LOCK_FILE=/var/spool/.git-buildbot-updates-lock
+QUEUE_FILE=/var/spool/git-buildbot/updates
+LOCK_FILE=/var/spool/git-buildbot/lockfile
if echo $0 | grep -q '^/'; then
mydir=`dirname $0`
diff --git a/hooks/post-update-02-buildbot b/hooks/post-update-02-buildbot
index 2cba543..0a6d85e 100755
--- a/hooks/post-update-02-buildbot
+++ b/hooks/post-update-02-buildbot
@@ -1,7 +1,7 @@
#!/bin/sh
-QUEUE_FILE=/var/spool/git-buildbot-updates
-LOCK_FILE=/var/spool/.git-buildbot-updates-lock
+QUEUE_FILE=/var/spool/git-buildbot/updates
+LOCK_FILE=/var/spool/git-buildbot/lockfile
if echo $0 | grep -q '^/'; then
mydir=`dirname $0`
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master Allow ssh as known filemanager uri too.
Updating branch refs/heads/master
to 9a43e56e99308390be5e26d8b0c1cd9f9c5627eb (commit)
from a27374fec0c3347c64fdc8ede93185bd45d2f34f (commit)
commit 9a43e56e99308390be5e26d8b0c1cd9f9c5627eb
Author: Nick Schermer n...@xfce.org
Date: Tue Sep 29 14:57:29 2009 +0200
Allow ssh as known filemanager uri too.
exo-gio-module/exo-module.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/exo-gio-module/exo-module.c b/exo-gio-module/exo-module.c
index 94866e4..e498af9 100644
--- a/exo-gio-module/exo-module.c
+++ b/exo-gio-module/exo-module.c
@@ -69,7 +69,7 @@ static KnownSchemes known_schemes[] =
{
{ ^(https?|ftps|gopher)$, WebBrowser },
{ ^mailto$, MailReader },
- { ^(file|trash)$, FileManager }
+ { ^(file|trash|ssh)$, FileManager }
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Delete the buildbot notification queue file after processing it.
Updating branch refs/heads/master to 1bdc9bc50c2eaf7e46eff20e315a3fbf95a45358 (commit) from 8e17f7716b69e8b4bd9d72b79026183be2b27d82 (commit) commit 1bdc9bc50c2eaf7e46eff20e315a3fbf95a45358 Author: Jannis Pohlmann jan...@xfce.org Date: Tue Sep 29 15:06:24 2009 +0200 Delete the buildbot notification queue file after processing it. hooks/post-update-02-buildbot |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hooks/post-update-02-buildbot b/hooks/post-update-02-buildbot index 0a6d85e..013dd16 100755 --- a/hooks/post-update-02-buildbot +++ b/hooks/post-update-02-buildbot @@ -19,6 +19,9 @@ fi echo $P1 $P2 $P3 | $mydir/git_buildbot.py done + # Delete the queue file + rm -f $QUEUE_FILE + # Make sure to unlock the file when the command is aborted trap 'flock --unlock 200' INT TERM EXIT ) 200$LOCK_FILE ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix another TDB warning (st.st_size compare to a size_t value).
Updating branch refs/heads/master
to 7b7a01ae6ba9bbcfe674772df0e0edb0a5e36f65 (commit)
from a887ee18e02d6d862767dceecfdde6e57e90155a (commit)
commit 7b7a01ae6ba9bbcfe674772df0e0edb0a5e36f65
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Sep 29 15:33:42 2009 +0200
Fix another TDB warning (st.st_size compare to a size_t value).
tdb/tdb.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tdb/tdb.c b/tdb/tdb.c
index 23d0bf0..898316a 100644
--- a/tdb/tdb.c
+++ b/tdb/tdb.c
@@ -368,7 +368,7 @@ static int tdb_oob(TDB_CONTEXT *tdb, tdb_off len, int probe)
if (fstat(tdb-fd, st) == -1)
return TDB_ERRCODE(TDB_ERR_IO, -1);
- if (st.st_size (size_t)len) {
+ if (st.st_size (off_t)len) {
if (!probe) {
/* Ensure ecode is set for log fn. */
tdb-ecode = TDB_ERR_IO;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix compiler warnings/errors in the trash panel applet.
Updating branch refs/heads/master
to 3a37a385567711a271d86eaeb9b9fe09acc904f8 (commit)
from 7b7a01ae6ba9bbcfe674772df0e0edb0a5e36f65 (commit)
commit 3a37a385567711a271d86eaeb9b9fe09acc904f8
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Sep 29 15:41:15 2009 +0200
Fix compiler warnings/errors in the trash panel applet.
plugins/thunar-tpa/thunar-tpa-icon.c |6 ++
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/plugins/thunar-tpa/thunar-tpa-icon.c
b/plugins/thunar-tpa/thunar-tpa-icon.c
index b6cf309..d6b22b9 100644
--- a/plugins/thunar-tpa/thunar-tpa-icon.c
+++ b/plugins/thunar-tpa/thunar-tpa-icon.c
@@ -43,8 +43,6 @@ enum
-static void thunar_tpa_icon_class_init (ThunarTpaIconClass
*klass);
-static void thunar_tpa_icon_init(ThunarTpaIcon *icon);
static void thunar_tpa_icon_finalize(GObject
*object);
static void thunar_tpa_icon_get_property(GObject
*object,
guint
prop_id,
@@ -431,7 +429,7 @@ thunar_tpa_icon_drag_data_received (GtkWidget
*button,
gint y,
GtkSelectionData *selection_data,
guint info,
-guint time,
+guint timestamp,
ThunarTpaIcon*icon)
{
gboolean succeed = FALSE;
@@ -454,7 +452,7 @@ thunar_tpa_icon_drag_data_received (GtkWidget
*button,
}
/* finish the drag */
- gtk_drag_finish (context, succeed, TRUE, time);
+ gtk_drag_finish (context, succeed, TRUE, timestamp);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix a few more compiler warnings. Those don't seem problematic though.
Updating branch refs/heads/master
to 7956289251706d893e6db938145ee9777ee6bf51 (commit)
from 3a37a385567711a271d86eaeb9b9fe09acc904f8 (commit)
commit 7956289251706d893e6db938145ee9777ee6bf51
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Sep 29 15:58:26 2009 +0200
Fix a few more compiler warnings. Those don't seem problematic though.
tdb/tdbspeed.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tdb/tdbspeed.c b/tdb/tdbspeed.c
index 74b091d..f5e5255 100644
--- a/tdb/tdbspeed.c
+++ b/tdb/tdbspeed.c
@@ -75,12 +75,12 @@ static TDB_CONTEXT *db;
struct timeval tp1,tp2;
-static void start_timer()
+static void start_timer(void)
{
gettimeofday(tp1,NULL);
}
-static double end_timer()
+static double end_timer(void)
{
gettimeofday(tp2,NULL);
return((tp2.tv_sec - tp1.tv_sec) +
@@ -162,8 +162,8 @@ struct tdb_flag {
int main(int argc, char *argv[])
{
- int i, j, seed=0;
- int k;
+ int seed=0;
+ unsigned int i, k, j;
/* Precook random buffers */
randdata = malloc(1 * sizeof(randdata[0]));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Make trash context and file menu action sensitive if trash has files.
Updating branch refs/heads/master to bb7bd714867f89dfb0007120fca7932a9af0a3e6 (commit) from 7956289251706d893e6db938145ee9777ee6bf51 (commit) commit bb7bd714867f89dfb0007120fca7932a9af0a3e6 Author: Jannis Pohlmann jan...@xfce.org Date: Tue Sep 29 16:51:47 2009 +0200 Make trash context and file menu action sensitive if trash has files. thunar/thunar-window.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c index 5200dc6..04fb7cf 100644 --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -2391,7 +2391,7 @@ thunar_window_current_directory_changed (ThunarFile *current_directory, /* update the Empty Trash action */ action = gtk_action_group_get_action (window-action_group, empty-trash); - gtk_action_set_sensitive (action, (thunar_file_get_size (current_directory) 0)); + gtk_action_set_sensitive (action, (thunar_file_get_item_count (current_directory) 0)); gtk_action_set_visible (action, (thunar_file_is_root (current_directory) thunar_file_is_trashed (current_directory))); /* set window title and icon */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master Fix some remaining compiler warnings.
Updating branch refs/heads/master
to 7dd47feaee0069381b44203094c23bfd592a35a5 (commit)
from 1fcf6769c9ae4b0298185d7f43214ac29652d533 (commit)
commit 7dd47feaee0069381b44203094c23bfd592a35a5
Author: Nick Schermer n...@xfce.org
Date: Tue Sep 29 17:18:46 2009 +0200
Fix some remaining compiler warnings.
Just like we do with the other generated files from
gdk-pixbuf-csource, include the nopreview.h file with
the guchar fix to prevent compiler warnings.
settings/Makefile.am|1 -
settings/nopreview.h| 675 +++
xfce4-session-logout/main.c |2 +-
xfce4-session/main.c|2 +-
4 files changed, 677 insertions(+), 3 deletions(-)
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 0bc1b42..5f53ed6 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -56,7 +56,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
if MAINTAINER_MODE
BUILT_SOURCES = \
- nopreview.h \
xfce4-session-marshal.c \
xfce4-session-marshal.h \
xfce4-session-settings_glade.h \
diff --git a/settings/nopreview.h b/settings/nopreview.h
new file mode 100644
index 000..5cbceee
--- /dev/null
+++ b/settings/nopreview.h
@@ -0,0 +1,675 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
+static const GdkPixdata nopreview = {
+ 0x47646b50, /* Pixbuf magic: 'GdkP' */
+ 24 + 20181, /* header length + pixel_data length */
+ 0x2010002, /* pixdata_type */
+ 1280, /* rowstride */
+ 320, /* width */
+ 240, /* height */
+ /* pixel_data: */
+ (guchar
*)\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+ \0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377
+ \0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0
+ \377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0
+
[Xfce4-commits] midori:master Notify MidoriBrowser::tab property properly
Updating branch refs/heads/master to f530218492f367fe60bf78dfd80e93c216571f3e (commit) from 7a5329a1e0467c87d62faa972c0138a67da39b00 (commit) commit f530218492f367fe60bf78dfd80e93c216571f3e Author: Christian Dywan christ...@twotoasts.de Date: Tue Sep 29 20:49:30 2009 +0200 Notify MidoriBrowser::tab property properly midori/midori-browser.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 3e722ab..d7b0df1 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4255,7 +4255,10 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, if (browser-proxy_array) katze_item_set_meta_integer (KATZE_ITEM (browser-proxy_array), current, midori_browser_get_current_page (browser)); +g_object_freeze_notify (G_OBJECT (browser)); g_object_notify (G_OBJECT (browser), uri); +g_object_notify (G_OBJECT (browser), tab); +g_object_thaw_notify (G_OBJECT (browser)); _midori_browser_set_statusbar_text (browser, NULL); _midori_browser_update_interface (browser); @@ -4271,7 +4274,10 @@ midori_browser_notebook_page_reordered_cb (GtkNotebook* notebook, KatzeItem* item = midori_view_get_proxy_item (view); katze_array_move_item (browser-proxy_array, item, page_num); +g_object_freeze_notify (G_OBJECT (browser)); g_object_notify (G_OBJECT (browser), uri); +g_object_notify (G_OBJECT (browser), tab); +g_object_thaw_notify (G_OBJECT (browser)); } static gboolean ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Update tab panel selection when tabs are switched, opened or closed
Updating branch refs/heads/master
to 0e0ce115f957ccf0667296fc71b182af69f80c48 (commit)
from f530218492f367fe60bf78dfd80e93c216571f3e (commit)
commit 0e0ce115f957ccf0667296fc71b182af69f80c48
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Sep 29 20:50:04 2009 +0200
Update tab panel selection when tabs are switched, opened or closed
A convenince function tab_panel_get_iter_for_view is introduced
to make finding the right iter easier.
extensions/tab-panel.c | 120 +---
1 files changed, 63 insertions(+), 57 deletions(-)
diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c
index 0feb2c0..df6c70d 100644
--- a/extensions/tab-panel.c
+++ b/extensions/tab-panel.c
@@ -35,6 +35,11 @@ tab_panel_browser_remove_tab_cb (MidoriBrowser* browser,
MidoriExtension* extension);
static void
+tab_panel_browser_notify_tab_cb (MidoriBrowser* browser,
+ GParamSpec*pspec,
+ GtkTreeView* treeview);
+
+static void
tab_panel_view_notify_minimized_cb (GtkWidget* view,
GParamSpec* pspec,
MidoriExtension* extension);
@@ -67,22 +72,42 @@ tab_panel_get_toolitem_for_view (GtkWidget* view)
return g_object_get_data (G_OBJECT (view), tab-panel-ext-toolitem);
}
+static gboolean
+tab_panel_get_iter_for_view (GtkTreeModel* model,
+ GtkTreeIter* iter,
+ gpointer view)
+{
+guint i = 0;
+
+while (gtk_tree_model_iter_nth_child (model, iter, NULL, i))
+{
+MidoriView* view_;
+
+gtk_tree_model_get (model, iter, 0, view_, -1);
+g_object_unref (view_);
+if (view_ == view)
+return TRUE;
+i++;
+}
+
+return FALSE;
+}
+
static void
tab_panel_deactivate_cb (MidoriExtension* extension,
- GtkWidget* panel)
+ GtkWidget* treeview)
{
MidoriApp* app = midori_extension_get_app (extension);
GtkTreeModel* model;
MidoriBrowser* browser;
-browser = midori_browser_get_for_widget (panel);
+browser = midori_browser_get_for_widget (treeview);
g_object_set (browser, show-tabs, TRUE, NULL);
model = tab_panel_get_model_for_browser (browser);
g_object_unref (model);
-gtk_widget_destroy (panel);
g_signal_handlers_disconnect_by_func (
-extension, tab_panel_deactivate_cb, panel);
+extension, tab_panel_deactivate_cb, treeview);
g_signal_handlers_disconnect_by_func (
app, tab_panel_app_add_browser_cb, extension);
g_signal_handlers_disconnect_by_func (
@@ -90,6 +115,8 @@ tab_panel_deactivate_cb (MidoriExtension* extension,
g_signal_handlers_disconnect_by_func (
browser, tab_panel_browser_remove_tab_cb, extension);
g_signal_handlers_disconnect_by_func (
+browser, tab_panel_browser_notify_tab_cb, treeview);
+g_signal_handlers_disconnect_by_func (
browser, tab_panel_settings_notify_cb, model);
g_signal_handlers_disconnect_by_func (
browser, tab_panel_view_notify_minimized_cb, extension);
@@ -97,6 +124,8 @@ tab_panel_deactivate_cb (MidoriExtension* extension,
browser, tab_panel_view_notify_icon_cb, extension);
g_signal_handlers_disconnect_by_func (
browser, tab_panel_view_notify_title_cb, extension);
+
+gtk_widget_destroy (treeview);
}
static void
@@ -265,24 +294,8 @@ tab_panel_remove_view (MidoriBrowser* browser,
{
GtkTreeModel* model = tab_panel_get_model_for_browser (browser);
GtkTreeIter iter;
-guint i = 0;
-
-while (gtk_tree_model_iter_nth_child (model, iter, NULL, i))
-{
-MidoriView* view_;
-
-gtk_tree_model_get (model, iter, 0, view_, -1);
-
-if ((MidoriView*)view == view_)
-{
-gtk_tree_store_remove (GTK_TREE_STORE (model), iter);
-g_object_unref (view_);
-break;
-}
-
-g_object_unref (view_);
-i++;
-}
+if (tab_panel_get_iter_for_view (model, iter, view))
+gtk_tree_store_remove (GTK_TREE_STORE (model), iter);
}
}
@@ -317,24 +330,8 @@ tab_panel_view_notify_icon_cb (GtkWidget* view,
{
GtkTreeModel* model = tab_panel_get_model_for_browser (browser);
GtkTreeIter iter;
-guint i = 0;
-
-while (gtk_tree_model_iter_nth_child (model, iter, NULL, i))
-{
-MidoriView* view_;
-
-gtk_tree_model_get (model, iter, 0, view_, -1);
-
-if ((MidoriView*)view == view_)
-{
-gtk_tree_store_set (GTK_TREE_STORE (model), iter, 3, icon,
-1);
-g_object_unref (view_);
-break;
-}
-
-
[Xfce4-commits] midori:master Reduce the mount of casts in the browser
Updating branch refs/heads/master
to df88be1aff98f357839fbfe2f7ba29b1fb0bae7e (commit)
from 0e0ce115f957ccf0667296fc71b182af69f80c48 (commit)
commit df88be1aff98f357839fbfe2f7ba29b1fb0bae7e
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Sep 29 22:25:09 2009 +0200
Reduce the mount of casts in the browser
midori/midori-browser.c | 94 +-
1 files changed, 43 insertions(+), 51 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index d7b0df1..074d7ed 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -262,49 +262,44 @@ midori_browser_view_can_set_encoding (MidoriView* view)
static void
_midori_browser_update_interface (MidoriBrowser* browser)
{
-GtkWidget* view;
+GtkWidget* widget;
+MidoriView* view;
gboolean loading;
gboolean can_reload;
GtkAction* action;
-view = midori_browser_get_current_tab (browser);
-loading = midori_view_get_load_status (MIDORI_VIEW (view))
-!= MIDORI_LOAD_FINISHED;
-can_reload = midori_view_can_reload (MIDORI_VIEW (view));
+widget = midori_browser_get_current_tab (browser);
+view = MIDORI_VIEW (widget);
+loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED;
+can_reload = midori_view_can_reload (view);
_action_set_sensitive (browser, Reload, can_reload !loading);
_action_set_sensitive (browser, Stop, can_reload loading);
-_action_set_sensitive (browser, Back,
-midori_view_can_go_back (MIDORI_VIEW (view)));
-_action_set_sensitive (browser, Forward,
-midori_view_can_go_forward (MIDORI_VIEW (view)));
+_action_set_sensitive (browser, Back, midori_view_can_go_back (view));
+_action_set_sensitive (browser, Forward, midori_view_can_go_forward
(view));
gtk_action_set_visible (_action_by_name (browser, AddSpeedDial),
-browser-speed_dial_in_new_tabs !midori_view_is_blank (MIDORI_VIEW
(view)));
+browser-speed_dial_in_new_tabs !midori_view_is_blank (view));
/* Currently views that don't support source, don't support
saving either. If that changes, we need to think of something. */
-_action_set_sensitive (browser, SaveAs,
-midori_view_can_view_source (MIDORI_VIEW (view)));
-_action_set_sensitive (browser, Print,
-midori_view_can_print (MIDORI_VIEW (view)));
-_action_set_sensitive (browser, ZoomIn,
-midori_view_can_zoom_in (MIDORI_VIEW (view)));
-_action_set_sensitive (browser, ZoomOut,
-midori_view_can_zoom_out (MIDORI_VIEW (view)));
+_action_set_sensitive (browser, SaveAs, midori_view_can_view_source
(view));
+_action_set_sensitive (browser, Print, midori_view_can_print (view));
+_action_set_sensitive (browser, ZoomIn, midori_view_can_zoom_in (view));
+_action_set_sensitive (browser, ZoomOut, midori_view_can_zoom_out
(view));
_action_set_sensitive (browser, ZoomNormal,
-midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0f);
+midori_view_get_zoom_level (view) != 1.0f);
_action_set_sensitive (browser, Encoding,
-midori_browser_view_can_set_encoding (MIDORI_VIEW (view)));
+midori_browser_view_can_set_encoding (view));
_action_set_sensitive (browser, SourceView,
-midori_view_can_view_source (MIDORI_VIEW (view)));
+midori_view_can_view_source (view));
_action_set_sensitive (browser, Find,
-midori_view_can_find (MIDORI_VIEW (view)));
+midori_view_can_find (view));
_action_set_sensitive (browser, FindNext,
-midori_view_can_find (MIDORI_VIEW (view)));
+midori_view_can_find (view));
_action_set_sensitive (browser, FindPrevious,
-midori_view_can_find (MIDORI_VIEW (view)));
+midori_view_can_find (view));
gtk_widget_set_sensitive (GTK_WIDGET (browser-find_highlight),
-midori_view_can_find (MIDORI_VIEW (view)));
+midori_view_can_find (view));
action = gtk_action_group_get_action (browser-action_group, ReloadStop);
if (!loading)
@@ -334,7 +329,7 @@ _midori_browser_update_interface (MidoriBrowser* browser)
{
action = _action_by_name (browser, Location);
midori_location_action_set_progress (MIDORI_LOCATION_ACTION
(action),
-midori_view_get_progress (MIDORI_VIEW (view)));
+midori_view_get_progress (view));
}
}
katze_throbber_set_animated (KATZE_THROBBER (browser-throbber), loading);
@@ -462,27 +457,26 @@ midori_view_notify_icon_cb (MidoriView*view,
}
static void
-midori_view_notify_load_status_cb (GtkWidget* view,
+midori_view_notify_load_status_cb (GtkWidget* widget,
GParamSpec* pspec,
MidoriBrowser* browser)
{
+MidoriView* view = MIDORI_VIEW (widget);
const gchar* uri;
GtkAction* action;
-uri =
[Xfce4-commits] thunar-vcs-plugin:master * tvp-{svn, git}-helper/main.c: Added xfce_textdomain to correctly init translations. * tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty str
Updating branch refs/heads/master
to 4331a369bea25840216c1dea26786077697fc4bd (commit)
from ff3d8b861461414efc3ce272ac567e7059830e97 (commit)
commit 4331a369bea25840216c1dea26786077697fc4bd
Author: Peter de Ridder pe...@xfce.org
Date: Tue Sep 29 23:36:56 2009 +0200
* tvp-{svn,git}-helper/main.c: Added xfce_textdomain to correctly init
translations.
* tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty
string before translations, otherwise the po header will be returned.
* */Makefile.am: Removed deprecated INCLUDES and fix AM_CPPGLAGS
overriding.
ChangeLog | 18 ++
thunar-vcs-plugin/Makefile.am | 20 +---
tvp-git-helper/Makefile.am|3 ++-
tvp-git-helper/main.c |3 +++
tvp-svn-helper/Makefile.am|3 ++-
tvp-svn-helper/main.c |3 +++
tvp-svn-helper/tsh-common.c |4 +++-
7 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 615a8a5..5751442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,22 @@
2009-09-27 Peter de Ridder pe...@xfce.org
- * Made Thuner VCS Plugin compile with --enable-debug=full.
- * Updated the po files.
+
+ * tvp-{svn,git}-helper/main.c: Added xfce_textdomain to correctly init
+ translations.
+ * tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty
+ string before translations, otherwise the po header will be
+ returned.
+ * */Makefile.am: Removed deprecated INCLUDES and fix AM_CPPGLAGS
+ overriding.
2009-09-27 Peter de Ridder pe...@xfce.org
+ * Made Thuner VCS Plugin compile with --enable-debug=full.
+ * Updated the po files.
* autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools
version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of
xfce4-dev-tools, now.
* tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for
directory deletion.
-
-2009-08-27 Peter de Ridder pe...@xfce.org
-
* tvp-svn-helper/tsh-commit.c
tvp-svn-helper/tsh-file-selection-dialog.[ch]: Better file Selector.
Using recursion info in file selection and commit command to be able
@@ -20,9 +25,6 @@
flag.
* tvp-svn-helper/tsh-revert.c: Added
TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN flag.
-
-2009-07-27 Peter de Ridder pe...@xfce.org
-
* tvp-svn-helper/tsh-delete.c(delete_thread): Fixed segfault.
* tvp-svn-helper/tsh-file-selection-dialog.[ch]: Support for
unversioned directory trees.
diff --git a/thunar-vcs-plugin/Makefile.am b/thunar-vcs-plugin/Makefile.am
index a2a396f..e09ef29 100644
--- a/thunar-vcs-plugin/Makefile.am
+++ b/thunar-vcs-plugin/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\thunar-vcs-plugin\\
@@ -31,18 +31,24 @@ thunar_vcs_plugin_la_SOURCES +=
\
tvp-git-action.h
endif
+thunar_vcs_plugin_la_CPPFLAGS =
\
+ $(AM_CPPFLAGS)
+if HAVE_SUBVERSION
+thunar_vcs_plugin_la_CPPFLAGS += \
+ -DTVP_SVN_HELPER=\$(libexecdir)/tvp-svn-helper\
+endif
+if HAVE_GIT
+thunar_vcs_plugin_la_CPPFLAGS += \
+ -DTVP_GIT_HELPER=\$(libexecdir)/tvp-git-helper\
+endif
+
thunar_vcs_plugin_la_CFLAGS = \
$(PLATFORM_CFLAGS) \
$(THUNARX_CFLAGS) \
$(THUNAR_VFS_CFLAGS)
if HAVE_SUBVERSION
thunar_vcs_plugin_la_CFLAGS += \
- $(APR_CFLAGS) \
- -DTVP_SVN_HELPER=\$(libexecdir)/tvp-svn-helper\
-endif
-if HAVE_GIT
-thunar_vcs_plugin_la_CFLAGS += \
- -DTVP_GIT_HELPER=\$(libexecdir)/tvp-git-helper\
+ $(APR_CFLAGS)
endif
thunar_vcs_plugin_la_LDFLAGS = \
diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index e275391..ee231f3 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -36,7 +36,8 @@ tvp_git_helper_SOURCES =
\
tgh-status-dialog.c
tvp_git_helper_CPPFLAGS = \
- -DG_LOG_DOMAIN=\tvp-git-helper\
+ -DG_LOG_DOMAIN=\tvp-git-helper\ \
+ $(AM_CPPFLAGS)
[Xfce4-commits] tumbler:master Rename PixbufThumbnailerThumbnailer to PixbufThumbnailer. More renames.
Updating branch refs/heads/master
to bf87845cd35e6db1abe4e497c502993a5296baee (commit)
from 0fdef5f7449026d9d2bb0da25ef7c3c1846609e2 (commit)
commit bf87845cd35e6db1abe4e497c502993a5296baee
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 30 00:07:28 2009 +0200
Rename PixbufThumbnailerThumbnailer to PixbufThumbnailer. More renames.
plugins/pixbuf-thumbnailer/Makefile.am |4 +-
.../pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c |6 +-
.../pixbuf-thumbnailer-provider.c | 26 ++--
.../pixbuf-thumbnailer-provider.h | 12 +++---
.../pixbuf-thumbnailer-thumbnailer.h | 43
...mbnailer-thumbnailer.c = pixbuf-thumbnailer.c} | 36
plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.h| 43
7 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/plugins/pixbuf-thumbnailer/Makefile.am
b/plugins/pixbuf-thumbnailer/Makefile.am
index c37e99c..1eefd30 100644
--- a/plugins/pixbuf-thumbnailer/Makefile.am
+++ b/plugins/pixbuf-thumbnailer/Makefile.am
@@ -27,8 +27,8 @@ tumbler_pixbuf_thumbnailer_la_SOURCES =
\
pixbuf-thumbnailer-plugin.c \
pixbuf-thumbnailer-provider.c \
pixbuf-thumbnailer-provider.h \
- pixbuf-thumbnailer-thumbnailer.c\
- pixbuf-thumbnailer-thumbnailer.h
+ pixbuf-thumbnailer.c\
+ pixbuf-thumbnailer.h
tumbler_pixbuf_thumbnailer_la_CFLAGS = \
-I$(top_builddir) \
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
index d4beb77..0cf1fc3 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
@@ -29,7 +29,7 @@
#include tumbler/tumbler.h
#include pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h
-#include pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.h
+#include pixbuf-thumbnailer/pixbuf-thumbnailer.h
@@ -63,11 +63,11 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
#endif
/* register the types provided by this plugin */
- pixbuf_thumbnailer_thumbnailer_register (plugin);
+ pixbuf_thumbnailer_register (plugin);
pixbuf_thumbnailer_provider_register (plugin);
/* set up the plugin provider type list */
- type_list[0] = PIXBUF_THUMBNAILER_TYPE_PROVIDER;
+ type_list[0] = TYPE_PIXBUF_THUMBNAILER_PROVIDER;
}
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index 49b6b2d..0726029 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
@@ -30,7 +30,7 @@
#include tumbler/tumbler.h
#include pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h
-#include pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.h
+#include pixbuf-thumbnailer/pixbuf-thumbnailer.h
@@ -103,17 +103,17 @@ pixbuf_thumbnailer_provider_init
(PixbufThumbnailerProvider *provider)
static GList *
pixbuf_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider
*provider)
{
- PixbufThumbnailerThumbnailer *thumbnailer;
- static const gchar *uri_schemes[] = { file, sftp, http,
NULL, };
- GHashTable *types;
- GSList *formats;
- GSList *fp;
- GList*keys;
- GList*lp;
- GList*thumbnailers = NULL;
- GStrv format_types;
- GStrv mime_types;
- gint n;
+ PixbufThumbnailer *thumbnailer;
+ static const gchar *uri_schemes[] = { file, sftp, http, NULL, };
+ GHashTable *types;
+ GSList *formats;
+ GSList *fp;
+ GList *keys;
+ GList *lp;
+ GList *thumbnailers = NULL;
+ GStrv format_types;
+ GStrv mime_types;
+ gintn;
/* create a hash table to collect unique MIME types */
types = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -156,7 +156,7 @@ pixbuf_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provid
mime_types[n] = NULL;
/* create the pixbuf thumbnailer */
- thumbnailer = g_object_new (PIXBUF_THUMBNAILER_TYPE_THUMBNAILER,
+ thumbnailer = g_object_new (TYPE_PIXBUF_THUMBNAILER,
uri-schemes, uri_schemes, mime-types,
mime_types,
NULL);
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h
[Xfce4-commits] tumbler:master Use org.xfce and /org/xfce prefixes instead of freedesktop ones.
Updating branch refs/heads/master to 0fdef5f7449026d9d2bb0da25ef7c3c1846609e2 (commit) from 062d22be89e3b4b9ef02f4a30c128f37c0f80f11 (commit) commit 0fdef5f7449026d9d2bb0da25ef7c3c1846609e2 Author: Jannis Pohlmann jan...@xfce.org Date: Tue Sep 29 23:54:41 2009 +0200 Use org.xfce and /org/xfce prefixes instead of freedesktop ones. The thumbnail management D-Bus specification is not an official freedesktop.org specification yet, so for now we'll stick to our own namespace. INSTALL | 17 ++--- tumblerd/org.xfce.Tumbler.service.in|2 +- tumblerd/tumbler-cache-service-dbus.xml |4 ++-- tumblerd/tumbler-manager-dbus.xml |4 ++-- tumblerd/tumbler-service-dbus.xml |4 ++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/INSTALL b/INSTALL index 8b82ade..2550dab 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ Installation Instructions * Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -159,7 +159,7 @@ Particular systems CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC=cc -Ae + ./configure CC=cc -Ae -D_XOPEN_SOURCE=500 and if that doesn't work, install pre-built binaries of GCC for HP-UX. @@ -174,6 +174,16 @@ and if that doesn't work, try ./configure CC=cc -nodtk + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type == @@ -189,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form: where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't diff --git a/tumblerd/org.xfce.Tumbler.service.in b/tumblerd/org.xfce.Tumbler.service.in index d0ff54d..cdf8b8e 100644 --- a/tumblerd/org.xfce.Tumbler.service.in +++ b/tumblerd/org.xfce.Tumbler.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.freedesktop.thumbnails.Thumbnailer +Name=org.xfce.thumbnails.Thumbnailer ex...@libexecdir@/tumblerd diff --git a/tumblerd/tumbler-cache-service-dbus.xml b/tumblerd/tumbler-cache-service-dbus.xml index 84821da..c72acb5 100644 --- a/tumblerd/tumbler-cache-service-dbus.xml +++ b/tumblerd/tumbler-cache-service-dbus.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? -node name=/org/freedesktop/thumbnails/Cache - interface name=org.freedesktop.thumbnails.Cache +node name=/org/xfce/thumbnails/Cache + interface name=org.xfce.thumbnails.Cache method name=Move annotation name=org.freedesktop.DBus.GLib.Async value=true/ arg type=as name=from_uris direction=in / diff --git a/tumblerd/tumbler-manager-dbus.xml b/tumblerd/tumbler-manager-dbus.xml index 7ce682b..cfc3fef 100644 --- a/tumblerd/tumbler-manager-dbus.xml +++ b/tumblerd/tumbler-manager-dbus.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? -node name=/org/freedesktop/thumbnails/Manager - interface name=org.freedesktop.thumbnails.Manager +node name=/org/xfce/thumbnails/Manager + interface name=org.xfce.thumbnails.Manager method name=Register annotation name=org.freedesktop.DBus.GLib.Async value=true/ arg type=s name=uri_scheme direction=in / diff --git a/tumblerd/tumbler-service-dbus.xml b/tumblerd/tumbler-service-dbus.xml index ebd1e58..c040ceb 100644 --- a/tumblerd/tumbler-service-dbus.xml +++ b/tumblerd/tumbler-service-dbus.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? -node name=/org/freedesktop/thumbnails/Thumbnailer - interface name=org.freedesktop.thumbnails.Thumbnailer +node name=/org/xfce/thumbnails/Thumbnailer + interface name=org.xfce.thumbnails.Thumbnailer method name=Queue annotation name=org.freedesktop.DBus.GLib.Async value=true/ arg type=as name=uris direction=in / ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Merge strings, update translation files.
Updating branch refs/heads/master to 9210c7c85d41f2bd3bc6314f0ead393989e82f3a (commit) from d94aa4686d02796116ec69a6a6bdf6d9154d2384 (commit) commit 9210c7c85d41f2bd3bc6314f0ead393989e82f3a Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 30 02:22:53 2009 +0200 Merge strings, update translation files. po/POTFILES.in | 98 - po/ast.po | 150 +++- po/da.po | 150 +++- po/en_GB.po| 150 +++ po/tr.po | 150 +++- po/tumbler.pot | 130 +++- 6 files changed, 492 insertions(+), 336 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index b924aae..59c7701 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,67 +1,31 @@ -plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c -plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c -plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h -plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.c -plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.h -plugins/xdg-cache/xdg-cache-cache.c -plugins/xdg-cache/xdg-cache-cache.h -plugins/xdg-cache/xdg-cache-plugin.c -plugins/xdg-cache/xdg-cache-provider.c -plugins/xdg-cache/xdg-cache-provider.h -plugins/xdg-cache/xdg-cache-thumbnail.c -plugins/xdg-cache/xdg-cache-thumbnail.h -tumblerd/main.c -tumblerd/stamp-tumbler-marshal.h -tumblerd/tumbler-builtin-thumbnailer.c -tumblerd/tumbler-builtin-thumbnailer.h -tumblerd/tumbler-builtin-thumbnailers.c -tumblerd/tumbler-builtin-thumbnailers.h -tumblerd/tumbler-cache-dbus-bindings.h -tumblerd/tumbler-cache-service.c -tumblerd/tumbler-cache-service-dbus-bindings.h -tumblerd/tumbler-cache-service.h -tumblerd/tumbler-manager.c -tumblerd/tumbler-manager-dbus-bindings.h -tumblerd/tumbler-manager.h -tumblerd/tumbler-naive-scheduler.c -tumblerd/tumbler-naive-scheduler.h -tumblerd/tumbler-registry.c -tumblerd/tumbler-registry.h -tumblerd/tumbler-scheduler.c -tumblerd/tumbler-scheduler.h -tumblerd/tumbler-service.c -tumblerd/tumbler-service-dbus-bindings.h -tumblerd/tumbler-service.h -tumblerd/tumbler-specialized-thumbnailer.c -tumblerd/tumbler-specialized-thumbnailer.h -tumblerd/tumbler-threshold-scheduler.c -tumblerd/tumbler-threshold-scheduler.h -tumblerd/tumbler-utils.h -tumbler/stamp-tumbler-marshal.h -tumbler/tumbler-abstract-thumbnailer.c -tumbler/tumbler-abstract-thumbnailer.h -tumbler/tumbler-cache.c -tumbler/tumbler-cache.h -tumbler/tumbler-cache-provider.c -tumbler/tumbler-cache-provider.h -tumbler/tumbler-config.c -tumbler/tumbler-config.h -tumbler/tumbler-enum-types.c -tumbler/tumbler-enum-types.h -tumbler/tumbler-error.h -tumbler/tumbler-file-info.c -tumbler/tumbler-file-info.h -tumbler/tumbler-glib-extensions.h -tumbler/tumbler.h -tumbler/tumbler-marshal.c -tumbler/tumbler-marshal.h -tumbler/tumbler-provider-factory.c -tumbler/tumbler-provider-factory.h -tumbler/tumbler-provider-plugin.c -tumbler/tumbler-provider-plugin.h -tumbler/tumbler-thumbnail.c -tumbler/tumbler-thumbnailer.c -tumbler/tumbler-thumbnailer.h -tumbler/tumbler-thumbnailer-provider.c -tumbler/tumbler-thumbnailer-provider.h -tumbler/tumbler-thumbnail.h +./tumblerd/tumbler-cache-service.c +./tumblerd/tumbler-service.c +./tumblerd/tumbler-specialized-thumbnailer.c +./tumblerd/tumbler-threshold-scheduler.c +./tumblerd/tumbler-manager.c +./tumblerd/tumbler-scheduler.c +./tumblerd/main.c +./tumblerd/tumbler-registry.c +./tumblerd/tumbler-naive-scheduler.c +./tumbler/tumbler-enum-types.c +./tumbler/tumbler-config.c +./tumbler/tumbler-1.pc +./tumbler/tumbler-cache-provider.c +./tumbler/tumbler-thumbnailer-provider.c +./tumbler/tumbler-provider-factory.c +./tumbler/tumbler-cache.c +./tumbler/tumbler-abstract-thumbnailer.c +./tumbler/tumbler-thumbnail.c +./tumbler/tumbler-file-info.c +./tumbler/tumbler-thumbnailer.c +./tumbler/tumbler-provider-plugin.c +./plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c +./plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c +./plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c +./plugins/font-thumbnailer/font-thumbnailer-plugin.c +./plugins/font-thumbnailer/font-thumbnailer.c +./plugins/font-thumbnailer/font-thumbnailer-provider.c +./plugins/xdg-cache/xdg-cache-provider.c +./plugins/xdg-cache/xdg-cache-thumbnail.c +./plugins/xdg-cache/xdg-cache-plugin.c +./plugins/xdg-cache/xdg-cache-cache.c diff --git a/po/ast.po b/po/ast.po index 37bf380..b73dc27 100644 --- a/po/ast.po +++ b/po/ast.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: tumbler\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-06-08 20:24+0200\n +POT-Creation-Date: 2009-09-30 02:22+0200\n PO-Revision-Date: 2009-09-02 16:29+0100\n Last-Translator: astur malditoas...@gmail.com\n Language-Team: en_GB\n @@ -15,111 +15,149 @@ msgstr Content-Type:
[Xfce4-commits] tumbler:master Implement the font thumbnailer, reusing code from ThunarVFS.
Updating branch refs/heads/master to d94aa4686d02796116ec69a6a6bdf6d9154d2384 (commit) from bf87845cd35e6db1abe4e497c502993a5296baee (commit) commit d94aa4686d02796116ec69a6a6bdf6d9154d2384 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 30 02:16:40 2009 +0200 Implement the font thumbnailer, reusing code from ThunarVFS. For now this one only works on local paths but this will soon change. If the FUSE daemon of GVfs is available, even non-local files are supported. configure.in.in| 37 ++ plugins/Makefile.am|1 + .../Makefile.am| 28 +- .../font-thumbnailer-plugin.c} | 14 +- .../font-thumbnailer/font-thumbnailer-provider.c | 131 + .../font-thumbnailer/font-thumbnailer-provider.h | 43 ++ plugins/font-thumbnailer/font-thumbnailer.c| 617 plugins/font-thumbnailer/font-thumbnailer.h| 43 ++ tumblerd/tumbler-cache-service.c |4 +- tumblerd/tumbler-manager.c |4 +- tumblerd/tumbler-service.c |4 +- tumblerd/tumbler-specialized-thumbnailer.c |2 +- 12 files changed, 901 insertions(+), 27 deletions(-) diff --git a/configure.in.in b/configure.in.in index 149c64e..7e97787 100644 --- a/configure.in.in +++ b/configure.in.in @@ -151,6 +151,37 @@ if test x$enable_pixbuf_thumbnailer = xyes; then fi AM_CONDITIONAL([ENABLE_PIXBUF_THUMBNAILER], test x$enable_pixbuf_thumbnailer = xyes) +dnl * +dnl *** Check for the font thumbnailer plugin *** +dnl * +AC_ARG_ENABLE([font-thumbnailer], + [AC_HELP_STRING([--enable-font-thumbnailer], + [Enable the font thumbnailer plugin @:@default=yes@:@])],, + [enable_font_thumbnailer=yes]) +if test x$enable_font_thumbnailer = xyes; then + dnl ** + dnl *** Check for FreeType 2.x *** + dnl ** + FREETYPE_LIBS= + FREETYPE_CFLAGS= + AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no]) + if test x$FREETYPE_CONFIG != xno; then +AC_MSG_CHECKING([FREETYPE_CFLAGS]) +FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` +AC_MSG_RESULT([$FREETYPE_CFLAGS]) + +AC_MSG_CHECKING([FREETYPE_LIBS]) +FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` +AC_MSG_RESULT([$FREETYPE_LIBS]) + +AC_DEFINE([ENABLE_FONT_THUMBNAILER], [1], [Define if the font thumbnailer plugin is enabled]) + fi + AM_CONDITIONAL([HAVE_FREETYPE], [test x$FREETYPE_CONFIG != xno]) + AC_SUBST([FREETYPE_CFLAGS]) + AC_SUBST([FREETYPE_LIBS]) +fi +AM_CONDITIONAL([ENABLE_FONT_THUMBNAILER], [test x$enable_font_thumbnailer != xno test x$FREETYPE_CONFIG != xno]) + dnl dnl *** Check for thumbnail flavors (normal, large, cropped) *** dnl @@ -245,6 +276,7 @@ docs/reference/Makefile docs/reference/tumbler/Makefile docs/reference/tumbler/version.xml plugins/Makefile +plugins/font-thumbnailer/Makefile plugins/pixbuf-thumbnailer/Makefile plugins/xdg-cache/Makefile po/Makefile.in @@ -266,6 +298,11 @@ echo * Pixbuf thumbnailer plugin: yes else echo * Pixbuf thumbnailer plugin: no fi +if test x$enable_font_thumbnailer = xyes; then +echo * Font thumbnailer plugin: yes +else +echo * Font thumbnailer plugin: no +fi echo echo Supported Thumbnail Flavors: echo diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 77f66cf..047ba61 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -18,5 +18,6 @@ # Boston, MA 02110-1301, USA. SUBDIRS = \ + font-thumbnailer\ pixbuf-thumbnailer \ xdg-cache diff --git a/plugins/pixbuf-thumbnailer/Makefile.am b/plugins/font-thumbnailer/Makefile.am similarity index 72% copy from plugins/pixbuf-thumbnailer/Makefile.am copy to plugins/font-thumbnailer/Makefile.am index 1eefd30..9c8f855 100644 --- a/plugins/pixbuf-thumbnailer/Makefile.am +++ b/plugins/font-thumbnailer/Makefile.am @@ -17,40 +17,42 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -if ENABLE_PIXBUF_THUMBNAILER +if ENABLE_FONT_THUMBNAILER tumbler_plugindir = $(libdir)/tumbler-$(TUMBLER_VERSION_API)/plugins tumbler_plugin_LTLIBRARIES = \ - tumbler-pixbuf-thumbnailer.la + tumbler-font-thumbnailer.la -tumbler_pixbuf_thumbnailer_la_SOURCES = \ - pixbuf-thumbnailer-plugin.c \ -
[Xfce4-commits] tumbler:master Fix typo. The variable is called pixbuf, not font.
Updating branch refs/heads/master to 37a5fd2ad68a5efa954b1019513d6389882ff967 (commit) from 9210c7c85d41f2bd3bc6314f0ead393989e82f3a (commit) commit 37a5fd2ad68a5efa954b1019513d6389882ff967 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 30 02:30:33 2009 +0200 Fix typo. The variable is called pixbuf, not font. plugins/font-thumbnailer/font-thumbnailer.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/font-thumbnailer/font-thumbnailer.c b/plugins/font-thumbnailer/font-thumbnailer.c index 07002e2..4473839 100644 --- a/plugins/font-thumbnailer/font-thumbnailer.c +++ b/plugins/font-thumbnailer/font-thumbnailer.c @@ -594,7 +594,7 @@ font_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer, /* if an image for this flavor was generated, save it now */ if (pixbuf != NULL) - tumbler_thumbnail_save_pixbuf (lp-data, font, mtime, NULL, error); + tumbler_thumbnail_save_pixbuf (lp-data, pixbuf, mtime, NULL, error); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Use org.xfce and /org/xfce prefixes instead of freedesktop ones.
Updating branch refs/heads/master to f7fb6233b853e906abeefa8d160d89dbe99e5d9c (commit) from bb7bd714867f89dfb0007120fca7932a9af0a3e6 (commit) commit f7fb6233b853e906abeefa8d160d89dbe99e5d9c Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 30 02:23:34 2009 +0200 Use org.xfce and /org/xfce prefixes instead of freedesktop ones. The thumbnail management D-Bus specification is by far not offical yet, so for now it's better to use our own namespace to avoid collisions with possible future thumbnail service namespaces accepted by fd.o. thunar/Makefile.am |4 ++-- thunar/thunar-thumbnailer-dbus.xml |4 ++-- thunar/thunar-thumbnailer-manager-dbus.xml |4 ++-- thunar/thunar-thumbnailer.c| 12 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/thunar/Makefile.am b/thunar/Makefile.am index b286fc5..2516929 100644 --- a/thunar/Makefile.am +++ b/thunar/Makefile.am @@ -332,13 +332,13 @@ thunar-dbus-service-infos.h: $(srcdir)/thunar-dbus-service-infos.xml Makefile thunar-thumbnailer-proxy.h: $(srcdir)/thunar-thumbnailer-dbus.xml Makefile dbus-binding-tool --mode=glib-client \ $(srcdir)/thunar-thumbnailer-dbus.xml thunar-thumbnailer-proxy.h \ -sed -i -e 's/org_freedesktop_thumbnails_Thumbnailer/thunar_thumbnailer_proxy/g' \ +sed -i -e 's/org_xfce_thumbnails_Thumbnailer/thunar_thumbnailer_proxy/g' \ thunar-thumbnailer-proxy.h thunar-thumbnailer-manager-proxy.h: $(srcdir)/thunar-thumbnailer-manager-dbus.xml Makefile dbus-binding-tool --mode=glib-client \ $(srcdir)/thunar-thumbnailer-manager-dbus.xml thunar-thumbnailer-manager-proxy.h \ -sed -i -e 's/org_freedesktop_thumbnails_Manager/thunar_thumbnailer_manager_proxy/g' \ +sed -i -e 's/org_xfce_thumbnails_Manager/thunar_thumbnailer_manager_proxy/g' \ thunar-thumbnailer-manager-proxy.h endif diff --git a/thunar/thunar-thumbnailer-dbus.xml b/thunar/thunar-thumbnailer-dbus.xml index ebd1e58..c040ceb 100644 --- a/thunar/thunar-thumbnailer-dbus.xml +++ b/thunar/thunar-thumbnailer-dbus.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? -node name=/org/freedesktop/thumbnails/Thumbnailer - interface name=org.freedesktop.thumbnails.Thumbnailer +node name=/org/xfce/thumbnails/Thumbnailer + interface name=org.xfce.thumbnails.Thumbnailer method name=Queue annotation name=org.freedesktop.DBus.GLib.Async value=true/ arg type=as name=uris direction=in / diff --git a/thunar/thunar-thumbnailer-manager-dbus.xml b/thunar/thunar-thumbnailer-manager-dbus.xml index 7ce682b..cfc3fef 100644 --- a/thunar/thunar-thumbnailer-manager-dbus.xml +++ b/thunar/thunar-thumbnailer-manager-dbus.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? -node name=/org/freedesktop/thumbnails/Manager - interface name=org.freedesktop.thumbnails.Manager +node name=/org/xfce/thumbnails/Manager + interface name=org.xfce.thumbnails.Manager method name=Register annotation name=org.freedesktop.DBus.GLib.Async value=true/ arg type=s name=uri_scheme direction=in / diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c index b8c924f..e81cbaf 100644 --- a/thunar/thunar-thumbnailer.c +++ b/thunar/thunar-thumbnailer.c @@ -415,9 +415,9 @@ thunar_thumbnailer_init_thumbnailer_proxy (ThunarThumbnailer *thumbnailer, /* create the shared thumbnailer proxy */ thunar_thumbnailer_proxy = dbus_g_proxy_new_for_name (connection, - org.freedesktop.thumbnails.Thumbnailer, - /org/freedesktop/thumbnails/Thumbnailer, - org.freedesktop.thumbnails.Thumbnailer); + org.xfce.thumbnails.Thumbnailer, + /org/xfce/thumbnails/Thumbnailer, + org.xfce.thumbnails.Thumbnailer); /* make sure to set it to NULL when the last reference is dropped */ g_object_add_weak_pointer (G_OBJECT (thunar_thumbnailer_proxy), @@ -487,9 +487,9 @@ thunar_thumbnailer_init_manager_proxy (ThunarThumbnailer *thumbnailer, /* create the shared manager proxy */ thunar_thumbnailer_manager_proxy = dbus_g_proxy_new_for_name (connection, - org.freedesktop.thumbnails.Manager, - /org/freedesktop/thumbnails/Manager, - org.freedesktop.thumbnails.Manager); + org.xfce.thumbnails.Manager, + /org/xfce/thumbnails/Manager, + org.xfce.thumbnails.Manager); /* make sure to set it to NULL when the last reference is dropped */ g_object_add_weak_pointer (G_OBJECT (thunar_thumbnailer_manager_proxy),
[Xfce4-commits] tumbler:master Fix several mistakes and typos, and therewith make distcheck.
Updating branch refs/heads/master
to 75e2cbfa7f2022b2828670ebd445373a57cf142f (commit)
from 37a5fd2ad68a5efa954b1019513d6389882ff967 (commit)
commit 75e2cbfa7f2022b2828670ebd445373a57cf142f
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 30 03:08:40 2009 +0200
Fix several mistakes and typos, and therewith make distcheck.
Makefile.am |4 +-
autogen.sh | 25 +
configure.in.in |2 +-
docs/Makefile.am|2 +-
docs/reference/Makefile.am |2 +-
docs/reference/tumbler/Makefile.am |2 +-
docs/reference/tumbler/tumbler-sections.txt | 168 ++-
plugins/font-thumbnailer/font-thumbnailer.c |1 -
po/POTFILES.in | 61 +-
po/ast.po | 10 +-
po/da.po| 10 +-
po/en_GB.po | 10 +-
po/tr.po| 10 +-
po/tumbler.pot | 10 +-
tumbler/Makefile.am |1 -
tumbler/tumbler-provider-plugin.c |2 +-
tumbler/tumbler-provider-plugin.h |2 +-
tumblerd/Makefile.am|2 +-
18 files changed, 152 insertions(+), 172 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c9c6d97..b471695 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,11 +18,11 @@
# Boston, MA 02110-1301, USA.
SUBDIRS = \
- docs\
po \
tumbler \
plugins \
- tumblerd
+ tumblerd\
+ docs
DISTCHECK_CONFIGURE_FLAGS =\
--enable-gtk-doc
diff --git a/autogen.sh b/autogen.sh
index 23a219b..21f1742 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,26 +29,7 @@ EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) /dev/null 21 || {
- cat 2 EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-or try to checkout again.
-EOF
- exit 1
-}
-
-# substitute linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-
-# TODO substitute revision
-revision=
-
-sed -e s/@LINGUAS@/${linguas}/g \
--e s/@REVISION@/${revision}/g \
- configure.in.in configure.in
-
-# initialize GTK-Doc
-gtkdocize || exit 1
+# # initialize GTK-Doc
+# gtkdocize || exit 1
-exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION=4.7.2 exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index 7e97787..3304013 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -281,8 +281,8 @@ plugins/pixbuf-thumbnailer/Makefile
plugins/xdg-cache/Makefile
po/Makefile.in
tumbler/Makefile
+tumbler/tumbler-1.pc
tumbler/tumbler-config.h
-tumbler/tumbler-$TUMBLER_VERSION_API.pc
tumblerd/Makefile
])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 848babc..de40f05 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -17,5 +17,5 @@
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-SUBIDRS = \
+SUBDIRS = \
reference
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f5eef03..48f84c6 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -17,5 +17,5 @@
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-SUBIDRS = \
+SUBDIRS = \
tumbler
diff --git a/docs/reference/tumbler/Makefile.am
b/docs/reference/tumbler/Makefile.am
index 8f2994f..3502ede 100644
--- a/docs/reference/tumbler/Makefile.am
+++ b/docs/reference/tumbler/Makefile.am
@@ -76,7 +76,7 @@ GTKDOC_LIBS =
\
$(GTHREAD_LIBS) \
$(GLIB_LIBS)\
$(PNG_LIBS) \
- $(top_srcdir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/tumbler/tumbler-sections.txt
b/docs/reference/tumbler/tumbler-sections.txt
index 38142b6..cf270e8 100644
--- a/docs/reference/tumbler/tumbler-sections.txt
+++
[Xfce4-commits] tumbler:master Simplify the ENABLE_FONT_THUMBNAILER conditional.
Updating branch refs/heads/master to adca19e3bbbd639ed9c197500369594c372bba4d (commit) from 75e2cbfa7f2022b2828670ebd445373a57cf142f (commit) commit adca19e3bbbd639ed9c197500369594c372bba4d Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 30 03:13:52 2009 +0200 Simplify the ENABLE_FONT_THUMBNAILER conditional. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 3304013..5d201e5 100644 --- a/configure.in.in +++ b/configure.in.in @@ -180,7 +180,7 @@ if test x$enable_font_thumbnailer = xyes; then AC_SUBST([FREETYPE_CFLAGS]) AC_SUBST([FREETYPE_LIBS]) fi -AM_CONDITIONAL([ENABLE_FONT_THUMBNAILER], [test x$enable_font_thumbnailer != xno test x$FREETYPE_CONFIG != xno]) +AM_CONDITIONAL([ENABLE_FONT_THUMBNAILER], [test x$FREETYPE_CONFIG != xno]) dnl dnl *** Check for thumbnail flavors (normal, large, cropped) *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Make the pixbuf support all URI schemes supported by GIO.
Updating branch refs/heads/master
to 8b48e3a585cc4f302665c1c63e0fe2af09e9c35d (commit)
from adca19e3bbbd639ed9c197500369594c372bba4d (commit)
commit 8b48e3a585cc4f302665c1c63e0fe2af09e9c35d
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 30 03:30:15 2009 +0200
Make the pixbuf support all URI schemes supported by GIO.
.../pixbuf-thumbnailer-provider.c |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index 0726029..d0deebd 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
@@ -104,7 +104,7 @@ static GList *
pixbuf_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider
*provider)
{
PixbufThumbnailer *thumbnailer;
- static const gchar *uri_schemes[] = { file, sftp, http, NULL, };
+ const gchar *const *uri_schemes;
GHashTable *types;
GSList *formats;
GSList *fp;
@@ -113,8 +113,13 @@ pixbuf_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provid
GList *thumbnailers = NULL;
GStrv format_types;
GStrv mime_types;
+ GVfs *vfs;
gintn;
+ /* determine which URI schemes are supported by GIO */
+ vfs = g_vfs_get_default ();
+ uri_schemes = g_vfs_get_supported_uri_schemes (vfs);
+
/* create a hash table to collect unique MIME types */
types = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Make the font thumbnailer work with all URI schemes supported by GIO.
Updating branch refs/heads/master
to 2ce5c9a917a46e2468bc4df48577042cdcd8fa97 (commit)
from 8b48e3a585cc4f302665c1c63e0fe2af09e9c35d (commit)
commit 2ce5c9a917a46e2468bc4df48577042cdcd8fa97
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 30 03:40:27 2009 +0200
Make the font thumbnailer work with all URI schemes supported by GIO.
.../font-thumbnailer/font-thumbnailer-provider.c | 11 ---
plugins/font-thumbnailer/font-thumbnailer.c| 32 ---
2 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/plugins/font-thumbnailer/font-thumbnailer-provider.c
b/plugins/font-thumbnailer/font-thumbnailer-provider.c
index 86fcf7c..487646f 100644
--- a/plugins/font-thumbnailer/font-thumbnailer-provider.c
+++ b/plugins/font-thumbnailer/font-thumbnailer-provider.c
@@ -103,11 +103,6 @@ font_thumbnailer_provider_init (FontThumbnailerProvider
*provider)
static GList *
font_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider
*provider)
{
- static const gchar *uri_schemes[] =
- {
-file,
-NULL,
- };
static const gchar *mime_types[] =
{
application/x-font-otf,
@@ -116,8 +111,14 @@ font_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provider
application/x-font-type1,
NULL,
};
+ const gchar *const *uri_schemes;
FontThumbnailer*thumbnailer;
GList *thumbnailers = NULL;
+ GVfs *vfs;
+
+ /* determine the URI schemes supported by GIO */
+ vfs = g_vfs_get_default ();
+ uri_schemes = g_vfs_get_supported_uri_schemes (vfs);
/* create the pixbuf thumbnailer */
thumbnailer = g_object_new (TYPE_FONT_THUMBNAILER,
diff --git a/plugins/font-thumbnailer/font-thumbnailer.c
b/plugins/font-thumbnailer/font-thumbnailer.c
index c4a5fad..d4e7ca2 100644
--- a/plugins/font-thumbnailer/font-thumbnailer.c
+++ b/plugins/font-thumbnailer/font-thumbnailer.c
@@ -451,7 +451,8 @@ font_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
GList *lp;
GList *thumbnails;
gchar *error_msg;
- gchar *path;
+ gchar *font_data;
+ gsize length;
gintn;
g_return_if_fail (IS_FONT_THUMBNAILER (thumbnailer));
@@ -480,17 +481,28 @@ font_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
return;
}
- /* determine the local path of the file */
+ /* try to read the file into memory */
file = g_file_new_for_uri (uri);
- path = g_file_get_path (file);
- g_object_unref (file);
+ if (!g_file_load_contents (file, NULL, font_data, length, NULL, error))
+{
+ /* there was an error, emit error signal */
+ error_msg = g_strdup_printf (_(Could not load file contents: %s),
+error-message);
+ g_signal_emit_by_name (thumbnailer, error, uri, 0, error_msg);
+ g_free (error_msg);
+
+ /* clean up */
+ g_error_free (error);
+ g_object_unref (file);
+ g_object_unref (info);
- /* if the local path is not NULL, then something went wrong, as this
thumbnailer
- * only supports file URIs and all those should also have a local path */
- g_assert (path != NULL);
+ return;
+}
+ g_object_unref (file);
/* try to open the font file */
- ft_error = FT_New_Face (font_thumbnailer-library, path, 0, face);
+ ft_error = FT_New_Memory_Face (font_thumbnailer-library, font_data, length,
+ 0, face);
if (G_UNLIKELY (ft_error != 0))
{
/* the font file could not be loaded, emit an error signal */
@@ -500,15 +512,11 @@ font_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
g_free (error_msg);
/* clean up */
- g_free (path);
g_object_unref (info);
return;
}
- /* free the local path */
- g_free (path);
-
/* try to set the character map */
for (n = 0; n face-num_charmaps; ++n)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Make sure to free the font file data.
Updating branch refs/heads/master to 5162982c8acaaf3b7677e0627e9fc4a757ac9213 (commit) from 2ce5c9a917a46e2468bc4df48577042cdcd8fa97 (commit) commit 5162982c8acaaf3b7677e0627e9fc4a757ac9213 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 30 03:46:23 2009 +0200 Make sure to free the font file data. plugins/font-thumbnailer/font-thumbnailer.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/plugins/font-thumbnailer/font-thumbnailer.c b/plugins/font-thumbnailer/font-thumbnailer.c index d4e7ca2..d7b089b 100644 --- a/plugins/font-thumbnailer/font-thumbnailer.c +++ b/plugins/font-thumbnailer/font-thumbnailer.c @@ -512,6 +512,7 @@ font_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer, g_free (error_msg); /* clean up */ + g_free (font_data); g_object_unref (info); return; @@ -536,6 +537,7 @@ font_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer, g_free (error_msg); /* clean up */ + g_free (font_data); FT_Done_Face (face); g_object_unref (info); @@ -567,6 +569,7 @@ font_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer, /* clean up */ g_hash_table_unref (pixbufs); + g_free (font_data); FT_Done_Face (face); g_object_unref (info); @@ -619,6 +622,7 @@ font_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer, } /* clean up */ + g_free (font_data); g_hash_table_unref (pixbufs); g_object_unref (info); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
