[Xfce4-commits] thunar:master Set progress bar text to Cancelling... when a job is cancelled.
Updating branch refs/heads/master
to 60aa22b74f9fa41e351449d5282e47b336dbf269 (commit)
from a6e275939ec75ba9237ba30dd9ae3d88c57e18e9 (commit)
commit 60aa22b74f9fa41e351449d5282e47b336dbf269
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Sep 13 14:34:34 2009 +0200
Set progress bar text to Cancelling... when a job is cancelled.
This makes it more obvious that Thunar has recognized the user's cancel
action and is about to cancel the job. Sometimes this takes a while, so
this text will help users in being patient. Suggested by Steve Dodier.
thunar/thunar-progress-view.c | 17 -
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c
index 854bb18..d51867a 100644
--- a/thunar/thunar-progress-view.c
+++ b/thunar/thunar-progress-view.c
@@ -309,7 +309,22 @@ thunar_progress_view_cancel_job (ThunarProgressView *view)
_thunar_return_if_fail (THUNAR_IS_JOB (view-job));
if (view-job != NULL)
-exo_job_cancel (EXO_JOB (view-job));
+{
+ /* cancel the job */
+ exo_job_cancel (EXO_JOB (view-job));
+
+ /* don't listen to percentage updates any more */
+ g_signal_handlers_disconnect_matched (view-job, G_SIGNAL_MATCH_FUNC, 0,
0, NULL,
+thunar_progress_view_percent,
NULL);
+
+ /* don't listen to info messages any more */
+ g_signal_handlers_disconnect_matched (view-job, G_SIGNAL_MATCH_FUNC, 0,
0, NULL,
+thunar_progress_view_info_message,
NULL);
+
+ /* update the progress bar text */
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (view-progress_bar),
+ _(Cancelling...));
+}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Update the statusbar properly after destroying a view.
Updating branch refs/heads/master
to 9a3adb2cfb84fcf15d31cbbcc1cac8c2cff400ad (commit)
from 9a2645864ff9ba5dfef133586b243bb5effecb05 (commit)
commit 9a3adb2cfb84fcf15d31cbbcc1cac8c2cff400ad
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Sep 12 19:24:52 2009 +0200
Update the statusbar properly after destroying a view.
thunar/thunar-progress-dialog.c | 84 ++-
1 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index fe8cf66..bd86819 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -34,12 +34,13 @@
-static void thunar_progress_dialog_dispose (GObject *object);
-static void thunar_progress_dialog_finalize (GObject *object);
-static gboolean thunar_progress_dialog_closed (ThunarProgressDialog *dialog);
-static gboolean thunar_progress_dialog_toggled (ThunarProgressDialog *dialog,
- GdkEventButton *button,
- GtkStatusIcon
*status_icon);
+static void thunar_progress_dialog_dispose(GObject
*object);
+static void thunar_progress_dialog_finalize (GObject
*object);
+static gboolean thunar_progress_dialog_closed
(ThunarProgressDialog *dialog);
+static gboolean thunar_progress_dialog_toggled
(ThunarProgressDialog *dialog,
+ GdkEventButton
*button,
+ GtkStatusIcon
*status_icon);
+static void thunar_progress_dialog_update_status_icon
(ThunarProgressDialog *dialog);
@@ -224,13 +225,57 @@ thunar_progress_dialog_job_finished (ThunarProgressDialog
*dialog,
gtk_window_resize (GTK_WINDOW (dialog), 400, 10);
}
- /* destroy the dialog if there are no views left */
- if (dialog-views == NULL)
-gtk_widget_destroy (GTK_WIDGET (dialog));
+ /* check if we still have at least one view */
+ if (dialog-views != NULL)
+{
+ /* update the status icon */
+ thunar_progress_dialog_update_status_icon (dialog);
+}
+ else
+{
+ /* destroy the dialog as there are no views left */
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
}
+static void
+thunar_progress_dialog_update_status_icon (ThunarProgressDialog *dialog)
+{
+ gchar *tooltip_text;
+ guint n_views;
+
+ _thunar_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
+
+ /* make the status icon visible */
+ gtk_status_icon_set_visible (dialog-status_icon, TRUE);
+
+ /* determine the number of views now being active */
+ n_views = g_list_length (dialog-views);
+
+ /* build the tooltip text */
+ tooltip_text = g_strdup_printf (ngettext (%d file operation running,
+%d file operations running,
+n_views),
+ n_views);
+
+ /* update the tooltip */
+#if GTK_CHECK_VERSION (2, 16, 0)
+ gtk_status_icon_set_tooltip_text (dialog-status_icon, tooltip_text);
+#else
+ gtk_status_icon_set_tooltip (dialog-status_icon, tooltip_text);
+#endif
+
+ /* free the string */
+ g_free (tooltip_text);
+}
+
+
+
+
+
+
GtkWidget*
thunar_progress_dialog_new (void)
{
@@ -247,8 +292,6 @@ thunar_progress_dialog_add_job (ThunarProgressDialog
*dialog,
{
GtkWidget *viewport;
GtkWidget *view;
- gchar *tooltip_text;
- guint n_views;
_thunar_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
_thunar_return_if_fail (THUNAR_IS_JOB (job));
@@ -263,12 +306,9 @@ thunar_progress_dialog_add_job (ThunarProgressDialog
*dialog,
/* add the view to the list of known views */
dialog-views = g_list_prepend (dialog-views, view);
- /* determine the number of views now being active */
- n_views = g_list_length (dialog-views);
-
/* check if we need to wrap the views in a scroll window (starting
* at SCROLLVIEW_THRESHOLD parallel operations */
- if (n_views == SCROLLVIEW_THRESHOLD)
+ if (g_list_length (dialog-views) == SCROLLVIEW_THRESHOLD)
{
/* create a scrolled window and add it to the dialog */
dialog-scrollwin = gtk_scrolled_window_new (NULL, NULL);
@@ -294,17 +334,5 @@ thunar_progress_dialog_add_job (ThunarProgressDialog
*dialog,
g_signal_connect_swapped (view, finished,
G_CALLBACK (thunar_progress_dialog_job_finished),
dialog);
- /* make the status icon visible */
- gtk_status_icon_set_visible (dialog-status_icon, TRUE);
-
- /* set status icon tooltip */
- tooltip_text = g_strdup_printf (ngettext (1 file operation running, %d
file operations running,
-n_views),
- n_views);
-#if GTK_CHECK_VERSION (2, 16
[Xfce4-commits] thunar:master Remove parentheses around the 42 seconds remaining progress bar text.
Updating branch refs/heads/master
to dac4aa8b282e8b3f244822844a229aed65f95b49 (commit)
from 60aa22b74f9fa41e351449d5282e47b336dbf269 (commit)
commit dac4aa8b282e8b3f244822844a229aed65f95b49
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Sep 13 14:36:38 2009 +0200
Remove parentheses around the 42 seconds remaining progress bar text.
If anyone can point me at a good reason to use them, I'll happily add
them back. Until then they are just two more characters to read on the
screen in my opinion.
thunar/thunar-progress-view.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c
index d51867a..a1daf2b 100644
--- a/thunar/thunar-progress-view.c
+++ b/thunar/thunar-progress-view.c
@@ -477,17 +477,17 @@ thunar_progress_view_percent (ThunarProgressView *view,
if (remaining_time 60 * 60)
{
remaining_time = (gulong) (remaining_time / (60 * 60));
- g_snprintf (text, sizeof (text), ngettext ((%lu hour
remaining), (%lu hours remaining), remaining_time), remaining_time);
+ g_snprintf (text, sizeof (text), ngettext (%lu hour remaining,
%lu hours remaining, remaining_time), remaining_time);
}
else if (remaining_time 60)
{
remaining_time = (gulong) (remaining_time / 60);
- g_snprintf (text, sizeof (text), ngettext ((%lu minute
remaining), (%lu minutes remaining), remaining_time), remaining_time);
+ g_snprintf (text, sizeof (text), ngettext (%lu minute
remaining, %lu minutes remaining, remaining_time), remaining_time);
}
else
{
remaining_time = remaining_time;
- g_snprintf (text, sizeof (text), ngettext ((%lu second
remaining), (%lu seconds remaining), remaining_time), remaining_time);
+ g_snprintf (text, sizeof (text), ngettext (%lu second
remaining, %lu seconds remaining, remaining_time), remaining_time);
}
/* apply the time text */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Raise the progress dialog above others when the status icon is clicked.
Updating branch refs/heads/master to a888ff22b0f4b9ee86784c51ab6da1cd810f7a94 (commit) from dac4aa8b282e8b3f244822844a229aed65f95b49 (commit) commit a888ff22b0f4b9ee86784c51ab6da1cd810f7a94 Author: Jannis Pohlmann jan...@xfce.org Date: Sun Sep 13 14:42:25 2009 +0200 Raise the progress dialog above others when the status icon is clicked. thunar/thunar-progress-dialog.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c index b4ed669..e4e8fb1 100644 --- a/thunar/thunar-progress-dialog.c +++ b/thunar/thunar-progress-dialog.c @@ -179,7 +179,7 @@ thunar_progress_dialog_toggled (ThunarProgressDialog *dialog, /* toggle the visibility of the progress dialog */ if (GTK_WIDGET_VISIBLE (GTK_WIDGET (dialog))) -gtk_widget_hide (GTK_WIDGET (dialog)); +gtk_window_present (GTK_WINDOW (dialog)); else gtk_widget_show (GTK_WIDGET (dialog)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Use stock_folder-copy icon name for the progress dialog status icon.
Updating branch refs/heads/master to 8d588b8140e53068cb17b8f8c44cc2c351512de6 (commit) from a888ff22b0f4b9ee86784c51ab6da1cd810f7a94 (commit) commit 8d588b8140e53068cb17b8f8c44cc2c351512de6 Author: Jannis Pohlmann jan...@xfce.org Date: Sun Sep 13 14:50:22 2009 +0200 Use stock_folder-copy icon name for the progress dialog status icon. thunar/thunar-progress-dialog.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c index e4e8fb1..71a9465 100644 --- a/thunar/thunar-progress-dialog.c +++ b/thunar/thunar-progress-dialog.c @@ -110,7 +110,7 @@ thunar_progress_dialog_init (ThunarProgressDialog *dialog) gtk_container_add (GTK_CONTAINER (dialog-vbox), dialog-content_box); gtk_widget_show (dialog-content_box); - dialog-status_icon = gtk_status_icon_new_from_stock (GTK_STOCK_DIRECTORY); + dialog-status_icon = gtk_status_icon_new_from_icon_name (stock_folder-copy); gtk_status_icon_set_visible (dialog-status_icon, FALSE); g_signal_connect_swapped (dialog-status_icon, button-press-event, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Remember progress dialog position. No show delay after the first job.
Updating branch refs/heads/master
to eaf555a874f07efb190d0438ed8882d662e9776d (commit)
from 6e20e6d00dfb704f0a266daa01cb1d46792b3a8e (commit)
commit eaf555a874f07efb190d0438ed8882d662e9776d
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Sep 13 15:39:40 2009 +0200
Remember progress dialog position. No show delay after the first job.
thunar/thunar-application.c | 30 ++
thunar/thunar-progress-dialog.c | 27 ++-
thunar/thunar-progress-dialog.h | 15 ---
3 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 9e6b7dd..c6f883a 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -411,16 +411,30 @@ thunar_application_launch (ThunarApplication *application,
if (screen != NULL)
gtk_window_set_screen (GTK_WINDOW (dialog), screen);
- thunar_progress_dialog_add_job (THUNAR_PROGRESS_DIALOG (dialog), job,
icon_name, title);
+ if (thunar_progress_dialog_has_jobs (THUNAR_PROGRESS_DIALOG (dialog)))
+{
+ /* add the job to the dialog */
+ thunar_progress_dialog_add_job (THUNAR_PROGRESS_DIALOG (dialog),
+ job, icon_name, title);
- /* Set up a timer to show the dialog, to make sure we don't
- * just popup and destroy a dialog for a very short job.
- */
- if (G_LIKELY (application-show_dialogs_timer_id == 0))
+ /* show the dialog immediately */
+ thunar_application_show_dialogs (application);
+}
+ else
{
- application-show_dialogs_timer_id =
-g_timeout_add_full (G_PRIORITY_DEFAULT, 750,
thunar_application_show_dialogs,
-application,
thunar_application_show_dialogs_destroy);
+ /* add the job to the dialog */
+ thunar_progress_dialog_add_job (THUNAR_PROGRESS_DIALOG (dialog),
+ job, icon_name, title);
+
+ /* Set up a timer to show the dialog, to make sure we don't
+ * just popup and destroy a dialog for a very short job.
+ */
+ if (G_LIKELY (application-show_dialogs_timer_id == 0))
+{
+ application-show_dialogs_timer_id =
+g_timeout_add_full (G_PRIORITY_DEFAULT, 750,
thunar_application_show_dialogs,
+application,
thunar_application_show_dialogs_destroy);
+}
}
/* drop our reference on the job */
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index aac2fc1..30ad94b 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -60,6 +60,9 @@ struct _ThunarProgressDialog
GtkWidget *content_box;
GList *views;
+
+ gint x;
+ gint y;
};
@@ -160,6 +163,9 @@ thunar_progress_dialog_closed (ThunarProgressDialog *dialog)
{
_thunar_return_val_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog), FALSE);
+ /* remember the position of the dialog */
+ gtk_window_get_position (GTK_WINDOW (dialog), dialog-x, dialog-y);
+
/* hide the progress dialog */
gtk_widget_hide (GTK_WIDGET (dialog));
@@ -181,13 +187,23 @@ thunar_progress_dialog_toggled (ThunarProgressDialog
*dialog,
if (GTK_WIDGET_VISIBLE (GTK_WIDGET (dialog))
gtk_window_is_active (GTK_WINDOW (dialog)))
{
+ /* remember the position of the dialog */
+ gtk_window_get_position (GTK_WINDOW (dialog), dialog-x, dialog-y);
+
/* it is, so hide it now */
gtk_widget_hide (GTK_WIDGET (dialog));
}
else
{
+ /* check if the dialog is invisible */
+ if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (dialog)))
+{
+ /* restore its previous position before presenting it */
+ gtk_window_move (GTK_WINDOW (dialog), dialog-x, dialog-y);
+}
+
/* it's not, so we need to raise it above other windows */
- gtk_window_present (GTK_WINDOW (dialog));
+ gtk_window_present_with_time (GTK_WINDOW (dialog), event-time);
}
return TRUE;
@@ -355,3 +371,12 @@ thunar_progress_dialog_add_job (ThunarProgressDialog
*dialog,
thunar_progress_dialog_update_status_icon (dialog);
}
+
+
+
+gboolean
+thunar_progress_dialog_has_jobs (ThunarProgressDialog *dialog)
+{
+ _thunar_return_val_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog), FALSE);
+ return dialog-views != NULL;
+}
diff --git a/thunar/thunar-progress-dialog.h b/thunar/thunar-progress-dialog.h
index e4bdbf8..335fa62 100644
--- a/thunar/thunar-progress-dialog.h
+++ b/thunar/thunar-progress-dialog.h
@@ -36,13 +36,14 @@ typedef struct _ThunarProgressDialog
ThunarProgressDialog;
#define THUNAR_IS_PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE
((klass), THUNAR_TYPE_PROGRESS_DIALOG))
#define THUNAR_PROGRESS_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS
((obj), THUNAR_TYPE_PROGRESS_DIALOG, ThunarProgressDialogClass))
-GType thunar_progress_dialog_get_type
[Xfce4-commits] thunar:progress-dialog-experiments Use 18px spacing between the progress views in the dialog.
Updating branch refs/heads/progress-dialog-experiments to 6a55e55afca0e10f1fac5de98568222e12f1 (commit) from 104f4b0e147be1d2fabccadeccc28dcc86374b03 (commit) commit 6a55e55afca0e10f1fac5de98568222e12f1 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Sep 14 18:55:29 2009 +0200 Use 18px spacing between the progress views in the dialog. thunar/thunar-progress-dialog.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c index 30ad94b..c3e98e4 100644 --- a/thunar/thunar-progress-dialog.c +++ b/thunar/thunar-progress-dialog.c @@ -108,7 +108,7 @@ thunar_progress_dialog_init (ThunarProgressDialog *dialog) gtk_container_add (GTK_CONTAINER (dialog), dialog-vbox); gtk_widget_show (dialog-vbox); - dialog-content_box = gtk_vbox_new (FALSE, 12); + dialog-content_box = gtk_vbox_new (FALSE, 18); gtk_container_set_border_width (GTK_CONTAINER (dialog-content_box), 8); gtk_container_add (GTK_CONTAINER (dialog-vbox), dialog-content_box); gtk_widget_show (dialog-content_box); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:progress-dialog-experiments Use only one text line for each progress view.
Updating branch refs/heads/progress-dialog-experiments to 6c82f8fbdebd17338449e55c5d7b7bd2030cb534 (commit) from 6a55e55afca0e10f1fac5de98568222e12f1 (commit) commit 6c82f8fbdebd17338449e55c5d7b7bd2030cb534 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Sep 14 18:56:06 2009 +0200 Use only one text line for each progress view. This line should display something like: - Copying Foo to Bar - Moving Foo to Bar - Creating link to Foo in Bar - Trashing Foo Also add a 6px padding to the copy/move/delete/trash icon. thunar/thunar-progress-view.c | 13 - 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c index a1daf2b..7291f25 100644 --- a/thunar/thunar-progress-view.c +++ b/thunar/thunar-progress-view.c @@ -180,11 +180,12 @@ thunar_progress_view_init (ThunarProgressView *view) gtk_container_add (GTK_CONTAINER (view), vbox); gtk_widget_show (vbox); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); image = g_object_new (GTK_TYPE_IMAGE, icon-size, GTK_ICON_SIZE_BUTTON, NULL); + gtk_misc_set_padding (GTK_MISC (image), 6, 0); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); gtk_widget_show (image); @@ -192,18 +193,12 @@ thunar_progress_view_init (ThunarProgressView *view) gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0); gtk_widget_show (vbox2); - label = g_object_new (GTK_TYPE_LABEL, xalign, 0.0f, NULL); - gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_big_bold ()); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE); - gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE, TRUE, 0); - gtk_widget_show (label); - view-progress_label = g_object_new (GTK_TYPE_LABEL, xalign, 0.0f, NULL); gtk_label_set_ellipsize (GTK_LABEL (view-progress_label), PANGO_ELLIPSIZE_MIDDLE); gtk_box_pack_start (GTK_BOX (vbox2), view-progress_label, TRUE, TRUE, 0); gtk_widget_show (view-progress_label); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); gtk_widget_show (hbox); @@ -220,7 +215,7 @@ thunar_progress_view_init (ThunarProgressView *view) exo_binding_new (G_OBJECT (view), icon-name, G_OBJECT (image), icon-name); /* connect the view title to the action label */ - exo_binding_new (G_OBJECT (view), title, G_OBJECT (label), label); + exo_binding_new (G_OBJECT (view), title, G_OBJECT (view-progress_label), label); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:progress-dialog-experiments Creating branch progress-dialog-experiments
Updating branch refs/heads/progress-dialog-experiments as new branch to ab7743c42452805a7a7e7bfe842d31c899babafb (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/progress-dialog-experiments for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:progress-dialog-experiments Use more descriptive info messages for the one-line progress views.
Updating branch refs/heads/progress-dialog-experiments
to ab7743c42452805a7a7e7bfe842d31c899babafb (commit)
from 6c82f8fbdebd17338449e55c5d7b7bd2030cb534 (commit)
commit ab7743c42452805a7a7e7bfe842d31c899babafb
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Sep 14 18:58:40 2009 +0200
Use more descriptive info messages for the one-line progress views.
thunar/thunar-transfer-job.c | 79 +-
1 files changed, 78 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-transfer-job.c b/thunar/thunar-transfer-job.c
index 83e4566..c30c8c2 100644
--- a/thunar/thunar-transfer-job.c
+++ b/thunar/thunar-transfer-job.c
@@ -482,10 +482,14 @@ thunar_transfer_job_copy_node (ThunarTransferJob *job,
GError**error)
{
ThunarJobResponse response;
+ const gchar *source_display_name;
+ const gchar *target_display_name;
GFileInfo*info;
+ GFileInfo*target_info;
GError *err = NULL;
GFile*real_target_file = NULL;
gchar*base_name;
+ gchar*message = NULL;
_thunar_return_if_fail (THUNAR_IS_TRANSFER_JOB (job));
_thunar_return_if_fail (node != NULL G_IS_FILE (node-source_file));
@@ -524,8 +528,81 @@ thunar_transfer_job_copy_node (ThunarTransferJob *job,
break;
}
+ /* determine the source file display name */
+ source_display_name = g_file_info_get_display_name (info);
+
+ /* query file info for the target parent */
+ if (target_parent_file != NULL)
+{
+ target_info = g_file_query_info (target_parent_file,
+
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+ exo_job_get_cancellable (EXO_JOB
(job)),
+ err);
+}
+ else
+{
+ target_parent_file = g_file_get_parent (target_file);
+
+ if (target_parent_file != NULL)
+{
+ target_info = g_file_query_info (target_parent_file,
+
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+ exo_job_get_cancellable
(EXO_JOB (job)),
+ err);
+ g_object_unref (target_parent_file);
+}
+ else
+{
+ target_info = g_file_query_info (target_file,
+
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+ exo_job_get_cancellable
(EXO_JOB (job)),
+ err);
+}
+}
+
+ /* abort on error or cancellation */
+ if (info == NULL)
+{
+ g_object_unref (target_file);
+ break;
+}
+
+ /* determine the target display name */
+ target_display_name = g_file_info_get_display_name (target_info);
+
+ /* generate info message */
+ if (job-type == THUNAR_TRANSFER_JOB_COPY)
+{
+ message = g_strdup_printf (_(Copying \%s\ to \%s\),
+ source_display_name, target_display_name);
+}
+ else if (job-type == THUNAR_TRANSFER_JOB_TRASH
+thunar_g_file_is_trashed (target_file))
+{
+ message = g_strdup_printf (_(Trashing \%s\),
source_display_name);
+}
+ else if (job-type == THUNAR_TRANSFER_JOB_MOVE)
+{
+ message = g_strdup_printf (_(Moving \%s\ to \%s\),
+ source_display_name, target_display_name);
+}
+ else
+{
+ message = g_strdup_printf (_(Creating link to \%s\ in \%s\),
+ source_display_name, target_display_name);
+}
+
/* update progress information */
- exo_job_info_message (EXO_JOB (job), g_file_info_get_display_name
(info));
+ exo_job_info_message (EXO_JOB (job), message);
+
+ /* free the message string */
+ g_free (message);
+
+ /* release the target info */
+ g_object_unref (target_info);
retry_copy:
/* copy the item specified by this node (not recursively) */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:new-sm-client Rename first_button_type to first_button_text to comply with the docs.
Updating branch refs/heads/kelnos/new-sm-client
to e1456828dcc17c7d05ac3d202a3f0540e9ac2d6b (commit)
from b031f4cf957eef3c2c3249a6584965da0ba8107b (commit)
commit e1456828dcc17c7d05ac3d202a3f0540e9ac2d6b
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Sep 7 22:38:28 2009 +0200
Rename first_button_type to first_button_text to comply with the docs.
I personally think first_button_text is confusing so I'd rather use
first_button_type myself.
libxfce4ui/xfce-dialogs.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
index 34949f6..a0c76e2 100644
--- a/libxfce4ui/xfce-dialogs.c
+++ b/libxfce4ui/xfce-dialogs.c
@@ -230,13 +230,13 @@ xfce_message_dialog_new_valist (GtkWindow *parent,
const gchar *icon_stock_id,
const gchar *primary_text,
const gchar *secondary_text,
-const gchar *first_button_type,
+const gchar *first_button_text,
va_list args)
{
GtkWidget *dialog;
GtkWidget *image;
GtkWidget *button;
- const gchar *text = first_button_type;
+ const gchar *text = first_button_text;
const gchar *label;
const gchar *stock_id;
gint response;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:new-sm-client Fix conflict dialog segfault due to wrong use of xfce_message_dialog().
Updating branch refs/heads/kelnos/new-sm-client to 60f00295a82746cdf69267be10bab27b5441807c (commit) from e1456828dcc17c7d05ac3d202a3f0540e9ac2d6b (commit) commit 60f00295a82746cdf69267be10bab27b5441807c Author: Jannis Pohlmann jan...@xfce.org Date: Mon Sep 7 22:41:02 2009 +0200 Fix conflict dialog segfault due to wrong use of xfce_message_dialog(). When creating the shortcut conflict dialog, add a NULL parameter for the stock IDs of the mixed buttons. libxfce4kbd-private/xfce-shortcuts.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libxfce4kbd-private/xfce-shortcuts.c b/libxfce4kbd-private/xfce-shortcuts.c index 8e11325..7ebc078 100644 --- a/libxfce4kbd-private/xfce-shortcuts.c +++ b/libxfce4kbd-private/xfce-shortcuts.c @@ -108,8 +108,8 @@ xfce_shortcut_conflict_dialog (const gchar *owner, response = xfce_message_dialog (NULL, title, GTK_STOCK_DIALOG_QUESTION, title, secondary_text, -XFCE_BUTTON_TYPE_MIXED, owner_button_text, GTK_RESPONSE_ACCEPT, -XFCE_BUTTON_TYPE_MIXED, other_button_text, GTK_RESPONSE_REJECT, +XFCE_BUTTON_TYPE_MIXED, NULL, owner_button_text, GTK_RESPONSE_ACCEPT, +XFCE_BUTTON_TYPE_MIXED, NULL, other_button_text, GTK_RESPONSE_REJECT, NULL); g_free (other_button_text); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:master Remove LINGUAS, update to xfce4-dev-tools 4.7.0.
Updating branch refs/heads/master
to 85d2709efc2c9165b1ba0d38c467d01dc94618da (commit)
from 6eb0308f18da3c81c3b62d0c3e74071c1c13fabb (commit)
commit 85d2709efc2c9165b1ba0d38c467d01dc94618da
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Sep 15 14:54:21 2009 +0200
Remove LINGUAS, update to xfce4-dev-tools 4.7.0.
autogen.sh | 18 +-
configure.in.in |6 +++---
po/LINGUAS |2 --
3 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index d0c27f8..6dd7849 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,22 +18,6 @@ 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 revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
-sed -e s/@LINGUAS@/${linguas}/g \
--e s/@REVISION@/${revision}/g \
- configure.in.in configure.in
-
-exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION=4.7.0 exec xdt-autogen $@
# vi:set ts=2 sw=2 et ai:
diff --git a/configure.in.in b/configure.in.in
index 57d0792..3e75d93 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -13,8 +13,8 @@ m4_define([libxfce4ui_version_minor], [7])
m4_define([libxfce4ui_version_micro], [0])
m4_define([libxfce4ui_version_nano], []) dnl leave this empty to have no nano
version
m4_define([libxfce4ui_version_build], [...@revision@])
-m4_define([libxfce4ui_version_tag], [svn])
-m4_define([libxfce4ui_version],
[libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(),
[], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [svn],
[libxfce4ui_version_tag()-libxfce4ui_version_build()],
[libxfce4ui_version_tag()])])
+m4_define([libxfce4ui_version_tag], [git])
+m4_define([libxfce4ui_version],
[libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(),
[], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git],
[libxfce4ui_version_tag()-libxfce4ui_version_build()],
[libxfce4ui_version_tag()])])
m4_define([libxfce4kbd_private_verinfo], [0:0:0])
m4_define([libxfce4kbd_private_version_api], [2])
@@ -29,7 +29,7 @@ dnl # YOU ARE DOING.
dnl
dnl *** Full debug support for SVN snapshots ***
dnl
-m4_define([libxfce4ui_debug_default], [ifelse(libxfce4ui_version_tag(), [svn],
[full], [minimum])])
+m4_define([libxfce4ui_debug_default], [ifelse(libxfce4ui_version_tag(), [git],
[full], [minimum])])
dnl ***
dnl *** Initialize autoconf ***
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 6e75b5f..000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ast ca cs da de en_GB es eu fi fr gl hu id it ja kk lv ku pl pt pt_BR ro sv
tl_PH tr uk ur ur_PK zh_CN
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:master Revert Use an idle function for delayed scrolling.
Updating branch refs/heads/master
to 5e5d41f658e74e9e0b90bbb30665361f64168ef9 (commit)
from 8637a16a521a190c63cea91f007637841d396f8b (commit)
commit 5e5d41f658e74e9e0b90bbb30665361f64168ef9
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Sep 15 17:42:15 2009 +0200
Revert Use an idle function for delayed scrolling.
This reverts commit 0a7be769f07828953d62e86fbc9da755f9aa8ad6. The
related GDK bug was fixed upstream by Alexander Larsson (more
information on https://bugzilla.gnome.org/show_bug.cgi?id=594880).
exo/exo-icon-view.c | 78 ++
1 files changed, 22 insertions(+), 56 deletions(-)
diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index b3b1624..7a64a65 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -466,7 +466,6 @@ struct _ExoIconViewPrivate
GtkAdjustment *vadjustment;
gint layout_idle_id;
- gint scroll_idle_id;
gboolean doing_rubberband;
gint rubberband_x_1, rubberband_y_1;
@@ -1230,10 +1229,6 @@ exo_icon_view_finalize (GObject *object)
if (G_UNLIKELY (icon_view-priv-single_click_timeout_id != 0))
g_source_remove (icon_view-priv-single_click_timeout_id);
- /* kill the scroll idle source */
- if (G_UNLIKELY (icon_view-priv-scroll_idle_id != 0))
-g_source_remove (icon_view-priv-scroll_idle_id);
-
/* kill the layout idle source (it's important to have this last!) */
if (G_UNLIKELY (icon_view-priv-layout_idle_id != 0))
g_source_remove (icon_view-priv-layout_idle_id);
@@ -1627,6 +1622,28 @@ exo_icon_view_expose_event (GtkWidget *widget,
if (G_UNLIKELY (priv-layout_idle_id != 0))
return FALSE;
+ /* scroll to the previously remembered path (if any) */
+ if (G_UNLIKELY (priv-scroll_to_path != NULL))
+{
+ /* grab the path from the reference and invalidate the reference */
+ path = gtk_tree_row_reference_get_path (priv-scroll_to_path);
+ gtk_tree_row_reference_free (priv-scroll_to_path);
+ priv-scroll_to_path = NULL;
+
+ /* check if the reference was still valid */
+ if (G_LIKELY (path != NULL))
+{
+ /* try to scroll again */
+ exo_icon_view_scroll_to_path (icon_view, path,
+priv-scroll_to_use_align,
+priv-scroll_to_row_align,
+priv-scroll_to_col_align);
+
+ /* release the path */
+ gtk_tree_path_free (path);
+}
+}
+
/* check if we need to draw a drag indicator */
exo_icon_view_get_drag_dest_item (icon_view, path, dest_pos);
if (G_UNLIKELY (path != NULL))
@@ -5400,8 +5417,6 @@ update_text_cell (ExoIconView *icon_view)
}
}
-
-
static void
update_pixbuf_cell (ExoIconView *icon_view)
{
@@ -5747,46 +5762,6 @@ exo_icon_view_set_cursor (ExoIconView *icon_view,
-static gboolean
-scroll_delayed (gpointer user_data)
-{
- ExoIconView *icon_view = user_data;
- GtkTreePath *path;
-
- _exo_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), FALSE);
-
- /* schedule the scrolling again if the window still isn't realized or
- * the layouting still is not finished */
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (icon_view)) ||
icon_view-priv-layout_idle_id != 0)
-return TRUE;
-
- /* scroll to the previously remembered path (if any) */
- if (G_UNLIKELY (icon_view-priv-scroll_to_path != NULL))
-{
- /* grab the path from the reference and invalidate the reference */
- path = gtk_tree_row_reference_get_path (icon_view-priv-scroll_to_path);
- gtk_tree_row_reference_free (icon_view-priv-scroll_to_path);
- icon_view-priv-scroll_to_path = NULL;
-
- /* check if the reference was still valid */
- if (G_LIKELY (path != NULL))
-{
- /* try to scroll again */
- exo_icon_view_scroll_to_path (icon_view, path,
-icon_view-priv-scroll_to_use_align,
-icon_view-priv-scroll_to_row_align,
-icon_view-priv-scroll_to_col_align);
-
- /* release the path */
- gtk_tree_path_free (path);
-}
-}
-
- return FALSE;
-}
-
-
-
/**
* exo_icon_view_scroll_to_path:
* @icon_view: A #ExoIconView.
@@ -5828,10 +5803,6 @@ exo_icon_view_scroll_to_path (ExoIconView *icon_view,
/* Delay scrolling if either not realized or pending layout() */
if (!GTK_WIDGET_REALIZED (icon_view) || icon_view-priv-layout_idle_id != 0)
{
- /* drop previous scroll idle handler */
- if (G_UNLIKELY (icon_view-priv-scroll_idle_id != 0))
-g_source_remove (icon_view-priv-scroll_idle_id);
-
/* release the previous scroll_to_path reference */
if (G_UNLIKELY (icon_view-priv-scroll_to_path != NULL))
gtk_tree_row_reference_free (icon_view-priv-scroll_to_path);
@@ -5841,11 +5812,6 @@ exo_icon_view_scroll_to_path
[Xfce4-commits] xfce-server-scripts:master Add git_buildbot.py.
Updating branch refs/heads/master
to 13ce80b005981d4ce0df1cc97443e11eb781501b (commit)
from 72b8afea4bbdda43ac187e26e84590bdff01e382 (commit)
commit 13ce80b005981d4ce0df1cc97443e11eb781501b
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 16 16:03:16 2009 +0200
Add git_buildbot.py.
bin/git_buildbot.py | 311 +++
xfce-server-scripts.gemspec |5 +-
2 files changed, 314 insertions(+), 2 deletions(-)
diff --git a/bin/git_buildbot.py b/bin/git_buildbot.py
new file mode 100755
index 000..1f70a70
--- /dev/null
+++ b/bin/git_buildbot.py
@@ -0,0 +1,311 @@
+#! /usr/bin/env python
+
+# This script expects one line for each new revision on the form
+# oldrev newrev refname
+#
+# For example:
+# aa453216d1b3e49e7f6f98441fa56946ddcd6a20
+# 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
+#
+# Each of these changes will be passed to the buildbot server along
+# with any other change information we manage to extract from the
+# repository.
+#
+# This script is meant to be run from hooks/post-receive in the git
+# repository. It can also be run at client side with hooks/post-merge
+# after using this wrapper:
+
+#!/bin/sh
+# PRE=$(git rev-parse 'h...@{1}')
+# POST=$(git rev-parse HEAD)
+# SYMNAME=$(git rev-parse --symbolic-full-name HEAD)
+# echo $PRE $POST $SYMNAME | git_buildbot.py
+#
+# Largely based on contrib/hooks/post-receive-email from git.
+
+import commands
+import logging
+import os
+import re
+import sys
+
+from twisted.spread import pb
+from twisted.cred import credentials
+from twisted.internet import reactor
+
+from buildbot.scripts import runner
+from optparse import OptionParser
+
+# Modify this to fit your setup, or pass in --master server:host on the
+# command line
+
+master = localhost:9989
+
+# When sending the notification, send this category iff
+# it's set (via --category)
+
+category = None
+
+
+# The GIT_DIR environment variable must have been set up so that any
+# git commands that are executed will operate on the repository we're
+# installed in.
+
+changes = []
+
+
+def connectFailed(error):
+logging.error(Could not connect to %s: %s
+% (master, error.getErrorMessage()))
+return error
+
+
+def addChange(dummy, remote, changei):
+logging.debug(addChange %s, %s % (repr(remote), repr(changei)))
+try:
+c = changei.next()
+except StopIteration:
+remote.broker.transport.loseConnection()
+return None
+
+logging.info(New revision: %s % c['revision'][:8])
+for key, value in c.iteritems():
+logging.debug( %s: %s % (key, value))
+
+d = remote.callRemote('addChange', c)
+d.addCallback(addChange, remote, changei)
+return d
+
+
+def connected(remote):
+return addChange(None, remote, changes.__iter__())
+
+
+def grab_commit_info(c, rev):
+# Extract information about committer and files using git show
+f = os.popen(git show --raw --pretty=full %s % rev, 'r')
+
+files = []
+
+while True:
+line = f.readline()
+if not line:
+break
+
+m = re.match(r^:.*[MAD]\s+(.+)$, line)
+if m:
+logging.debug(Got file: %s % m.group(1))
+files.append(m.group(1))
+continue
+
+m = re.match(r^Author:\s+(.+)$, line)
+if m:
+logging.debug(Got author: %s % m.group(1))
+c['who'] = m.group(1)
+
+if re.match(r^Merge: .*$, line):
+files.append('merge')
+
+c['files'] = files
+status = f.close()
+if status:
+logging.warning(git show exited with status %d % status)
+
+
+def gen_changes(input, branch):
+while True:
+line = input.readline()
+if not line:
+break
+
+logging.debug(Change: %s % line)
+
+m = re.match(r^([0-9a-f]+) (.*)$, line.strip())
+c = {'revision': m.group(1),
+ 'comments': m.group(2),
+ 'branch': branch,
+}
+if category:
+c['category'] = category
+grab_commit_info(c, m.group(1))
+changes.append(c)
+
+
+def gen_create_branch_changes(newrev, refname, branch):
+# A new branch has been created. Generate changes for everything
+# up to `newrev' which does not exist in any branch but `refname'.
+#
+# Note that this may be inaccurate if two new branches are created
+# at the same time, pointing to the same commit, or if there are
+# commits that only exists in a common subset of the new branches.
+
+logging.info(Branch `%s' created % branch)
+
+f = os.popen(git rev-parse --not --branches
++ | grep -v $(git rev-parse %s) % refname
++ | git rev-list --reverse --pretty=oneline --stdin %s % newrev,
+'r')
+
+gen_changes(f, branch)
+
+status = f.close()
+if status:
+logging.warning(git rev-list exited with status %d % status)
+
+
+def gen_update_branch_changes(oldrev
[Xfce4-commits] xfce-git-hooks:master Add post-receive hook to trigger buildbot to build after updates.
Updating branch refs/heads/master to 9c553b5ebb4b06d844abac17b1c06f58347afd94 (commit) from 80d89ec746f35a186df061cd53d523532d24bb87 (commit) commit 9c553b5ebb4b06d844abac17b1c06f58347afd94 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 16:14:51 2009 +0200 Add post-receive hook to trigger buildbot to build after updates. This doesn't do anything at the moment because we first need to test this properly. hooks/post-receive-01-buildbot |4 post-update = post-receive|2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot new file mode 100755 index 000..a7aca1b --- /dev/null +++ b/hooks/post-receive-01-buildbot @@ -0,0 +1,4 @@ +#!/bin/sh + +# Do nothing for now until this is tested. +# git_buildbot.py --master=buildbot.xfce.org:9990 $1 $2 $3 diff --git a/post-update b/post-receive similarity index 55% copy from post-update copy to post-receive index daaf191..34b3851 100755 --- a/post-update +++ b/post-receive @@ -2,4 +2,4 @@ XFCE_GIT_HOOK_DIR=/usr/local/share/xfce-git-hooks -$XFCE_GIT_HOOK_DIR/hooks/post-update-01-server-info +$XFCE_GIT_HOOK_DIR/hooks/post-receive-01-buildbot ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-server-scripts:master Revert Add git_buildbot.py.
Updating branch refs/heads/master
to 3957bf5e71baa39ee9ee5cdb57825cb487d56263 (commit)
from 13ce80b005981d4ce0df1cc97443e11eb781501b (commit)
commit 3957bf5e71baa39ee9ee5cdb57825cb487d56263
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 16 18:11:54 2009 +0200
Revert Add git_buildbot.py.
This reverts commit 13ce80b005981d4ce0df1cc97443e11eb781501b.
rubygems doesn't like non-ruby scripts in bin/, so I've decided to move
the git buildbot script directly into our hooks repository.
bin/git_buildbot.py | 311 ---
xfce-server-scripts.gemspec |5 +-
2 files changed, 2 insertions(+), 314 deletions(-)
diff --git a/bin/git_buildbot.py b/bin/git_buildbot.py
deleted file mode 100755
index 1f70a70..000
--- a/bin/git_buildbot.py
+++ /dev/null
@@ -1,311 +0,0 @@
-#! /usr/bin/env python
-
-# This script expects one line for each new revision on the form
-# oldrev newrev refname
-#
-# For example:
-# aa453216d1b3e49e7f6f98441fa56946ddcd6a20
-# 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
-#
-# Each of these changes will be passed to the buildbot server along
-# with any other change information we manage to extract from the
-# repository.
-#
-# This script is meant to be run from hooks/post-receive in the git
-# repository. It can also be run at client side with hooks/post-merge
-# after using this wrapper:
-
-#!/bin/sh
-# PRE=$(git rev-parse 'h...@{1}')
-# POST=$(git rev-parse HEAD)
-# SYMNAME=$(git rev-parse --symbolic-full-name HEAD)
-# echo $PRE $POST $SYMNAME | git_buildbot.py
-#
-# Largely based on contrib/hooks/post-receive-email from git.
-
-import commands
-import logging
-import os
-import re
-import sys
-
-from twisted.spread import pb
-from twisted.cred import credentials
-from twisted.internet import reactor
-
-from buildbot.scripts import runner
-from optparse import OptionParser
-
-# Modify this to fit your setup, or pass in --master server:host on the
-# command line
-
-master = localhost:9989
-
-# When sending the notification, send this category iff
-# it's set (via --category)
-
-category = None
-
-
-# The GIT_DIR environment variable must have been set up so that any
-# git commands that are executed will operate on the repository we're
-# installed in.
-
-changes = []
-
-
-def connectFailed(error):
-logging.error(Could not connect to %s: %s
-% (master, error.getErrorMessage()))
-return error
-
-
-def addChange(dummy, remote, changei):
-logging.debug(addChange %s, %s % (repr(remote), repr(changei)))
-try:
-c = changei.next()
-except StopIteration:
-remote.broker.transport.loseConnection()
-return None
-
-logging.info(New revision: %s % c['revision'][:8])
-for key, value in c.iteritems():
-logging.debug( %s: %s % (key, value))
-
-d = remote.callRemote('addChange', c)
-d.addCallback(addChange, remote, changei)
-return d
-
-
-def connected(remote):
-return addChange(None, remote, changes.__iter__())
-
-
-def grab_commit_info(c, rev):
-# Extract information about committer and files using git show
-f = os.popen(git show --raw --pretty=full %s % rev, 'r')
-
-files = []
-
-while True:
-line = f.readline()
-if not line:
-break
-
-m = re.match(r^:.*[MAD]\s+(.+)$, line)
-if m:
-logging.debug(Got file: %s % m.group(1))
-files.append(m.group(1))
-continue
-
-m = re.match(r^Author:\s+(.+)$, line)
-if m:
-logging.debug(Got author: %s % m.group(1))
-c['who'] = m.group(1)
-
-if re.match(r^Merge: .*$, line):
-files.append('merge')
-
-c['files'] = files
-status = f.close()
-if status:
-logging.warning(git show exited with status %d % status)
-
-
-def gen_changes(input, branch):
-while True:
-line = input.readline()
-if not line:
-break
-
-logging.debug(Change: %s % line)
-
-m = re.match(r^([0-9a-f]+) (.*)$, line.strip())
-c = {'revision': m.group(1),
- 'comments': m.group(2),
- 'branch': branch,
-}
-if category:
-c['category'] = category
-grab_commit_info(c, m.group(1))
-changes.append(c)
-
-
-def gen_create_branch_changes(newrev, refname, branch):
-# A new branch has been created. Generate changes for everything
-# up to `newrev' which does not exist in any branch but `refname'.
-#
-# Note that this may be inaccurate if two new branches are created
-# at the same time, pointing to the same commit, or if there are
-# commits that only exists in a common subset of the new branches.
-
-logging.info(Branch `%s' created % branch)
-
-f = os.popen(git rev-parse --not --branches
-+ | grep -v $(git rev-parse %s) % refname
-+ | git rev-list --reverse --pretty
[Xfce4-commits] thunar:progress-dialog-experiments Remove ThunarVFS item from the TODO list.
Updating branch refs/heads/progress-dialog-experiments to 2028e116ebf36bf0461f1d2f5b186c84259cb89c (commit) from ab7743c42452805a7a7e7bfe842d31c899babafb (commit) commit 2028e116ebf36bf0461f1d2f5b186c84259cb89c Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:30:10 2009 +0200 Remove ThunarVFS item from the TODO list. TODO |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index b5a478b..7547d2a 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,6 @@ -Important for Thunar 1.0 +Important for Thunar 1.2 - - Check getmntinfo() or getfsstat() for ThunarVfsVolumeManagerBSD, which - might be faster than several statfs() calls. - - The layouting code for ThunarLocationButtons is still buggy. Problem shows with paths that include a very long directory; you cannot scroll to the last path component then. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master The buildbot hook is not working yet. Try something else.
Updating branch refs/heads/master to 8a2f6aa76a07367a858b66a5816215508320010d (commit) from 38acc65483bed9aa9159993a46e7ac64bc616442 (commit) commit 8a2f6aa76a07367a858b66a5816215508320010d Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:32:40 2009 +0200 The buildbot hook is not working yet. Try something else. hooks/post-receive-01-buildbot |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot index 44709ee..5b343b1 100755 --- a/hooks/post-receive-01-buildbot +++ b/hooks/post-receive-01-buildbot @@ -7,4 +7,4 @@ else fi # Do nothing for now until this is tested. -echo $1 $2 $3 | python $mydir/git_buildbot.py +echo $1 $2 $3 | $mydir/git_buildbot.py ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Remove ThunarVFS item from the TODO list.
Updating branch refs/heads/master to e808cf6ceebc6e52f288e856a8149f09fd62957b (commit) from 8cc2344ddecd219c75cb6056f9aa5ae8950a0b90 (commit) commit e808cf6ceebc6e52f288e856a8149f09fd62957b Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:30:10 2009 +0200 Remove ThunarVFS item from the TODO list. TODO |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index b5a478b..7547d2a 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,6 @@ -Important for Thunar 1.0 +Important for Thunar 1.2 - - Check getmntinfo() or getfsstat() for ThunarVfsVolumeManagerBSD, which - might be faster than several statfs() calls. - - The layouting code for ThunarLocationButtons is still buggy. Problem shows with paths that include a very long directory; you cannot scroll to the last path component then. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Add some debugging output as it is still not working.
Updating branch refs/heads/master to ade395ed8e11b58eeb4c9b79664b87dd3cc5b00e (commit) from 1c94ff6879adad3cec2f2359c081aacdf468292a (commit) commit ade395ed8e11b58eeb4c9b79664b87dd3cc5b00e Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:39:07 2009 +0200 Add some debugging output as it is still not working. hooks/post-receive-01-buildbot |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot index 5b343b1..79d2942 100755 --- a/hooks/post-receive-01-buildbot +++ b/hooks/post-receive-01-buildbot @@ -1,5 +1,10 @@ #!/bin/sh +echo 0 = $0 +echo 1 = $1 +echo 2 = $2 +echo 3 = $3 + if echo $0 | grep -q '^/'; then mydir=`dirname $0` else ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add Nick to the authors of Thunar.
Updating branch refs/heads/master to e379d5b20deb1a0296a1952c866a8914f3da59d2 (commit) from e808cf6ceebc6e52f288e856a8149f09fd62957b (commit) commit e379d5b20deb1a0296a1952c866a8914f3da59d2 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:41:22 2009 +0200 Add Nick to the authors of Thunar. AUTHORS |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2431749..d44a8fa 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,7 @@ Benedikt Meurer be...@xfce.org Jannis Pohlmann jan...@xfce.org Jeffs Franks jcfra...@xfce.org +Nick Schermer n...@xfce.org The tdb library, which is included with the Thunar distribution, was originally written as part of the Samba suite. My understanding is that the majority of ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix repository information in HACKING.
Updating branch refs/heads/master to 3921a049b4f7511e8d833fe3465b76ace9e1abab (commit) from e379d5b20deb1a0296a1952c866a8914f3da59d2 (commit) commit 3921a049b4f7511e8d833fe3465b76ace9e1abab Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:44:20 2009 +0200 Fix repository information in HACKING. HACKING | 10 +++--- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/HACKING b/HACKING index 2c8366b..b945d20 100644 --- a/HACKING +++ b/HACKING @@ -13,14 +13,10 @@ mailinglist. Your patch should be in unified diff format (the -u option to GNU diff) and it must comply with the coding style described below. Please send a patch against a recent version of this package. Patches -against the Subversion trunk branch are most preferable. You can always -access the trunk branch from +against the Git master branch are most preferable. You can always +clone the Thunar repository from - http://svn.xfce.org/svn/xfce/thunar/trunk - -or using an installed Subversion client - - svn co http://svn.xfce.org/svn/xfce/thunar/trunk thunar + http://git.xfce.org/git/xfce/thunar Feature requests ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master I'm stupid. post-receive needs to read its arguments from stdin.
Updating branch refs/heads/master to 989de310aa466211135e7b145f0a9ca6c5b08a68 (commit) from ade395ed8e11b58eeb4c9b79664b87dd3cc5b00e (commit) commit 989de310aa466211135e7b145f0a9ca6c5b08a68 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:49:45 2009 +0200 I'm stupid. post-receive needs to read its arguments from stdin. post-receive |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/post-receive b/post-receive index 2fea319..97104b1 100755 --- a/post-receive +++ b/post-receive @@ -2,4 +2,7 @@ XFCE_GIT_HOOK_DIR=/usr/local/share/xfce-git-hooks -$XFCE_GIT_HOOK_DIR/hooks/post-receive-01-buildbot $@ +while read oldrev newrev refname; do + $XFCE_GIT_HOOK_DIR/hooks/post-receive-01-buildbot \ +$oldrev $newrev $refname +done ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add missing parameter to the thunar-file-manager.py example script.
Updating branch refs/heads/master
to 3addd7e3c4c19287bd45019728c735259eef3267 (commit)
from 3921a049b4f7511e8d833fe3465b76ace9e1abab (commit)
commit 3addd7e3c4c19287bd45019728c735259eef3267
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 16 18:52:26 2009 +0200
Add missing parameter to the thunar-file-manager.py example script.
We now have startup notification support in the Thunar D-Bus interface
which adds a startup ID parameter to some of the D-Bus methods.
examples/thunar-file-manager.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/examples/thunar-file-manager.py b/examples/thunar-file-manager.py
index 23991c2..995d228 100755
--- a/examples/thunar-file-manager.py
+++ b/examples/thunar-file-manager.py
@@ -55,4 +55,4 @@ thunar = dbus.Interface(thunar_object, 'org.xfce.Thunar')
# We just popup the bulk rename dialog to
# demonstrate that it works. ;-)
-thunar.BulkRename('/tmp', [], True, '')
+thunar.BulkRename('/tmp', [], True, '', '')
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Remove debugging output. Rebuilding after each push works!
Updating branch refs/heads/master to 3165cfb9fde546f1db930f3ac702d2bdec173185 (commit) from 989de310aa466211135e7b145f0a9ca6c5b08a68 (commit) commit 3165cfb9fde546f1db930f3ac702d2bdec173185 Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 18:55:53 2009 +0200 Remove debugging output. Rebuilding after each push works! hooks/post-receive-01-buildbot |7 +-- 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/hooks/post-receive-01-buildbot b/hooks/post-receive-01-buildbot index 79d2942..a63e550 100755 --- a/hooks/post-receive-01-buildbot +++ b/hooks/post-receive-01-buildbot @@ -1,10 +1,5 @@ #!/bin/sh -echo 0 = $0 -echo 1 = $1 -echo 2 = $2 -echo 3 = $3 - if echo $0 | grep -q '^/'; then mydir=`dirname $0` else @@ -12,4 +7,4 @@ else fi # Do nothing for now until this is tested. -echo $1 $2 $3 | $mydir/git_buildbot.py +echo $1 $2 $3 | $mydir/git_buildbot.py /dev/null ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Prepend REPO environment variable to all files passed to buildbot.
Updating branch refs/heads/master to 6cbc03b90d4e65823aaef9bbb03ab48ae9fe7f8f (commit) from 3165cfb9fde546f1db930f3ac702d2bdec173185 (commit) commit 6cbc03b90d4e65823aaef9bbb03ab48ae9fe7f8f Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 19:34:05 2009 +0200 Prepend REPO environment variable to all files passed to buildbot. hooks/git_buildbot.py |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hooks/git_buildbot.py b/hooks/git_buildbot.py index 5da979c..b7eee42 100755 --- a/hooks/git_buildbot.py +++ b/hooks/git_buildbot.py @@ -86,6 +86,7 @@ def grab_commit_info(c, rev): f = os.popen(git show --raw --pretty=full %s % rev, 'r') files = [] +repository = os.environ['REPO'] while True: line = f.readline() @@ -94,8 +95,8 @@ def grab_commit_info(c, rev): m = re.match(r^:.*[MAD]\s+(.+)$, line) if m: -logging.debug(Got file: %s % m.group(1)) -files.append(m.group(1)) +logging.debug(Got file: %s % repository + / + m.group(1)) +files.append(repository + / + m.group(1)) continue m = re.match(r^Author:\s+(.+)$, line) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add the startup ID parameter to the code in comments as well.
Updating branch refs/heads/master
to cac7741f2b041d4a21d1604be4875eef2a4c4976 (commit)
from 3addd7e3c4c19287bd45019728c735259eef3267 (commit)
commit cac7741f2b041d4a21d1604be4875eef2a4c4976
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 16 19:37:40 2009 +0200
Add the startup ID parameter to the code in comments as well.
examples/thunar-file-manager.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/examples/thunar-file-manager.py b/examples/thunar-file-manager.py
index 995d228..ee2e6a3 100755
--- a/examples/thunar-file-manager.py
+++ b/examples/thunar-file-manager.py
@@ -47,7 +47,7 @@ thunar = dbus.Interface(thunar_object, 'org.xfce.Thunar')
# standalone version with an empty file list and /tmp
# as default folder for the Add Files dialog, use:
#
-# thunar.BulkRename('/tmp', [], True, '')
+# thunar.BulkRename('/tmp', [], True, '', '')
#
# See the thunar-dbus-service-infos.xml file for the exact
# interface definition.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Set REPO for post-receive hooks.
Updating branch refs/heads/master to 8cc0d1cd2058db5af32a8d3a2318177a508df71b (commit) from 6cbc03b90d4e65823aaef9bbb03ab48ae9fe7f8f (commit) commit 8cc0d1cd2058db5af32a8d3a2318177a508df71b Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 19:47:22 2009 +0200 Set REPO for post-receive hooks. post-receive | 12 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/post-receive b/post-receive index 97104b1..cb15993 100755 --- a/post-receive +++ b/post-receive @@ -2,6 +2,18 @@ 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 +fi + +[[ $GIT_DIR = . ]] path=`pwd` || path=$GIT_DIR +parent=`dirname $path` +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 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Test commit for the buildbot hook script.
Updating branch refs/heads/master to 40684e734a809f5bbbc82e4851b298948a694bef (commit) from e90f7cebe3d3234d010acba15df309009cd34661 (commit) commit 40684e734a809f5bbbc82e4851b298948a694bef Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 19:47:57 2009 +0200 Test commit for the buildbot hook script. 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/FOO b/FOO new file mode 100644 index 000..e69de29 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Revert Test commit for the buildbot hook script.
Updating branch refs/heads/master to d8ee9b4e6e0677bafd81f459ca49cb3b718eafbb (commit) from 40684e734a809f5bbbc82e4851b298948a694bef (commit) commit d8ee9b4e6e0677bafd81f459ca49cb3b718eafbb Author: Jannis Pohlmann jan...@xfce.org Date: Wed Sep 16 19:49:21 2009 +0200 Revert Test commit for the buildbot hook script. This reverts commit 40684e734a809f5bbbc82e4851b298948a694bef. 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/FOO b/FOO deleted file mode 100644 index e69de29..000 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-migration:master Add post-receive to the hooks linked into all repositories.
Updating branch refs/heads/master
to 46537f71a27061ad5a9ab472be12dfd37964ca95 (commit)
from d8749a22198a6605c034997dd5770f56e6133019 (commit)
commit 46537f71a27061ad5a9ab472be12dfd37964ca95
Author: Jannis Pohlmann jan...@xfce.org
Date: Thu Sep 17 02:28:50 2009 +0200
Add post-receive to the hooks linked into all repositories.
repos-final-prep.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/repos-final-prep.sh b/repos-final-prep.sh
index b24e2ad..48d6d75 100755
--- a/repos-final-prep.sh
+++ b/repos-final-prep.sh
@@ -2,7 +2,7 @@
GIT_REPOS_ROOT=/var/git
HOOKS_DIR=/usr/local/share/xfce-git-hooks
-HOOKS=update post-update
+HOOKS=update post-update post-receive
setup_repo() {
export GIT_DIR=$1
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Update to xfce4-dev-tools 4.7.0.
Updating branch refs/heads/master
to 98a73ae5b52ce26010bb30f574b5e4eeba601309 (commit)
from fc24aa2972d14d815f743c6a93270252239599ed (commit)
commit 98a73ae5b52ce26010bb30f574b5e4eeba601309
Author: Jannis Pohlmann jan...@xfce.org
Date: Thu Sep 17 02:38:14 2009 +0200
Update to xfce4-dev-tools 4.7.0.
autogen.sh | 25 +
configure.in.in |6 +++---
2 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 6be74d7..6dd7849 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,29 +18,6 @@ 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 revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-if test -d .git/svn; then
- revision=`git svn find-rev trunk 2/dev/null ||
-git svn find-rev origin/trunk 2/dev/null ||
-git svn find-rev HEAD 2/dev/null ||
-git svn find-rev master 2/dev/null`
-else
- revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
-fi
-sed -e s/@LINGUAS@/${linguas}/g \
--e s/@REVISION@/${revision}/g \
- configure.in.in configure.in
-
-exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION=4.7.0 exec xdt-autogen $@
# vi:set ts=2 sw=2 et ai:
diff --git a/configure.in.in b/configure.in.in
index 36ea09d..7b3d553 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -14,10 +14,10 @@ m4_define([libxfce4util_verinfo], [5:1:1])
m4_define([libxfce4util_version_major], [4])
m4_define([libxfce4util_version_minor], [7])
m4_define([libxfce4util_version_micro], [0])
-m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no
nano version
+m4_define([libxfce4util_version_nano], [git]) dnl leave this empty to have
no nano version
m4_define([libxfce4util_version_build], [...@revision@])
m4_define([libxfce4util_version_tag], [])
-m4_define([libxfce4util_version],
[libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(),
[], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(),
[svn], [libxfce4util_version_tag()-libxfce4util_version_build()], [])])
+m4_define([libxfce4util_version],
[libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(),
[], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(),
[git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])])
dnl **
dnl *** Overall Xfce version, modify this when making releases ***
@@ -32,7 +32,7 @@ dnl # YOU ARE DOING.
dnl
dnl *** Full debug support for SVN snapshots ***
dnl
-m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(),
[svn], [full], [minimum])])
+m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(),
[git], [full], [minimum])])
dnl ***
dnl *** Initialize autoconf ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Fix the docs for make distcheck.
Updating branch refs/heads/master to af3d4ffbe900028649aa85feaaf5d8e1053f9587 (commit) from 98a73ae5b52ce26010bb30f574b5e4eeba601309 (commit) commit af3d4ffbe900028649aa85feaaf5d8e1053f9587 Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 02:39:00 2009 +0200 Fix the docs for make distcheck. docs/Makefile.am | 11 ++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 4d381cd..9627057 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,4 +1,6 @@ -## Process this file with automake to produce Makefile.in +# Process this file with automake to produce Makefile.in +# +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: AUTOMAKE_OPTIONS = 1.8 @@ -54,3 +56,10 @@ include $(top_srcdir)/gtk-doc.make EXTRA_DIST += \ version.xml.in +if MAINTAINER_MODE +%.1: %.xml + xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $ +endif + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Disable debug output in the buildbot hook.
Updating branch refs/heads/master to 358e138eda1e82a4c9741c9e2d1c98f84e189619 (commit) from 8cc0d1cd2058db5af32a8d3a2318177a508df71b (commit) commit 358e138eda1e82a4c9741c9e2d1c98f84e189619 Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 02:41:55 2009 +0200 Disable debug output in the buildbot hook. hooks/git_buildbot.py |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/git_buildbot.py b/hooks/git_buildbot.py index b7eee42..37de5f9 100755 --- a/hooks/git_buildbot.py +++ b/hooks/git_buildbot.py @@ -278,10 +278,10 @@ def parse_options(): # information to a file as well (we'll set that up later.) stderr = logging.StreamHandler(sys.stderr) fmt = logging.Formatter(git_buildbot: %(levelname)s: %(message)s) -stderr.setLevel(logging.DEBUG) +stderr.setLevel(logging.ERROR) stderr.setFormatter(fmt) logging.getLogger().addHandler(stderr) -logging.getLogger().setLevel(logging.DEBUG) +logging.getLogger().setLevel(logging.INFO) try: options = parse_options() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Oops. Move 'git' to version_tag instead of version_nano.
Updating branch refs/heads/master to 03aec0ed8e9bf68cd3159ac96dd569f1ca420e1f (commit) from af3d4ffbe900028649aa85feaaf5d8e1053f9587 (commit) commit 03aec0ed8e9bf68cd3159ac96dd569f1ca420e1f Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 17 02:45:29 2009 +0200 Oops. Move 'git' to version_tag instead of version_nano. configure.in.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in.in b/configure.in.in index 7b3d553..f00b493 100644 --- a/configure.in.in +++ b/configure.in.in @@ -14,9 +14,9 @@ m4_define([libxfce4util_verinfo], [5:1:1]) m4_define([libxfce4util_version_major], [4]) m4_define([libxfce4util_version_minor], [7]) m4_define([libxfce4util_version_micro], [0]) -m4_define([libxfce4util_version_nano], [git]) dnl leave this empty to have no nano version +m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no nano version m4_define([libxfce4util_version_build], [...@revision@]) -m4_define([libxfce4util_version_tag], []) +m4_define([libxfce4util_version_tag], [git]) m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) dnl ** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfcegui4:master Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0.
Updating branch refs/heads/master
to cd1159f3d117a1191a8426e7ed3a8f3493cad972 (commit)
from 09b74380f69f430da11f48355e06378bffe8b628 (commit)
commit cd1159f3d117a1191a8426e7ed3a8f3493cad972
Author: Jannis Pohlmann jan...@xfce.org
Date: Thu Sep 17 02:58:27 2009 +0200
Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0.
autogen.sh | 28 ++--
configure.in.in |2 +-
docs/Makefile.am | 11 ++-
3 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index a2febe3..c4e0651 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id$
+# vi:set et ai sw=2 sts=2 ts=2: */
#
# Copyright (c) 2002-2006
# The Xfce development team. All rights reserved.
@@ -18,28 +18,4 @@ 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 revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-if [ -d .git ]; then
- revision=$(git rev-parse --short HEAD)
-fi
-if [ -z $revision ]; then
- revision=UNKNOWN
-fi
-
-sed -e s/@LINGUAS@/${linguas}/g \
--e s/@REVISION@/${revision}/g \
- configure.in.in configure.in
-
-exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
+XDT_AUTOGEN_REQUIRED_VERSION=4.7.0 exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index 0c4816b..983ff87 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -25,7 +25,7 @@ dnl # YOU ARE DOING.
dnl ***
dnl *** Debugging support for SVN snapshots ***
dnl ***
-m4_define([libxfcegui4_debug_default], [ifelse(libxfcegui4_version_tag(),
[svn], [yes], [minimum])])
+m4_define([libxfcegui4_debug_default], [ifelse(libxfcegui4_version_tag(),
[git], [yes], [minimum])])
dnl ***
dnl *** Initialize autoconf ***
diff --git a/docs/Makefile.am b/docs/Makefile.am
index d1e1e19..4046464 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,6 @@
-## Process this file with automake to produce Makefile.in
+# Process this file with automake to produce Makefile.in
+#
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
AUTOMAKE_OPTIONS = 1.6
@@ -57,3 +59,10 @@ include $(top_srcdir)/gtk-doc.make
EXTRA_DIST += \
version.xml.in
+if MAINTAINER_MODE
+%.1: %.xml
+ xsltproc -nonet
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $
+endif
+
+# required for gtk-doc
+dist-hook: all
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4menu:master Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0.
Updating branch refs/heads/master
to fd5e491d10fa94f5803f12279f23729c663b43ab (commit)
from 69e11e92f5c7083bdf63a3a3cfe479505021d4d3 (commit)
commit fd5e491d10fa94f5803f12279f23729c663b43ab
Author: Jannis Pohlmann jan...@xfce.org
Date: Thu Sep 17 03:13:01 2009 +0200
Fix docs for make distcheck. Update to xfce4-dev-tools 4.7.0.
autogen.sh | 28 ++--
configure.in.in|6 +++---
docs/reference/Makefile.am |3 +++
3 files changed, 8 insertions(+), 29 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index e7ad211..c3305b7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
#
# $Id$
#
-# vi:set ts=2 sw=2 et ai:
+# vi:set et ai sw=2 sts=2 ts=2:
#
# Copyright (c) 2007
# The Xfce development team. All rights reserved.
@@ -20,28 +20,4 @@ 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 revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-if test -d .git/svn; then
- revision=$(git svn find-rev trunk 2/dev/null ||
- git svn find-rev origin/trunk 2/dev/null ||
- git svn find-rev HEAD 2/dev/null ||
- git svn find-rev master 2/dev/null)
-else
- revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n,$2}'`
-fi
-sed -e s/@LINGUAS@/${linguas}/g \
--e s/@REVISION@/${revision}/g \
- configure.in.in configure.in
-
-exec xdt-autogen $@
-
+XDT_AUTOGEN_REQUIRED_VERSION=4.7.0 exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index 0a411c3..d245d43 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -17,13 +17,13 @@ m4_define([libxfce4menu_version_minor], [6])
m4_define([libxfce4menu_version_micro], [1])
m4_define([libxfce4menu_version_nano], [])
m4_define([libxfce4menu_version_build], [...@revision@])
-m4_define([libxfce4menu_version_tag], [])
-m4_define([libxfce4menu_version],
[libxfce4menu_version_major().libxfce4menu_version_minor().libxfce4menu_version_micro()ifelse(libxfce4menu_version_nano(),
[], [], [.libxfce4menu_version_nano()])ifelse(libxfce4menu_version_tag(),
[svn], [libxfce4menu_version_tag()-libxfce4menu_version_build()],
[libxfce4menu_version_tag()])])
+m4_define([libxfce4menu_version_tag], [git])
+m4_define([libxfce4menu_version],
[libxfce4menu_version_major().libxfce4menu_version_minor().libxfce4menu_version_micro()ifelse(libxfce4menu_version_nano(),
[], [], [.libxfce4menu_version_nano()])ifelse(libxfce4menu_version_tag(),
[git], [libxfce4menu_version_tag()-libxfce4menu_version_build()],
[libxfce4menu_version_tag()])])
dnl
dnl *** Full debug support for SVN snapshots ***
dnl
-m4_define([libxfce4menu_debug_default], [ifelse(libxfce4menu_version_tag(),
[svn], [full], [minimum])])
+m4_define([libxfce4menu_debug_default], [ifelse(libxfce4menu_version_tag(),
[git], [full], [minimum])])
dnl ***
dnl *** Initialize autoconf ***
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 2ebe79f..62bfe9b 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -58,3 +58,6 @@ include $(top_srcdir)/gtk-doc.make
# Other files to distribute
EXTRA_DIST += \
version.xml.in
+
+# required for gtk-doc
+dist-hook: all
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Use nore...@xfce.org as the email address used to send commit mails.
Updating branch refs/heads/master
to 12f2f09b216b4e7d2ef28779e2d7a9fe4e7ea7c9 (commit)
from e1da322ef770acf3155f092861ca4dff5e2759f1 (commit)
commit 12f2f09b216b4e7d2ef28779e2d7a9fe4e7ea7c9
Author: Jannis Pohlmann jan...@xfce.org
Date: Fri Sep 18 04:02:16 2009 +0200
Use nore...@xfce.org as the email address used to send commit mails.
Apparently, mailman doesn't care about envelope sender which we tried to
set in order to make it accept mails from people not subscribed to the
commits mailing list. So, we'll be using nore...@xfce.org now until
there's a better solution.
hooks/update-03-send-commit-mails | 14 ++
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/hooks/update-03-send-commit-mails
b/hooks/update-03-send-commit-mails
index 34605f7..ba8a5a5 100755
--- a/hooks/update-03-send-commit-mails
+++ b/hooks/update-03-send-commit-mails
@@ -37,22 +37,12 @@ replyto=`git repo-config xfce-hooks.replyto`
xfce_git_hook_committer()
{
- git show --pretty=format:'%cn %ce' -s $1
+ git show --pretty=format:'%cn nore...@xfce.org' -s $1
}
xfce_git_hook_tagger()
{
- git show --summary $1 | grep '^Tagger:' | sed 's/^Tagger: //'
-}
-
-xfce_git_hook_author()
-{
- git show --pretty=format:'%an %ae' $1
-}
-
-xfce_git_hook_tag_date()
-{
- git show --summary $1 | head -n3 | grep '^Date:' | sed -e 's/^Date: //'
+ git show --summary $1 | grep '^Tagger:' | sed 's/^Tagger: //' | sed
's/.*/nore...@xfce.org/'
}
xfce_git_hook_short_refname()
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-git-hooks:master Too many typos lately... fix the noreply address for newly created tags.
Updating branch refs/heads/master
to 1a3455349145bd8a8564a517c83a8402caf938b1 (commit)
from 12f2f09b216b4e7d2ef28779e2d7a9fe4e7ea7c9 (commit)
commit 1a3455349145bd8a8564a517c83a8402caf938b1
Author: Jannis Pohlmann jan...@xfce.org
Date: Fri Sep 18 04:11:43 2009 +0200
Too many typos lately... fix the noreply address for newly created tags.
hooks/update-03-send-commit-mails |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hooks/update-03-send-commit-mails
b/hooks/update-03-send-commit-mails
index ba8a5a5..dffd447 100755
--- a/hooks/update-03-send-commit-mails
+++ b/hooks/update-03-send-commit-mails
@@ -42,7 +42,7 @@ xfce_git_hook_committer()
xfce_git_hook_tagger()
{
- git show --summary $1 | grep '^Tagger:' | sed 's/^Tagger: //' | sed
's/.*/nore...@xfce.org/'
+ git show --summary $1 | grep '^Tagger:' | sed 's/^Tagger: //' | sed
's/.*/nore...@xfce.org/'
}
xfce_git_hook_short_refname()
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4menu:master Try to fix make distcheck with gtk-doc (need dist-hook: all).
Updating branch refs/heads/master to 6ac6d6776be47143002a4dbbe92d89e90a1ca810 (commit) from fd5e491d10fa94f5803f12279f23729c663b43ab (commit) commit 6ac6d6776be47143002a4dbbe92d89e90a1ca810 Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 04:30:37 2009 +0200 Try to fix make distcheck with gtk-doc (need dist-hook: all). docs/reference/Makefile.am |2 -- libxfce4menu/Makefile.am |3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 62bfe9b..fa59a3f 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -47,9 +47,7 @@ INCLUDES = \ $(LIBXFCE4UTIL_CFLAGS) GTKDOC_LIBS = \ - $(GLIB_CFLAGS) \ $(GTHREAD_LIBS) \ - $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_LIBS)\ $(top_builddir)/libxfce4menu/libxfce4menu-$(LIBXFCE4MENU_VERSION_API).la diff --git a/libxfce4menu/Makefile.am b/libxfce4menu/Makefile.am index c6df320..2bf778c 100644 --- a/libxfce4menu/Makefile.am +++ b/libxfce4menu/Makefile.am @@ -87,3 +87,6 @@ EXTRA_DIST = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxfce4menu-0.1.pc + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4menu:master Don't run the programs in test/ during make distcheck.
Updating branch refs/heads/master to 929070f36220aa66a4802ce3a94e4ee0c5d6da7f (commit) from 6ac6d6776be47143002a4dbbe92d89e90a1ca810 (commit) commit 929070f36220aa66a4802ce3a94e4ee0c5d6da7f Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 04:34:13 2009 +0200 Don't run the programs in test/ during make distcheck. They are thought to be programs executed by developers to verify that their don't break things completely. tests/Makefile.am |6 +- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ebc3613..03e264c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,11 +6,7 @@ INCLUDES = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\libxfce4menu-tests\ -TESTS = \ - test-menu-spec \ - test-display-menu - -check_PROGRAMS = \ +noinst_PROGRAMS = \ test-menu-spec \ test-display-menu ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Switch back to previous debug configure code from XDT_FEATURE_DEBUG().
Updating branch refs/heads/master to 00ea28c6384c46cf7fda51591a2fa2b49970b6e7 (commit) from a79add0b3c27775e76207cced9cbe02745f6974b (commit) commit 00ea28c6384c46cf7fda51591a2fa2b49970b6e7 Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 04:40:26 2009 +0200 Switch back to previous debug configure code from XDT_FEATURE_DEBUG(). I'd like to see if this has an impact on make distcheck. It could be that only modules using XDT_FEATURE_DEBUG(), like xfconf and Thunar, break due to this error in the scanner code generated by gtk-doc: thunarx-scan.c: In function ‘describe_signed_constant’: thunarx-scan.c:884: error: comparison between signed and unsigned configure.in.in | 106 +++--- 1 files changed, 53 insertions(+), 53 deletions(-) diff --git a/configure.in.in b/configure.in.in index cea90b5..c8b2813 100644 --- a/configure.in.in +++ b/configure.in.in @@ -203,59 +203,59 @@ AM_CONDITIONAL([ENABLE_XML2PO], [test x$enable_xml2po = xyes]) dnl *** dnl *** Check for debugging support *** dnl *** -XDT_FEATURE_DEBUG() -#AC_ARG_ENABLE([debug], -#AC_HELP_STRING([--enable-debug=@:@no/minimum/yes/full@:@], [Turn on debugging @:@default=thunar_debug_default@:@]), -# [], [enable_debug=thunar_debug_default]) -#AC_MSG_CHECKING([whether to enable debugging support]) -#if test x$enable_debug = xfull -o x$enable_debug = xyes; then -# dnl Print the result -# AC_MSG_RESULT([$enable_debug]) -# -# dnl Make sure we detect possible errors (if supported) -# save_CFLAGS=$CFLAGS -# CFLAGS=$CFLAGS -Wall -Werror -# AC_MSG_CHECKING([whether $CC accepts -Wall -Werror]) -# AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ -#AC_MSG_RESULT([yes]) -#PLATFORM_CFLAGS=$PLATFORM_CFLAGS -Wall -Werror -# ], [ -#AC_MSG_RESULT([no]) -# ]) -# CFLAGS=$save_CFLAGS -# -# dnl Paranoia for --enable-debug=full -# if test x$enable_debug = xfull; then -#dnl Enable extensive debugging -#PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG -# -#dnl Use -O0 -g3 if the compiler supports it -#save_CFLAGS=$CFLAGS -#CFLAGS=$CFLAGS -O0 -g3 -#AC_MSG_CHECKING([whether $CC accepts -O0 -g3]) -#AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ -# AC_MSG_RESULT([yes]) -# PLATFORM_CFLAGS=$PLATFORM_CFLAGS -O0 -g3 -#], [ -# AC_MSG_RESULT([no]) -#]) -#CFLAGS=$save_CFLAGS -# fi -#else -# dnl Print the result -# AC_MSG_RESULT([$enable_debug]) -# -# dnl Disable debugging (release build) -# PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DNDEBUG -# -# dnl Disable object cast checks -# PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS -# -# dnl Disable all checks for --enable-debug=no -# if test x$enable_debug = xno; then -#PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -# fi -#fi +#XDT_FEATURE_DEBUG() +AC_ARG_ENABLE([debug], +AC_HELP_STRING([--enable-debug=@:@no/minimum/yes/full@:@], [Turn on debugging @:@default=thunar_debug_default@:@]), + [], [enable_debug=thunar_debug_default]) +AC_MSG_CHECKING([whether to enable debugging support]) +if test x$enable_debug = xfull -o x$enable_debug = xyes; then + dnl Print the result + AC_MSG_RESULT([$enable_debug]) + + dnl Make sure we detect possible errors (if supported) + save_CFLAGS=$CFLAGS + CFLAGS=$CFLAGS -Wall -Werror + AC_MSG_CHECKING([whether $CC accepts -Wall -Werror]) + AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ +AC_MSG_RESULT([yes]) +PLATFORM_CFLAGS=$PLATFORM_CFLAGS -Wall -Werror + ], [ +AC_MSG_RESULT([no]) + ]) + CFLAGS=$save_CFLAGS + + dnl Paranoia for --enable-debug=full + if test x$enable_debug = xfull; then +dnl Enable extensive debugging +PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG + +dnl Use -O0 -g3 if the compiler supports it +save_CFLAGS=$CFLAGS +CFLAGS=$CFLAGS -O0 -g3 +AC_MSG_CHECKING([whether $CC accepts -O0 -g3]) +AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ + AC_MSG_RESULT([yes]) + PLATFORM_CFLAGS=$PLATFORM_CFLAGS -O0 -g3 +], [ + AC_MSG_RESULT([no]) +]) +CFLAGS=$save_CFLAGS + fi +else + dnl Print the result + AC_MSG_RESULT([$enable_debug]) + + dnl Disable debugging (release build) + PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DNDEBUG + + dnl Disable object cast checks + PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS + + dnl Disable all checks for --enable-debug=no + if test x$enable_debug = xno; then +PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS + fi +fi dnl ** dnl *** Check for linker optimizations *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-vfs:master Add dist-hook: all to the Makefile.am in thunar-vfs/.
Updating branch refs/heads/master to b98181e483c753e385a8566926db04de34f8c9d8 (commit) from 6a08cd4bc8152bf997757939a56857e056370847 (commit) commit b98181e483c753e385a8566926db04de34f8c9d8 Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 04:53:17 2009 +0200 Add dist-hook: all to the Makefile.am in thunar-vfs/. This should fix make distcheck where the gtk-doc scanner doesn't find the .la library file. thunar-vfs/Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/thunar-vfs/Makefile.am b/thunar-vfs/Makefile.am index d1ed0a2..caa4349 100644 --- a/thunar-vfs/Makefile.am +++ b/thunar-vfs/Makefile.am @@ -362,4 +362,7 @@ thunar-vfs-marshal.c: thunar-vfs-marshal.list Makefile rm -f xgen-tvmc endif +# required for gtk-doc +dist-hook: all + # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master We don't want the r before @REVISION@, do we?
Updating branch refs/heads/master to 6ed94b3aa59d58110241e6e4459bf3c8e34b98fb (commit) from ec04ebb82859f9f46955b034bab1e59aa9b2959a (commit) commit 6ed94b3aa59d58110241e6e4459bf3c8e34b98fb Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 04:57:00 2009 +0200 We don't want the r before @REVISION@, do we? configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index f00b493..07120a9 100644 --- a/configure.in.in +++ b/configure.in.in @@ -15,7 +15,7 @@ m4_define([libxfce4util_version_major], [4]) m4_define([libxfce4util_version_minor], [7]) m4_define([libxfce4util_version_micro], [0]) m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no nano version -m4_define([libxfce4util_version_build], [...@revision@]) +m4_define([libxfce4util_version_build], [...@revision@]) m4_define([libxfce4util_version_tag], [git]) m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-vfs:master Add libxfce4util linker flags to test-thunar-vfs-path.
Updating branch refs/heads/master to 94ae3ee22fd1ecfc9803b3751cd584447de3b39e (commit) from 2b8f587c289c5c25fa570c9d57651b55bd719346 (commit) commit 94ae3ee22fd1ecfc9803b3751cd584447de3b39e Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 04:59:56 2009 +0200 Add libxfce4util linker flags to test-thunar-vfs-path. tests/Makefile.am |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a7cf6db..57595c5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,6 +24,7 @@ test_thunar_vfs_path_DEPENDENCIES = \ test_thunar_vfs_path_LDADD = \ $(GTHREAD_LIBS) \ + $(LIBXFCE4UTIL_LIBS)\ $(top_builddir)/thunar-vfs/libthunar-vfs-$(THUNAR_VFS_VERSION_API).la clean-local: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Add dist-hook: all to the libxfce4panel/ Makefile.am.
Updating branch refs/heads/master to 3253b0d434832be3bd5164ad3378b09c8e1196bd (commit) from 9970193c1c75c98831f3e76852a9a4ba02891fdf (commit) commit 3253b0d434832be3bd5164ad3378b09c8e1196bd Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 05:24:36 2009 +0200 Add dist-hook: all to the libxfce4panel/ Makefile.am. This seems to be required for the gtk-doc scanner to find the .la library file in make distcheck. libxfce4panel/Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am index a87dee0..e1782a0 100644 --- a/libxfce4panel/Makefile.am +++ b/libxfce4panel/Makefile.am @@ -172,4 +172,7 @@ libxfce4panel-marshal.c: libxfce4panel-marshal.h Makefile rm -f xgen-mc endif +# required for gtk-doc +dist-hook: all + # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Add dist-hook: all to the API docs Makefile.am as well.
Updating branch refs/heads/master to 26b22cdf028b0d61b2ba8a6088326111f6815d4d (commit) from 3253b0d434832be3bd5164ad3378b09c8e1196bd (commit) commit 26b22cdf028b0d61b2ba8a6088326111f6815d4d Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 05:30:37 2009 +0200 Add dist-hook: all to the API docs Makefile.am as well. docs/API/Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/docs/API/Makefile.am b/docs/API/Makefile.am index f9de0d3..a061340 100644 --- a/docs/API/Makefile.am +++ b/docs/API/Makefile.am @@ -59,3 +59,6 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute EXTRA_DIST += \ version.xml.in + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix image directory path in the Galican manual Makefile.am.
Updating branch refs/heads/master to 15f0a8a996f457b0ccd2896cd111590e3eca2cba (commit) from 00ea28c6384c46cf7fda51591a2fa2b49970b6e7 (commit) commit 15f0a8a996f457b0ccd2896cd111590e3eca2cba Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 05:32:58 2009 +0200 Fix image directory path in the Galican manual Makefile.am. docs/manual/gl/images/Makefile.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/manual/gl/images/Makefile.am b/docs/manual/gl/images/Makefile.am index 9831f5d..d403716 100644 --- a/docs/manual/gl/images/Makefile.am +++ b/docs/manual/gl/images/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -imagesdir = $(datadir)/doc/Thunar/html/C/images +imagesdir = $(datadir)/doc/Thunar/html/gl/images images_DATA = \ bulk-rename.png \ file-manager-window.png \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master Check for intltool in configure. Add extra rules for it to Makefile.am.
Updating branch refs/heads/master to d507aa80af24d191e934ba96bd85602ab45d46da (commit) from 6a3d1e2e639342fb3af7e819aef254d5d5f5a914 (commit) commit d507aa80af24d191e934ba96bd85602ab45d46da Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 16:40:34 2009 +0200 Check for intltool in configure. Add extra rules for it to Makefile.am. Makefile.am |8 configure.in.in |1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index b384a6a..0cba6c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,8 +23,16 @@ EXTRA_DIST = \ THANKS \ TODO\ gtk-doc.make\ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ libxfce4util.spec +DISTCLEANFILES = \ + intltool-extract\ + intltool-merge \ + intltool-update + DISTCHECK_CONFIGURE_FLAGS =\ --enable-gtk-doc diff --git a/configure.in.in b/configure.in.in index 07120a9..726a0ec 100644 --- a/configure.in.in +++ b/configure.in.in @@ -90,6 +90,7 @@ dnl AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() +AC_PROG_INTLTOOL([0.31], [no-xml]) AC_PROG_LIBTOOL() AC_CHECK_PROGS([PERL], [perl5 perl]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfconf:master Add dist-hook: all to the xfconf library makefile. Required for gtk-doc.
Updating branch refs/heads/master to 5f817a85ec0ef3f179456ea2a7ebf47fea88781c (commit) from c6a1571f014c4c6ac3bc45b2b7846337abf1b865 (commit) commit 5f817a85ec0ef3f179456ea2a7ebf47fea88781c Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 17:22:25 2009 +0200 Add dist-hook: all to the xfconf library makefile. Required for gtk-doc. xfconf/Makefile.am |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am index 2e57097..1db6a77 100644 --- a/xfconf/Makefile.am +++ b/xfconf/Makefile.am @@ -70,7 +70,9 @@ CLEANFILES = \ endif - EXTRA_DIST = \ abicheck.sh \ xfconf.symbols + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:master Add xfdesktop-icon-view.c to POTFILES.in.
Updating branch refs/heads/master to df86d64e1c204725527157f1ea2a6d50a082fb9b (commit) from 4cf6feddc217903a71f15a092ee7c980932da401 (commit) commit df86d64e1c204725527157f1ea2a6d50a082fb9b Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 18:19:12 2009 +0200 Add xfdesktop-icon-view.c to POTFILES.in. po/POTFILES.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index e118921..6d2477f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -13,6 +13,7 @@ src/xfdesktop-file-icon-manager.c src/xfdesktop-file-icon.c src/xfdesktop-file-properties-dialog.c src/xfdesktop-file-utils.c +src/xfdesktop-icon-view.c src/xfdesktop-regular-file-icon.c src/xfdesktop-special-file-icon.c src/xfdesktop-volume-icon.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:progress-dialog-experiments Use g_utf8_strlen to calculate the sidepane width. Bugs #5390 and #3965.
Updating branch refs/heads/progress-dialog-experiments to 10dbf54f58c1b78e2f65863212e1e2179f24e318 (commit) from 2028e116ebf36bf0461f1d2f5b186c84259cb89c (commit) commit 10dbf54f58c1b78e2f65863212e1e2179f24e318 Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 23:41:06 2009 +0200 Use g_utf8_strlen to calculate the sidepane width. Bugs #5390 and #3965. Using strlen() for the number of characters is unrealistic when dealing with multibyte strings. thunar/thunar-shortcuts-view.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c index 2ba4b61..c7df182 100644 --- a/thunar/thunar-shortcuts-view.c +++ b/thunar/thunar-shortcuts-view.c @@ -274,7 +274,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view) renderer = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT, ellipsize-set, TRUE, ellipsize, PANGO_ELLIPSIZE_END, - width-chars, strlen (_(File System)), + width-chars, g_utf8_strlen (_(File System), -1), NULL); g_signal_connect (G_OBJECT (renderer), edited, G_CALLBACK (thunar_shortcuts_view_renamed), view); gtk_tree_view_column_pack_start (column, renderer, TRUE); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Use g_utf8_strlen to calculate the sidepane width. Bugs #5390 and #3965.
Updating branch refs/heads/master to 79bc169e0c90c74d21d21d3d73730001a72a2dcc (commit) from 82fe9b98eb6ac0585f161ea16d7e21f56ff33318 (commit) commit 79bc169e0c90c74d21d21d3d73730001a72a2dcc Author: Jannis Pohlmann jan...@xfce.org Date: Fri Sep 18 23:41:06 2009 +0200 Use g_utf8_strlen to calculate the sidepane width. Bugs #5390 and #3965. Using strlen() for the number of characters is unrealistic when dealing with multibyte strings. thunar/thunar-shortcuts-view.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c index 2ba4b61..c7df182 100644 --- a/thunar/thunar-shortcuts-view.c +++ b/thunar/thunar-shortcuts-view.c @@ -274,7 +274,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view) renderer = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT, ellipsize-set, TRUE, ellipsize, PANGO_ELLIPSIZE_END, - width-chars, strlen (_(File System)), + width-chars, g_utf8_strlen (_(File System), -1), NULL); g_signal_connect (G_OBJECT (renderer), edited, G_CALLBACK (thunar_shortcuts_view_renamed), view); gtk_tree_view_column_pack_start (column, renderer, TRUE); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Replace custom configure code with macros from xfce4-dev-tools 4.7.2.
Updating branch refs/heads/master
to dce9d76a2c53f15fdb7a4a3b1266377ae13047c2 (commit)
from 79bc169e0c90c74d21d21d3d73730001a72a2dcc (commit)
commit dce9d76a2c53f15fdb7a4a3b1266377ae13047c2
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Sep 21 14:31:40 2009 +0200
Replace custom configure code with macros from xfce4-dev-tools 4.7.2.
autogen.sh |2 +-
configure.in.in | 102 ++-
2 files changed, 4 insertions(+), 100 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index c1ce7d7..2c644e9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,4 +29,4 @@ EOF
exit 1
}
-XDT_AUTOGEN_REQUIRED_VERSION=4.7.0 exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION=4.7.2 exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index c8b2813..e8a3dac 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -203,113 +203,17 @@ AM_CONDITIONAL([ENABLE_XML2PO], [test x$enable_xml2po
= xyes])
dnl ***
dnl *** Check for debugging support ***
dnl ***
-#XDT_FEATURE_DEBUG()
-AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug=@:@no/minimum/yes/full@:@], [Turn on
debugging @:@default=thunar_debug_default@:@]),
- [], [enable_debug=thunar_debug_default])
-AC_MSG_CHECKING([whether to enable debugging support])
-if test x$enable_debug = xfull -o x$enable_debug = xyes; then
- dnl Print the result
- AC_MSG_RESULT([$enable_debug])
-
- dnl Make sure we detect possible errors (if supported)
- save_CFLAGS=$CFLAGS
- CFLAGS=$CFLAGS -Wall -Werror
- AC_MSG_CHECKING([whether $CC accepts -Wall -Werror])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
-AC_MSG_RESULT([yes])
-PLATFORM_CFLAGS=$PLATFORM_CFLAGS -Wall -Werror
- ], [
-AC_MSG_RESULT([no])
- ])
- CFLAGS=$save_CFLAGS
-
- dnl Paranoia for --enable-debug=full
- if test x$enable_debug = xfull; then
-dnl Enable extensive debugging
-PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG
-
-dnl Use -O0 -g3 if the compiler supports it
-save_CFLAGS=$CFLAGS
-CFLAGS=$CFLAGS -O0 -g3
-AC_MSG_CHECKING([whether $CC accepts -O0 -g3])
-AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
- AC_MSG_RESULT([yes])
- PLATFORM_CFLAGS=$PLATFORM_CFLAGS -O0 -g3
-], [
- AC_MSG_RESULT([no])
-])
-CFLAGS=$save_CFLAGS
- fi
-else
- dnl Print the result
- AC_MSG_RESULT([$enable_debug])
-
- dnl Disable debugging (release build)
- PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DNDEBUG
-
- dnl Disable object cast checks
- PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS
-
- dnl Disable all checks for --enable-debug=no
- if test x$enable_debug = xno; then
-PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT
-DG_DISABLE_CHECKS
- fi
-fi
+XDT_FEATURE_DEBUG([thunar_debug_default])
dnl **
dnl *** Check for linker optimizations ***
dnl **
-AC_MSG_CHECKING([whether $LD accepts --as-needed])
-case `$LD --as-needed -v 21 /dev/null` in
-*GNU* | *'with BFD'*)
- LDFLAGS=$LDFLAGS -Wl,--as-needed
- AC_MSG_RESULT([yes])
- ;;
-*)
- AC_MSG_RESULT([no])
- ;;
-esac
-AC_MSG_CHECKING([whether $LD accepts -O1])
-case `$LD -O1 -v 21 /dev/null` in
-*GNU* | *'with BFD'*)
- PLATFORM_LDFLAGS=$PLATFORM_LDFLAGS -Wl,-O1
- AC_MSG_RESULT([yes])
- ;;
-*)
- AC_MSG_RESULT([no])
- ;;
-esac
+XDT_FEATURE_LINKER_OPTS()
dnl
dnl *** Check for ELF visibility support ***
dnl
-AC_ARG_ENABLE([visibility], AC_HELP_STRING([--disable-visibility], [Don't use
ELF visibility attributes]), [], [enable_visibility=yes])
-have_gnuc_visibility=no
-if test x$enable_visibility != xno; then
- dnl Check whether the compiler supports the visibility attribute
- save_CFLAGS=$CFLAGS
- CFLAGS=$CFLAGS -Wall -Werror
- AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE(
- [
-void __attribute__ ((visibility(default))) test_default (void) {}
-void __attribute__ ((visibility(hidden))) test_hidden (void) {}
-int main (int argc, char **argv) { test_default (); test_hidden (); return
0; }
- ]),
- [
-have_gnuc_visibility=yes
-AC_MSG_RESULT([yes])
- ],
- [
-AC_MSG_RESULT([no])
- ])
- CFLAGS=$save_CFLAGS
-fi
-if test x$have_gnuc_visibility = xyes; then
- PLATFORM_CPPFLAGS=$PLATFORM_CPPFLAGS -DHAVE_GNUC_VISIBILITY
-fi
-AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test x$have_gnuc_visibility =
xyes])
+XDT_FEATURE_VISIBILITY()
dnl *
dnl *** Substitute platform flags ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-docs:master Creating branch master
Updating branch refs/heads/master as new branch to e802374d18c1ad2d4571f73cbbabe3a41a3ebb4c (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/master for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-docs:master Initial import of module description and AUTHORS/README.
Updating branch refs/heads/master to e802374d18c1ad2d4571f73cbbabe3a41a3ebb4c (commit) from e802374d18c1ad2d4571f73cbbabe3a41a3ebb4c^1 () ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-docs:master Let's start with an empty template with the default configuration.
Updating branch refs/heads/master to 535d8325ea6ca4ba97e7b8f6b961343ba3ec8aa2 (commit) from e802374d18c1ad2d4571f73cbbabe3a41a3ebb4c (commit) commit 535d8325ea6ca4ba97e7b8f6b961343ba3ec8aa2 Author: Jannis Pohlmann jan...@xfce.org Date: Tue Sep 22 03:44:09 2009 +0200 Let's start with an empty template with the default configuration. This uses a Makefile.am that we still need to convert into a Makefile. I'm currently working on an xfce4-dev-tools macro to check for the programs and python modules required for generating the docs. We can then write a simple configure script for documentation people to build and install xfce4-docs on their machines. Other repositories can use this macro when including xfce4-docs as a git submodule. docs/project-template/Makefile.am | 87 + docs/project-template/conf.py | 194 + docs/project-template/index.rst | 20 3 files changed, 301 insertions(+), 0 deletions(-) diff --git a/docs/project-template/Makefile.am b/docs/project-template/Makefile.am new file mode 100644 index 000..344a7e0 --- /dev/null +++ b/docs/project-template/Makefile.am @@ -0,0 +1,87 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS= +PAPER = + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . + +.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest + +help: + @echo Please use \`make target' where target is one of + @echo html to make standalone HTML files + @echo dirhtml to make HTML files named index.html in directories + @echo pickleto make pickle files + @echo json to make JSON files + @echo htmlhelp to make HTML files and a HTML help project + @echo qthelpto make HTML files and a qthelp project + @echo latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + @echo changes to make an overview of all changed/added/deprecated items + @echo linkcheck to check all external links for integrity + @echo doctest to run all doctests embedded in the documentation (if enabled) + +clean: + -rm -rf _build/* + +html: + $(SPHINX_BUILD) -b html $(ALLSPHINXOPTS) _build/html + @echo + @echo Build finished. The HTML pages are in _build/html. + +dirhtml: + $(SPHINX_BUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml + @echo + @echo Build finished. The HTML pages are in _build/dirhtml. + +pickle: + $(SPHINX_BUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle + @echo + @echo Build finished; now you can process the pickle files. + +json: + $(SPHINX_BUILD) -b json $(ALLSPHINXOPTS) _build/json + @echo + @echo Build finished; now you can process the JSON files. + +htmlhelp: + $(SPHINX_BUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp + @echo + @echo Build finished; now you can run HTML Help Workshop with the \ + .hhp project file in _build/htmlhelp. + +qthelp: + $(SPHINX_BUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp + @echo + @echo Build finished; now you can run qcollectiongenerator with the \ + .qhcp project file in _build/qthelp, like this: + @echo # qcollectiongenerator _build/qthelp/Example Project.qhcp + @echo To view the help file: + @echo # assistant -collectionFile _build/qthelp/Example Project.qhc + +latex: + $(SPHINX_BUILD) -b latex $(ALLSPHINXOPTS) _build/latex + @echo + @echo Build finished; the LaTeX files are in _build/latex. + @echo Run \`make all-pdf' or \`make all-ps' in that directory to \ + run these through (pdf)latex. + +changes: + $(SPHINX_BUILD) -b changes $(ALLSPHINXOPTS) _build/changes + @echo + @echo The overview file is in _build/changes. + +linkcheck: + $(SPHINX_BUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck + @echo + @echo Link check complete; look for any errors in the above output \ + or in _build/linkcheck/output.txt. + +doctest: + $(SPHINX_BUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest + @echo Testing of doctests in the sources finished, look at the \ + results in _build/doctest/output.txt. diff --git a/docs/project-template/conf.py b/docs/project-template/conf.py new file mode 100644 index 000..249fbda --- /dev/null +++ b/docs/project-template/conf.py @@ -0,0 +1,194 @@ +# -*- coding: utf-8 -*- +# +# Example Project documentation build configuration file, created by +# sphinx-quickstart on Tue Sep 22 03:40:12 2009. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all
[Xfce4-commits] xfce4-docs:master Add Makefile.am for all directories. Remove rules we don't need.
Updating branch refs/heads/master
to 61b11867f99aba17fa6d72fa2d73145f75ee3f44 (commit)
from 535d8325ea6ca4ba97e7b8f6b961343ba3ec8aa2 (commit)
commit 61b11867f99aba17fa6d72fa2d73145f75ee3f44
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Sep 22 03:56:11 2009 +0200
Add Makefile.am for all directories. Remove rules we don't need.
Makefile.am |4 ++
docs/Makefile.am|4 ++
docs/project-template/C/Makefile.am | 28 ++
docs/project-template/{ = C}/conf.py |0
docs/project-template/{ = C}/index.rst |0
docs/project-template/Makefile.am | 89 +-
6 files changed, 39 insertions(+), 86 deletions(-)
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000..9aa2e1d
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,4 @@
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+
+SUBDIRS = \
+ docs
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 000..db6688e
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,4 @@
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+
+SUBDIRS = \
+ project-template
diff --git a/docs/project-template/C/Makefile.am
b/docs/project-template/C/Makefile.am
new file mode 100644
index 000..b12759f
--- /dev/null
+++ b/docs/project-template/C/Makefile.am
@@ -0,0 +1,28 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS=
+PAPER =
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes
linkcheck doctest
+
+clean:
+ -rm -rf _build/*
+
+all:
+ $(SPHINX_BUILD) -b html $(ALLSPHINXOPTS) _build/html
+ @echo
+ @echo Build finished. The HTML pages are in _build/html.
+
+# TODO add install rule
+
+changes:
+ $(SPHINX_BUILD) -b changes $(ALLSPHINXOPTS) _build/changes
+ @echo
+ @echo The overview file is in _build/changes.
diff --git a/docs/project-template/conf.py b/docs/project-template/C/conf.py
similarity index 100%
rename from docs/project-template/conf.py
rename to docs/project-template/C/conf.py
diff --git a/docs/project-template/index.rst b/docs/project-template/C/index.rst
similarity index 100%
rename from docs/project-template/index.rst
rename to docs/project-template/C/index.rst
diff --git a/docs/project-template/Makefile.am
b/docs/project-template/Makefile.am
index 344a7e0..6570e41 100644
--- a/docs/project-template/Makefile.am
+++ b/docs/project-template/Makefile.am
@@ -1,87 +1,4 @@
-# Makefile for Sphinx documentation
-#
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
-# You can set these variables from the command line.
-SPHINXOPTS=
-PAPER =
-
-# Internal variables.
-PAPEROPT_a4 = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes
linkcheck doctest
-
-help:
- @echo Please use \`make target' where target is one of
- @echo html to make standalone HTML files
- @echo dirhtml to make HTML files named index.html in directories
- @echo pickleto make pickle files
- @echo json to make JSON files
- @echo htmlhelp to make HTML files and a HTML help project
- @echo qthelpto make HTML files and a qthelp project
- @echo latex to make LaTeX files, you can set PAPER=a4 or
PAPER=letter
- @echo changes to make an overview of all changed/added/deprecated
items
- @echo linkcheck to check all external links for integrity
- @echo doctest to run all doctests embedded in the documentation
(if enabled)
-
-clean:
- -rm -rf _build/*
-
-html:
- $(SPHINX_BUILD) -b html $(ALLSPHINXOPTS) _build/html
- @echo
- @echo Build finished. The HTML pages are in _build/html.
-
-dirhtml:
- $(SPHINX_BUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml
- @echo
- @echo Build finished. The HTML pages are in _build/dirhtml.
-
-pickle:
- $(SPHINX_BUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle
- @echo
- @echo Build finished; now you can process the pickle files.
-
-json:
- $(SPHINX_BUILD) -b json $(ALLSPHINXOPTS) _build/json
- @echo
- @echo Build finished; now you can process the JSON files.
-
-htmlhelp:
- $(SPHINX_BUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
- @echo
- @echo Build finished; now you can run HTML Help Workshop with the \
- .hhp project file in _build/htmlhelp.
-
-qthelp
[Xfce4-commits] xfce4-docs:master Make project configurable. Detect sphinx/python, simplify Makefiles.
Updating branch refs/heads/master to 9d103518acdb1ec0468ce72c714a9938870026c7 (commit) from 61b11867f99aba17fa6d72fa2d73145f75ee3f44 (commit) commit 9d103518acdb1ec0468ce72c714a9938870026c7 Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 24 03:05:41 2009 +0200 Make project configurable. Detect sphinx/python, simplify Makefiles. COPYING | 674 +++ INSTALL | 302 autogen.sh | 32 ++ configure.in.in | 111 ++ docs/Makefile.am|5 + docs/project-template/C/Makefile.am | 33 +-- 6 files changed, 1135 insertions(+), 22 deletions(-) diff --git a/COPYING b/COPYING new file mode 100644 index 000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/ + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + This License refers to version 3 of the GNU General Public License. + + Copyright also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + The Program refers to any copyrightable work licensed under this +License. Each licensee is addressed as you. Licensees and +recipients may be individuals or organizations
[Xfce4-commits] xfce4-docs:master Add EXTRA_DIST for conf.py and the .rst files.
Updating branch refs/heads/master to 9d388bd7ca2a010f51dffe9f44ce4175375b250d (commit) from 9d103518acdb1ec0468ce72c714a9938870026c7 (commit) commit 9d388bd7ca2a010f51dffe9f44ce4175375b250d Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 24 03:17:58 2009 +0200 Add EXTRA_DIST for conf.py and the .rst files. docs/project-template/C/Makefile.am |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/docs/project-template/C/Makefile.am b/docs/project-template/C/Makefile.am index 3ec8ca7..c8acfd8 100644 --- a/docs/project-template/C/Makefile.am +++ b/docs/project-template/C/Makefile.am @@ -1,3 +1,5 @@ +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: + project = project-template docsdir = $(datadir)/xfce4/docs/$(project) @@ -15,3 +17,7 @@ install: all uninstall: rm -rf $(docsdir) + +EXTRA_DIST = \ + conf.py \ + *.rst ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Fix QueryTrash and TrashChanged D-Bus signals based on the item count.
Updating branch refs/heads/master
to af1ad121adfd30ef35b295fd664101868d43499e (commit)
from 6fa50baf0efe7115bf238e034994f45a9b1cf420 (commit)
commit af1ad121adfd30ef35b295fd664101868d43499e
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Sep 26 18:54:54 2009 +0200
Fix QueryTrash and TrashChanged D-Bus signals based on the item count.
thunar/thunar-dbus-service.c |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/thunar/thunar-dbus-service.c b/thunar/thunar-dbus-service.c
index 4e164f2..987c8e6 100644
--- a/thunar/thunar-dbus-service.c
+++ b/thunar/thunar-dbus-service.c
@@ -287,7 +287,8 @@ thunar_dbus_service_trash_bin_changed (ThunarDBusService
*dbus_service,
_thunar_return_if_fail (THUNAR_IS_FILE (trash_bin));
/* emit the trash-changed signal with the new state */
- g_signal_emit_by_name (G_OBJECT (dbus_service), trash-changed,
(thunar_file_get_size (trash_bin) 0));
+ g_signal_emit_by_name (G_OBJECT (dbus_service), trash-changed,
+ thunar_file_get_item_count (trash_bin) 0);
}
@@ -627,7 +628,7 @@ thunar_dbus_service_query_trash (ThunarDBusService
*dbus_service,
if (thunar_dbus_service_connect_trash_bin (dbus_service, error))
{
/* check whether the trash bin is not empty */
- *full = (thunar_file_get_size (dbus_service-trash_bin) 0);
+ *full = (thunar_file_get_item_count (dbus_service-trash_bin) 0);
return TRUE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Use -export-symbols-regex instead of XDT_FEATURE_VISIBILITY.
Updating branch refs/heads/master to 4553fba65237ae56bbcc632145abbacfe718a727 (commit) from af1ad121adfd30ef35b295fd664101868d43499e (commit) commit 4553fba65237ae56bbcc632145abbacfe718a727 Author: Jannis Pohlmann jan...@xfce.org Date: Sat Sep 26 22:19:50 2009 +0200 Use -export-symbols-regex instead of XDT_FEATURE_VISIBILITY. XDT_FEATURE_VISIBILITY() breaks plugins as it strips thunar_extension* functions from the final shared library files. An alternative way to XDT_FEATURE_VISIBILITY() and the old visibility configure code used in Thunar is to define -export-symbols-regex (e.g. by setting it to ^thunar_extension.*) in Makefile.am of each plugin. This also removes the alias stuff in Thunarx, as we no longer need to define which symbols to export or not via the alias header. All symbols starting with _ are now automatically marked as private and are not exported. Additionally, G_GNUC_INTERNAL can be used to hide symbols. thunarx.symbols is preserved for ABI checks and still has to be updated when new symbols are added. Hope all this is ok. Double-checkers to the rescue! configure.in.in |8 +- plugins/thunar-apr/Makefile.am |1 + plugins/thunar-sbr/Makefile.am |1 + plugins/thunar-uca/Makefile.am |1 + plugins/thunar-wallpaper/Makefile.am | 25 +++-- thunarx/Makefile.am | 23 + thunarx/make-thunarx-alias.pl| 155 -- thunarx/thunarx-config.c |6 - thunarx/thunarx-file-info.c |6 - thunarx/thunarx-menu-provider.c |6 - thunarx/thunarx-preferences-provider.c |6 - thunarx/thunarx-property-page-provider.c |6 - thunarx/thunarx-property-page.c |6 - thunarx/thunarx-provider-factory.c |6 - thunarx/thunarx-provider-module.c|6 - thunarx/thunarx-provider-plugin.c|6 - thunarx/thunarx-renamer-provider.c |6 - thunarx/thunarx-renamer.c|6 - thunarx/thunarx.symbols | 55 +-- 19 files changed, 23 insertions(+), 312 deletions(-) diff --git a/configure.in.in b/configure.in.in index e8a3dac..50693c9 100644 --- a/configure.in.in +++ b/configure.in.in @@ -210,10 +210,10 @@ dnl *** Check for linker optimizations *** dnl ** XDT_FEATURE_LINKER_OPTS() -dnl -dnl *** Check for ELF visibility support *** -dnl -XDT_FEATURE_VISIBILITY() +dnl dnl +dnl dnl *** Check for ELF visibility support *** +dnl dnl +dnl XDT_FEATURE_VISIBILITY() dnl * dnl *** Substitute platform flags *** diff --git a/plugins/thunar-apr/Makefile.am b/plugins/thunar-apr/Makefile.am index 29d0ead..686e9eb 100644 --- a/plugins/thunar-apr/Makefile.am +++ b/plugins/thunar-apr/Makefile.am @@ -34,6 +34,7 @@ thunar_apr_la_CFLAGS = \ thunar_apr_la_LDFLAGS = \ -avoid-version \ -export-dynamic \ + -export-symbols-regex=^thunar_extension_(shutdown|initialize|list_types) \ -module \ $(PLATFORM_LDFLAGS) diff --git a/plugins/thunar-sbr/Makefile.am b/plugins/thunar-sbr/Makefile.am index 1aabd41..22a0056 100644 --- a/plugins/thunar-sbr/Makefile.am +++ b/plugins/thunar-sbr/Makefile.am @@ -40,6 +40,7 @@ thunar_sbr_la_CFLAGS = \ thunar_sbr_la_LDFLAGS = \ -avoid-version \ -export-dynamic \ + -export-symbols-regex=^thunar_extension_(shutdown|initialize|list_types) \ -module \ $(PLATFORM_LDFLAGS) diff --git a/plugins/thunar-uca/Makefile.am b/plugins/thunar-uca/Makefile.am index be59865..e37478c 100644 --- a/plugins/thunar-uca/Makefile.am +++ b/plugins/thunar-uca/Makefile.am @@ -38,6 +38,7 @@ thunar_uca_la_CFLAGS = \ thunar_uca_la_LDFLAGS = \ -avoid-version \ -export-dynamic \ + -export-symbols-regex=^thunar_extension_(shutdown|initialize|list_types) \ -module
[Xfce4-commits] thunar:master Add -export-symbols-regex to the tex-open-terminal example extension.
Updating branch refs/heads/master to b4f5340a71373800fa63764a2839a06bd41e9080 (commit) from 4553fba65237ae56bbcc632145abbacfe718a727 (commit) commit b4f5340a71373800fa63764a2839a06bd41e9080 Author: Jannis Pohlmann jan...@xfce.org Date: Sat Sep 26 22:28:54 2009 +0200 Add -export-symbols-regex to the tex-open-terminal example extension. examples/tex-open-terminal/Makefile.am |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/examples/tex-open-terminal/Makefile.am b/examples/tex-open-terminal/Makefile.am index 9167989..e71996e 100644 --- a/examples/tex-open-terminal/Makefile.am +++ b/examples/tex-open-terminal/Makefile.am @@ -30,6 +30,7 @@ tex_open_terminal_la_LIBADD = \ tex_open_terminal_la_LDFLAGS = \ -avoid-version \ -export-dynamic \ + -export-symbols-regex=^thunar_extension_(shutdown|initialize|list_types) \ -module \ $(PLATFORM_LDFLAGS) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfconf:master Add dist-hook: all to common/Makefile.am for testing.
Updating branch refs/heads/master to 1d688dd6ae3054336a1f4334a376c611d09e5170 (commit) from d7354073a2abf1c44606386eec28f0eae79049ca (commit) commit 1d688dd6ae3054336a1f4334a376c611d09e5170 Author: Jannis Pohlmann jan...@xfce.org Date: Sun Sep 27 14:11:29 2009 +0200 Add dist-hook: all to common/Makefile.am for testing. I'll revert this if it doesn't fix make distcheck. It looks like xfconf fails inside make dist-hook on buildbot with a missing rule for libxfconf-common.la, but I'm not sure this will fix it. common/Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 8e00d10..c229977 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -73,3 +73,6 @@ EXTRA_DIST = \ xfconf-dbus.xml \ xfconf-marshal.list \ xfconf-types.c + +# required for make distcheck +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfconf:master Previous commit seems to have worked. Add dist-hook: all to xfconfd.
Updating branch refs/heads/master to 4c9c2b40fcbe6846abf31b7bb9acd1f7101d4dbe (commit) from 1d688dd6ae3054336a1f4334a376c611d09e5170 (commit) commit 4c9c2b40fcbe6846abf31b7bb9acd1f7101d4dbe Author: Jannis Pohlmann jan...@xfce.org Date: Sun Sep 27 15:05:40 2009 +0200 Previous commit seems to have worked. Add dist-hook: all to xfconfd. Let's see if this finally fixes the build. If not, we can still revert it later. xfconfd/Makefile.am |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am index 611f401..28062ff 100644 --- a/xfconfd/Makefile.am +++ b/xfconfd/Makefile.am @@ -81,3 +81,6 @@ xfconf-dbus-server.h: $(top_srcdir)/common/xfconf-dbus.xml dbus-binding-tool --mode=glib-server --prefix=xfconf $ $@ endif + +# required for gtk-doc +dist-hook: all ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfconf:master Add check for intltool to use a different po Makefile if it's available.
Updating branch refs/heads/master to 441afdf98c42fcb7f3458853678f68eac8dc007f (commit) from 4c9c2b40fcbe6846abf31b7bb9acd1f7101d4dbe (commit) commit 441afdf98c42fcb7f3458853678f68eac8dc007f Author: Jannis Pohlmann jan...@xfce.org Date: Sun Sep 27 15:13:42 2009 +0200 Add check for intltool to use a different po Makefile if it's available. It seems that without the check for intltool, xdt-autogen (or whatever) pulls in a different po/Makefile.in.in template. We need the one modified for use with intltool, as this is also fixed not to modify files outside the distdir. configure.ac.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 994a0aa..d5de3b1 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -37,6 +37,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL AC_PROG_LIBTOOL +AC_PROG_INTLTOOL AC_PROG_MAKE_SET AC_PROG_LN_S ___ 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] 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] 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
b/plugins
[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 \ - pixbuf
[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
+++ b/docs
[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
[Xfce4-commits] tumbler:master Always add file to the supported URI schemes. Fix compiler warnings.
Updating branch refs/heads/master
to 7d6875461d59e7b7c558f5586ceb4df92b3c57a9 (commit)
from 5162982c8acaaf3b7677e0627e9fc4a757ac9213 (commit)
commit 7d6875461d59e7b7c558f5586ceb4df92b3c57a9
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 30 14:48:25 2009 +0200
Always add file to the supported URI schemes. Fix compiler warnings.
There's a bug in GIO/GVfs which doesn't include file in the URI
schemes returned by g_vfs_get_supported_uri_schemes(). Bug filed
upstream on http://bugzilla.gnome.org/show_bug.cgi?id=596867.
.../font-thumbnailer/font-thumbnailer-provider.c | 20 +-
plugins/font-thumbnailer/font-thumbnailer.c|4 +-
.../pixbuf-thumbnailer-provider.c | 21 ---
3 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/plugins/font-thumbnailer/font-thumbnailer-provider.c
b/plugins/font-thumbnailer/font-thumbnailer-provider.c
index 487646f..4e5b669 100644
--- a/plugins/font-thumbnailer/font-thumbnailer-provider.c
+++ b/plugins/font-thumbnailer/font-thumbnailer-provider.c
@@ -111,14 +111,27 @@ font_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provider
application/x-font-type1,
NULL,
};
- const gchar *const *uri_schemes;
+ const gchar *const *supported_schemes;
FontThumbnailer*thumbnailer;
GList *thumbnailers = NULL;
+ GStrv uri_schemes;
+ guint length;
+ guint n;
GVfs *vfs;
/* determine the URI schemes supported by GIO */
vfs = g_vfs_get_default ();
- uri_schemes = g_vfs_get_supported_uri_schemes (vfs);
+ supported_schemes = g_vfs_get_supported_uri_schemes (vfs);
+
+ /* copy the supported schemes array and add the file scheme, which for
+ * some odd reason is not included by default. Bug filed on
+ * http://bugzilla.gnome.org/show_bug.cgi?id=596867 */
+ length = g_strv_length ((gchar **)supported_schemes);
+ uri_schemes = g_new0 (gchar *, length + 1);
+ uri_schemes[0] = (gchar *)file;
+ for (n = 0; n length; ++n)
+uri_schemes[1+n] = (gchar *)supported_schemes[n];
+ uri_schemes[n] = NULL;
/* create the pixbuf thumbnailer */
thumbnailer = g_object_new (TYPE_FONT_THUMBNAILER,
@@ -128,5 +141,8 @@ font_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provider
/* add the thumbnailer to the list */
thumbnailers = g_list_append (thumbnailers, thumbnailer);
+ /* free URI schemes array (not its contents) */
+ g_free (uri_schemes);
+
return thumbnailers;
}
diff --git a/plugins/font-thumbnailer/font-thumbnailer.c
b/plugins/font-thumbnailer/font-thumbnailer.c
index d7b089b..958568e 100644
--- a/plugins/font-thumbnailer/font-thumbnailer.c
+++ b/plugins/font-thumbnailer/font-thumbnailer.c
@@ -501,8 +501,8 @@ font_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
g_object_unref (file);
/* try to open the font file */
- ft_error = FT_New_Memory_Face (font_thumbnailer-library, font_data, length,
- 0, face);
+ ft_error = FT_New_Memory_Face (font_thumbnailer-library, (const FT_Byte
*)font_data,
+ length, 0, face);
if (G_UNLIKELY (ft_error != 0))
{
/* the font file could not be loaded, emit an error signal */
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index d0deebd..320503a 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;
- const gchar *const *uri_schemes;
+ const gchar *const *supported_schemes;
GHashTable *types;
GSList *formats;
GSList *fp;
@@ -113,12 +113,24 @@ pixbuf_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provid
GList *thumbnailers = NULL;
GStrv format_types;
GStrv mime_types;
+ GStrv uri_schemes;
GVfs *vfs;
- gintn;
+ guint length;
+ guint n;
/* determine which URI schemes are supported by GIO */
vfs = g_vfs_get_default ();
- uri_schemes = g_vfs_get_supported_uri_schemes (vfs);
+ supported_schemes = g_vfs_get_supported_uri_schemes (vfs);
+
+ /* copy the supported schemes array and add the file scheme, which for
+ * some odd reason is not included by default. Bug filed on
+ * http://bugzilla.gnome.org/show_bug.cgi?id=596867 */
+ length = g_strv_length ((gchar **)supported_schemes);
+ uri_schemes = g_new0 (gchar *, length + 1);
+ uri_schemes[0] = (gchar *)file;
+ for (n = 0; n length; ++n)
+uri_schemes[1+n] = (gchar *)supported_schemes[n];
+ uri_schemes[n] = NULL
[Xfce4-commits] tumbler:master Always check for file and add it if necessary. Clearly the better way.
Updating branch refs/heads/master
to fd8d82d61bf59129583dc2dab7edae54be214f31 (commit)
from 7d6875461d59e7b7c558f5586ceb4df92b3c57a9 (commit)
commit fd8d82d61bf59129583dc2dab7edae54be214f31
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 30 15:09:16 2009 +0200
Always check for file and add it if necessary. Clearly the better way.
.../font-thumbnailer/font-thumbnailer-provider.c | 21 +-
.../pixbuf-thumbnailer-provider.c | 42
tumbler/Makefile.am|4 +-
tumbler/tumbler-util.c | 69
.../{tumbler-glib-extensions.h = tumbler-util.h} | 20 ++
tumbler/tumbler.h |1 +
6 files changed, 95 insertions(+), 62 deletions(-)
diff --git a/plugins/font-thumbnailer/font-thumbnailer-provider.c
b/plugins/font-thumbnailer/font-thumbnailer-provider.c
index 4e5b669..65158a5 100644
--- a/plugins/font-thumbnailer/font-thumbnailer-provider.c
+++ b/plugins/font-thumbnailer/font-thumbnailer-provider.c
@@ -111,27 +111,12 @@ font_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provider
application/x-font-type1,
NULL,
};
- const gchar *const *supported_schemes;
FontThumbnailer*thumbnailer;
GList *thumbnailers = NULL;
GStrv uri_schemes;
- guint length;
- guint n;
- GVfs *vfs;
/* determine the URI schemes supported by GIO */
- vfs = g_vfs_get_default ();
- supported_schemes = g_vfs_get_supported_uri_schemes (vfs);
-
- /* copy the supported schemes array and add the file scheme, which for
- * some odd reason is not included by default. Bug filed on
- * http://bugzilla.gnome.org/show_bug.cgi?id=596867 */
- length = g_strv_length ((gchar **)supported_schemes);
- uri_schemes = g_new0 (gchar *, length + 1);
- uri_schemes[0] = (gchar *)file;
- for (n = 0; n length; ++n)
-uri_schemes[1+n] = (gchar *)supported_schemes[n];
- uri_schemes[n] = NULL;
+ uri_schemes = tumbler_util_get_supported_uri_schemes ();
/* create the pixbuf thumbnailer */
thumbnailer = g_object_new (TYPE_FONT_THUMBNAILER,
@@ -141,8 +126,8 @@ font_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provider
/* add the thumbnailer to the list */
thumbnailers = g_list_append (thumbnailers, thumbnailer);
- /* free URI schemes array (not its contents) */
- g_free (uri_schemes);
+ /* free URI schemes */
+ g_strfreev (uri_schemes);
return thumbnailers;
}
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index 320503a..6b4fc1e 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
@@ -103,34 +103,20 @@ pixbuf_thumbnailer_provider_init
(PixbufThumbnailerProvider *provider)
static GList *
pixbuf_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider
*provider)
{
- PixbufThumbnailer *thumbnailer;
- const gchar *const *supported_schemes;
- GHashTable *types;
- GSList *formats;
- GSList *fp;
- GList *keys;
- GList *lp;
- GList *thumbnailers = NULL;
- GStrv format_types;
- GStrv mime_types;
- GStrv uri_schemes;
- GVfs *vfs;
- guint length;
- guint n;
+ PixbufThumbnailer *thumbnailer;
+ GHashTable*types;
+ GSList*formats;
+ GSList*fp;
+ GList *keys;
+ GList *lp;
+ GList *thumbnailers = NULL;
+ GStrv format_types;
+ GStrv mime_types;
+ GStrv uri_schemes;
+ guint n;
/* determine which URI schemes are supported by GIO */
- vfs = g_vfs_get_default ();
- supported_schemes = g_vfs_get_supported_uri_schemes (vfs);
-
- /* copy the supported schemes array and add the file scheme, which for
- * some odd reason is not included by default. Bug filed on
- * http://bugzilla.gnome.org/show_bug.cgi?id=596867 */
- length = g_strv_length ((gchar **)supported_schemes);
- uri_schemes = g_new0 (gchar *, length + 1);
- uri_schemes[0] = (gchar *)file;
- for (n = 0; n length; ++n)
-uri_schemes[1+n] = (gchar *)supported_schemes[n];
- uri_schemes[n] = NULL;
+ uri_schemes = tumbler_util_get_supported_uri_schemes ();
/* create a hash table to collect unique MIME types */
types = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -177,8 +163,8 @@ pixbuf_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provid
uri-schemes, uri_schemes, mime-types,
mime_types,
NULL);
- /* free URI schemes array (not its contents) and MIME types */
- g_free
[Xfce4-commits] thunar:xfce-4.6 Fix bugs #3532 (umask 0022 not honoured) and #5813 properly (I hope).
Updating branch refs/heads/xfce-4.6
to eb58c6a6ba7f77c2c16016db064524df598ef421 (commit)
from 622ebb3ac3867e54c402f46ad88f1beaed163721 (commit)
commit eb58c6a6ba7f77c2c16016db064524df598ef421
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Oct 3 11:49:41 2009 +0200
Fix bugs #3532 (umask 0022 not honoured) and #5813 properly (I hope).
The previous patch applied in e53de71e6add9b28ba034111a1d19db7def8f7e7
made things worse than before: it used DEFFILEMODE which seems to be
BSD-specific for creating files. It also reset the umask to 0 when
creating the first directory with _thunar_vfs_io_jobs_mkdir().
What we really want is to use 0777 (dirs) and 0666 (files) and let the
standard C system calls like open() apply the umask value. This should
work on all POSIX-compliant systems.
Patch provided by Craig Ringer cr...@postnewspapers.com.au.
thunar-vfs/thunar-vfs-io-jobs.c | 17 +
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
index 8d70812..c94523a 100644
--- a/thunar-vfs/thunar-vfs-io-jobs.c
+++ b/thunar-vfs/thunar-vfs-io-jobs.c
@@ -432,8 +432,12 @@ _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
absolute_path = thunar_vfs_path_dup_string (lp-data);
again:
- /* try to create the file at the given path */
- fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, DEFFILEMODE);
+ /* Try to create the file at the given path.
+ *
+ * Note that despite the 0666 mask, we won't really create a
world-writable
+ * file unless the user's umask permits it (ie the umask is ).
+ */
+ fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0666);
if (G_UNLIKELY (fd 0))
{
/* check if the file already exists */
@@ -707,8 +711,13 @@ _thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
/* update the progress information */
_thunar_vfs_job_process_path (job, lp);
- /* try to create the target directory */
- if (!_thunar_vfs_io_ops_mkdir (lp-data, 0777 ~umask(0),
THUNAR_VFS_IO_OPS_NONE, error))
+ /* try to create the target directory
+ *
+ * Note that the mode specified here is limited by the user's umask, so
we will not
+ * actually be creating a world writable directory unless the user's
umask permits
+ * it.
+ */
+ if (!_thunar_vfs_io_ops_mkdir (lp-data, 0777, THUNAR_VFS_IO_OPS_NONE,
error))
return FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-vfs:master Fix bugs #3532 (umask 0022 not honoured) and #5813 properly (I hope).
Updating branch refs/heads/master
to 59ea6bc0250b0af8b15ad24009b060ae6a327a9e (commit)
from e62bded7e82aa0d7206f95a54acaf2cce0d1ce66 (commit)
commit 59ea6bc0250b0af8b15ad24009b060ae6a327a9e
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Oct 3 11:49:41 2009 +0200
Fix bugs #3532 (umask 0022 not honoured) and #5813 properly (I hope).
The previous patch applied in e53de71e6add9b28ba034111a1d19db7def8f7e7
made things worse than before: it used DEFFILEMODE which seems to be
BSD-specific for creating files. It also reset the umask to 0 when
creating the first directory with _thunar_vfs_io_jobs_mkdir().
What we really want is to use 0777 (dirs) and 0666 (files) and let the
standard C system calls like open() apply the umask value. This should
work on all POSIX-compliant systems.
Patch provided by Craig Ringer cr...@postnewspapers.com.au.
thunar-vfs/thunar-vfs-io-jobs.c | 17 +
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
index 8d70812..c94523a 100644
--- a/thunar-vfs/thunar-vfs-io-jobs.c
+++ b/thunar-vfs/thunar-vfs-io-jobs.c
@@ -432,8 +432,12 @@ _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
absolute_path = thunar_vfs_path_dup_string (lp-data);
again:
- /* try to create the file at the given path */
- fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, DEFFILEMODE);
+ /* Try to create the file at the given path.
+ *
+ * Note that despite the 0666 mask, we won't really create a
world-writable
+ * file unless the user's umask permits it (ie the umask is ).
+ */
+ fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0666);
if (G_UNLIKELY (fd 0))
{
/* check if the file already exists */
@@ -707,8 +711,13 @@ _thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
/* update the progress information */
_thunar_vfs_job_process_path (job, lp);
- /* try to create the target directory */
- if (!_thunar_vfs_io_ops_mkdir (lp-data, 0777 ~umask(0),
THUNAR_VFS_IO_OPS_NONE, error))
+ /* try to create the target directory
+ *
+ * Note that the mode specified here is limited by the user's umask, so
we will not
+ * actually be creating a world writable directory unless the user's
umask permits
+ * it.
+ */
+ if (!_thunar_vfs_io_ops_mkdir (lp-data, 0777, THUNAR_VFS_IO_OPS_NONE,
error))
return FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Fix reference counting leak spotted by Philip Van Hoof.
Updating branch refs/heads/master to 0b556c1738ddcf4737c680061750b5c340b4a0bc (commit) from fd8d82d61bf59129583dc2dab7edae54be214f31 (commit) commit 0b556c1738ddcf4737c680061750b5c340b4a0bc Author: Jannis Pohlmann jan...@xfce.org Date: Mon Oct 5 15:13:34 2009 +0200 Fix reference counting leak spotted by Philip Van Hoof. tumblerd/tumbler-registry.c |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c index b35b8a7..57562ff 100644 --- a/tumblerd/tumbler-registry.c +++ b/tumblerd/tumbler-registry.c @@ -444,10 +444,6 @@ tumbler_registry_get_thumbnailer_array (TumblerRegistry *registry, /* see if we can find a thumbnailer to handle this URI/MIME type pair */ thumbnailers[n] = tumbler_registry_lookup (registry, hash_key); - /* if there is one, take a reference on it */ - if (thumbnailers[n] != NULL) -g_object_ref (thumbnailers[n]); - /* free strings */ g_free (hash_key); g_free (scheme); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Derive TumblerSpecializedThumbnailer from TumblerAbstractThumbnailer.
Updating branch refs/heads/master
to 88bd699be2ce252010a93cb2e327d0395b2aaab6 (commit)
from 0b556c1738ddcf4737c680061750b5c340b4a0bc (commit)
commit 88bd699be2ce252010a93cb2e327d0395b2aaab6
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Oct 5 15:14:17 2009 +0200
Derive TumblerSpecializedThumbnailer from TumblerAbstractThumbnailer.
The abstract thumbnailer already manages the URI schemes, MIME hints and
hash keys arrays for us, so we don't have to do this ourselves.
tumblerd/tumbler-specialized-thumbnailer.c | 38 ---
1 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/tumblerd/tumbler-specialized-thumbnailer.c
b/tumblerd/tumbler-specialized-thumbnailer.c
index 36d7f51..f4734d9 100644
--- a/tumblerd/tumbler-specialized-thumbnailer.c
+++ b/tumblerd/tumbler-specialized-thumbnailer.c
@@ -76,12 +76,12 @@ static void tumbler_specialized_thumbnailer_proxy_destroyed
(DBusGProxy
struct _TumblerSpecializedThumbnailerClass
{
- GObjectClass __parent__;
+ TumblerAbstractThumbnailerClass __parent__;
};
struct _TumblerSpecializedThumbnailer
{
- GObject __parent__;
+ TumblerAbstractThumbnailer __parent__;
DBusGConnection *connection;
DBusGProxy *proxy;
@@ -90,17 +90,13 @@ struct _TumblerSpecializedThumbnailer
guint64 modified;
gchar *name;
-
- GStrvuri_schemes;
- GStrvhash_keys;
- GStrvmime_types;
};
G_DEFINE_TYPE_WITH_CODE (TumblerSpecializedThumbnailer,
tumbler_specialized_thumbnailer,
- G_TYPE_OBJECT,
+ TUMBLER_TYPE_ABSTRACT_THUMBNAILER,
G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_THUMBNAILER,
tumbler_specialized_thumbnailer_iface_init));
@@ -117,10 +113,6 @@ tumbler_specialized_thumbnailer_class_init
(TumblerSpecializedThumbnailerClass *
gobject_class-get_property = tumbler_specialized_thumbnailer_get_property;
gobject_class-set_property = tumbler_specialized_thumbnailer_set_property;
- g_object_class_override_property (gobject_class, PROP_MIME_TYPES,
mime-types);
- g_object_class_override_property (gobject_class, PROP_URI_SCHEMES,
uri-schemes);
- g_object_class_override_property (gobject_class, PROP_HASH_KEYS,
hash-keys);
-
g_object_class_install_property (gobject_class,
PROP_NAME,
g_param_spec_string (name,
@@ -178,7 +170,6 @@ tumbler_specialized_thumbnailer_iface_init
(TumblerThumbnailerIface *iface)
static void
tumbler_specialized_thumbnailer_init (TumblerSpecializedThumbnailer
*thumbnailer)
{
- thumbnailer-mime_types = NULL;
}
@@ -195,9 +186,9 @@ tumbler_specialized_thumbnailer_constructed (GObject
*object)
bus_path = g_strdelimit (bus_path, ., '/');
thumbnailer-proxy = dbus_g_proxy_new_for_name (thumbnailer-connection,
-thumbnailer-name,
-bus_path,
-
org.xfce.thumbnailer.Thumbnailer);
+ thumbnailer-name,
+ bus_path,
+
org.xfce.thumbnailer.Thumbnailer);
g_free (bus_path);
@@ -229,10 +220,6 @@ tumbler_specialized_thumbnailer_finalize (GObject *object)
g_free (thumbnailer-name);
- g_strfreev (thumbnailer-hash_keys);
- g_strfreev (thumbnailer-mime_types);
- g_strfreev (thumbnailer-uri_schemes);
-
dbus_g_proxy_disconnect_signal (thumbnailer-proxy, Ready,
G_CALLBACK
(tumbler_specialized_thumbnailer_proxy_ready),
thumbnailer);
@@ -260,12 +247,6 @@ tumbler_specialized_thumbnailer_get_property (GObject
*object,
switch (prop_id)
{
-case PROP_MIME_TYPES:
- g_value_set_pointer (value, g_strdupv (thumbnailer-mime_types));
- break;
-case PROP_URI_SCHEMES:
- g_value_set_pointer (value, g_strdupv (thumbnailer-uri_schemes));
- break;
case PROP_CONNECTION:
g_value_set_pointer (value, dbus_g_connection_ref
(thumbnailer-connection));
break;
@@ -299,13 +280,6 @@ tumbler_specialized_thumbnailer_set_property (GObject
*object,
switch (prop_id)
{
-case PROP_MIME_TYPES:
- if (g_value_get_pointer (value) != NULL)
-thumbnailer-mime_types = g_strdupv (g_value_get_pointer (value));
- break;
-case PROP_URI_SCHEMES:
- thumbnailer-uri_schemes = g_strdupv (g_value_get_pointer (value));
- break;
case PROP_CONNECTION:
thumbnailer-connection = dbus_g_connection_ref (g_value_get_pointer
(value));
break;
___
Xfce4-commits mailing list
Xfce4
[Xfce4-commits] tumbler:master Register marshallers for specialized thumbnailer signals.
Updating branch refs/heads/master to b5d3d3e7c7578883a6be766a6ec7cdda18b294c5 (commit) from 88bd699be2ce252010a93cb2e327d0395b2aaab6 (commit) commit b5d3d3e7c7578883a6be766a6ec7cdda18b294c5 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Oct 5 15:31:13 2009 +0200 Register marshallers for specialized thumbnailer signals. tumbler/tumbler-marshal.list |1 + tumblerd/tumbler-specialized-thumbnailer.c | 12 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tumbler/tumbler-marshal.list b/tumbler/tumbler-marshal.list index 0d17170..f5f6213 100644 --- a/tumbler/tumbler-marshal.list +++ b/tumbler/tumbler-marshal.list @@ -1,2 +1,3 @@ VOID:STRING,INT,STRING VOID:UINT,POINTER,INT,STRING +VOID:STRING,INT,STRING diff --git a/tumblerd/tumbler-specialized-thumbnailer.c b/tumblerd/tumbler-specialized-thumbnailer.c index f4734d9..02960ae 100644 --- a/tumblerd/tumbler-specialized-thumbnailer.c +++ b/tumblerd/tumbler-specialized-thumbnailer.c @@ -192,6 +192,18 @@ tumbler_specialized_thumbnailer_constructed (GObject *object) g_free (bus_path); + dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, + G_TYPE_STRING, + G_TYPE_INVALID); + + dbus_g_object_register_marshaller (tumbler_marshal_VOID__STRING_INT_STRING, + G_TYPE_NONE, + G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_INVALID); + dbus_g_proxy_add_signal (thumbnailer-proxy, Ready, G_TYPE_STRING, G_TYPE_INVALID); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Chain constructed up to parent classes. Need to remember this.
Updating branch refs/heads/master
to e3995be157cf9c161f09ba24e07ac8ef92ca04ec (commit)
from b5d3d3e7c7578883a6be766a6ec7cdda18b294c5 (commit)
commit e3995be157cf9c161f09ba24e07ac8ef92ca04ec
Author: Jannis Pohlmann jan...@xfce.org
Date: Mon Oct 5 16:19:21 2009 +0200
Chain constructed up to parent classes. Need to remember this.
tumbler/tumbler-abstract-thumbnailer.c |4
tumblerd/tumbler-cache-service.c |4
tumblerd/tumbler-service.c |4
tumblerd/tumbler-specialized-thumbnailer.c |4
4 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/tumbler/tumbler-abstract-thumbnailer.c
b/tumbler/tumbler-abstract-thumbnailer.c
index 4b3087a..36b0e05 100644
--- a/tumbler/tumbler-abstract-thumbnailer.c
+++ b/tumbler/tumbler-abstract-thumbnailer.c
@@ -132,6 +132,10 @@ tumbler_abstract_thumbnailer_constructed (GObject *object)
g_return_if_fail (thumbnailer-priv-uri_schemes != NULL);
g_return_if_fail (thumbnailer-priv-hash_keys == NULL);
+ /* chain up to parent classes */
+ if (G_OBJECT_CLASS (tumbler_abstract_thumbnailer_parent_class)-constructed
!= NULL)
+(G_OBJECT_CLASS (tumbler_abstract_thumbnailer_parent_class)-constructed)
(object);
+
/* determine the size of both arrays */
num_uri_schemes = g_strv_length (thumbnailer-priv-uri_schemes);
num_mime_types = g_strv_length (thumbnailer-priv-mime_types);
diff --git a/tumblerd/tumbler-cache-service.c b/tumblerd/tumbler-cache-service.c
index 61a7d6b..ffdfcb5 100644
--- a/tumblerd/tumbler-cache-service.c
+++ b/tumblerd/tumbler-cache-service.c
@@ -160,6 +160,10 @@ tumbler_cache_service_constructed (GObject *object)
GList *lp;
GList *providers;
+ /* chain up to parent classes */
+ if (G_OBJECT_CLASS (tumbler_cache_service_parent_class)-constructed != NULL)
+(G_OBJECT_CLASS (tumbler_cache_service_parent_class)-constructed)
(object);
+
factory = tumbler_provider_factory_get_default ();
providers = tumbler_provider_factory_get_providers (factory,
TUMBLER_TYPE_CACHE_PROVIDER);
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 5f475cc..794e5d9 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -207,6 +207,10 @@ tumbler_service_constructed (GObject *object)
{
TumblerService *service = TUMBLER_SERVICE (object);
+ /* chain up to parent classes */
+ if (G_OBJECT_CLASS (tumbler_service_parent_class)-constructed != NULL)
+(G_OBJECT_CLASS (tumbler_service_parent_class)-constructed) (object);
+
#if 0
service-scheduler = tumbler_naive_scheduler_new ();
#else
diff --git a/tumblerd/tumbler-specialized-thumbnailer.c
b/tumblerd/tumbler-specialized-thumbnailer.c
index 02960ae..b353fc2 100644
--- a/tumblerd/tumbler-specialized-thumbnailer.c
+++ b/tumblerd/tumbler-specialized-thumbnailer.c
@@ -182,6 +182,10 @@ tumbler_specialized_thumbnailer_constructed (GObject
*object)
g_return_if_fail (TUMBLER_SPECIALIZED_THUMBNAILER (thumbnailer));
+ /* chain up to parent classes */
+ if (G_OBJECT_CLASS
(tumbler_specialized_thumbnailer_parent_class)-constructed != NULL)
+(G_OBJECT_CLASS
(tumbler_specialized_thumbnailer_parent_class)-constructed) (object);
+
bus_path = g_strdup_printf (/%s, thumbnailer-name);
bus_path = g_strdelimit (bus_path, ., '/');
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Rename D-Bus service file, add others for the cache and the manager.
Updating branch refs/heads/master to f9053a4334e1a8642ae31284c734052d0e206347 (commit) from e3995be157cf9c161f09ba24e07ac8ef92ca04ec (commit) commit f9053a4334e1a8642ae31284c734052d0e206347 Author: Jannis Pohlmann jan...@xfce.org Date: Mon Oct 5 19:46:26 2009 +0200 Rename D-Bus service file, add others for the cache and the manager. This finally fixes the D-Bus activation issues and starts tumblerd automatically e.g. when Thunar is started. tumblerd/Makefile.am |6 +- ...service.in = org.xfce.TumblerCache.service.in} |0 ...rvice.in = org.xfce.TumblerManager.service.in} |2 +- ...e.in = org.xfce.TumblerThumbnailer.service.in} |0 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am index aeaa0f9..75e4e91 100644 --- a/tumblerd/Makefile.am +++ b/tumblerd/Makefile.am @@ -73,7 +73,11 @@ tumblerd_LDADD = \ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la servicedir = $(datadir)/dbus-1/services -service_in_files = org.xfce.Tumbler.service.in +service_in_files = \ + org.xfce.TumblerCache.service.in\ + org.xfce.TumblerManager.service.in \ + org.xfce.TumblerThumbnailer.service.in + service_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in diff --git a/tumblerd/org.xfce.Tumbler.service.in b/tumblerd/org.xfce.TumblerCache.service.in similarity index 100% copy from tumblerd/org.xfce.Tumbler.service.in copy to tumblerd/org.xfce.TumblerCache.service.in diff --git a/tumblerd/org.xfce.Tumbler.service.in b/tumblerd/org.xfce.TumblerManager.service.in similarity index 53% copy from tumblerd/org.xfce.Tumbler.service.in copy to tumblerd/org.xfce.TumblerManager.service.in index cdf8b8e..af2d536 100644 --- a/tumblerd/org.xfce.Tumbler.service.in +++ b/tumblerd/org.xfce.TumblerManager.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.xfce.thumbnails.Thumbnailer +Name=org.xfce.thumbnails.Manager ex...@libexecdir@/tumblerd diff --git a/tumblerd/org.xfce.Tumbler.service.in b/tumblerd/org.xfce.TumblerThumbnailer.service.in similarity index 100% rename from tumblerd/org.xfce.Tumbler.service.in rename to tumblerd/org.xfce.TumblerThumbnailer.service.in ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Minor changes in the configure script.
Updating branch refs/heads/master to 004458939fb81a92f2d307a4a4c1a18a66e1e1c5 (commit) from d1b62a10f3d8447639430f276e04667494b35c3b (commit) commit 004458939fb81a92f2d307a4a4c1a18a66e1e1c5 Author: Jannis Pohlmann jan...@xfce.org Date: Tue Oct 6 14:43:18 2009 +0200 Minor changes in the configure script. configure.ac | 18 +- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 6279720..c8b4da9 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ dnl *** AC_COPYRIGHT([Copyright (c) 2009 Jannis Pohlmann jan...@xfce.org]) AC_INIT([tumbler], [tumbler_version], [http://bugzilla.xfce.org/]) AC_PREREQ([2.50]) -AC_REVISION([...@revision@]) + AC_REVISION([...@revision@]) AC_CANONICAL_TARGET() dnl *** @@ -130,15 +130,15 @@ GTK_DOC_CHECK(1.9) dnl *** dnl *** Check for required packages *** dnl *** -PKG_CHECK_MODULES(GLIB, glib-2.0 = 2.16.0) -PKG_CHECK_MODULES(GIO, gio-2.0 = 2.16.0) -PKG_CHECK_MODULES(GTHREAD, gthread-2.0 = 2.16.0) -PKG_CHECK_MODULES(DBUS, dbus-1 = 1.0.0) -PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 = 0.72) +PKG_CHECK_MODULES([GLIB], [glib-2.0 = 2.16.0]) +PKG_CHECK_MODULES([GIO], [gio-2.0 = 2.16.0]) +PKG_CHECK_MODULES([GTHREAD], [gthread-2.0 = 2.16.0]) +PKG_CHECK_MODULES([DBUS], [dbus-1 = 1.0.0]) +PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1 = 0.72]) -dnl *** -dnl *** Check PNG libraries *** -dnl *** +dnl *** +dnl *** Check for PNG libraries *** +dnl *** PKG_CHECK_MODULES(PNG, libpng = 1.2.0, [have_libpng=yes], [ dnl libpng.pc not found, try with libpng12.pc PKG_CHECK_MODULES(PNG, libpng12 = 1.2.0, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Put in place dev-tools neutral build environment
Updating branch refs/heads/master
to 292fd407ae55590a1d4ec46b0b936c80c5a03384 (commit)
from f13b573199bf3af409d1836e1e2078f97c45cc98 (commit)
commit 292fd407ae55590a1d4ec46b0b936c80c5a03384
Author: Philip Van Hoof phi...@codeminded.be
Date: Tue Oct 6 11:46:28 2009 +0200
Put in place dev-tools neutral build environment
Signed-off-by: Jannis Pohlmann jan...@xfce.org
autogen.sh = autogen-gnome.sh |2 +
docs/Makefile.am = autogen-xfce.sh | 20 ++-
autogen.sh | 33 ++---
configure.ac|9 +-
m4/xdt-features.m4 | 285 +++
m4/xdt-i18n.m4 | 90 +++
6 files changed, 415 insertions(+), 24 deletions(-)
diff --git a/autogen.sh b/autogen-gnome.sh
similarity index 91%
copy from autogen.sh
copy to autogen-gnome.sh
index 27dd499..604002b 100755
--- a/autogen.sh
+++ b/autogen-gnome.sh
@@ -1,6 +1,8 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
+export ACLOCAL_FLAGS=-I `pwd`/m4 $ACLOCAL_FLAGS
+
srcdir=`dirname $0`
test -z $srcdir srcdir=.
diff --git a/docs/Makefile.am b/autogen-xfce.sh
old mode 100644
new mode 100755
similarity index 61%
copy from docs/Makefile.am
copy to autogen-xfce.sh
index de40f05..21f1742
--- a/docs/Makefile.am
+++ b/autogen-xfce.sh
@@ -1,4 +1,6 @@
-# vi:set ts=8 sw=8 noet ai nocindent:
+#!/bin/sh
+#
+# vi:set et ai sw=2 sts=2 ts=2: */
# -
# Copyright (c) 2009 Jannis Pohlmann jan...@xfce.org
#
@@ -17,5 +19,17 @@
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-SUBDIRS = \
- reference
+(type xdt-autogen) /dev/null 21 || {
+ cat 2 EOF
+autogen.sh: You don't seem to have the Xfce development tools installed on
+your system, which are required to build this software.
+Please install the xfce4-dev-tools package first, it is available
+from http://www.xfce.org/.
+EOF
+ exit 1
+}
+
+# # initialize GTK-Doc
+# gtkdocize || exit 1
+
+XDT_AUTOGEN_REQUIRED_VERSION=4.7.2 exec xdt-autogen $@
diff --git a/autogen.sh b/autogen.sh
index 27dd499..51551ce 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,24 +1,19 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
+which xdt-autogen
-srcdir=`dirname $0`
-test -z $srcdir srcdir=.
+if test x$? = x0; then
+ echo Picked XFCE development environment
+ . ./autogen-xfce.sh
+ exit 0
+fi
-PKG_NAME=tumbler
-REQUIRED_AUTOMAKE_VERSION=1.9
+which gnome-autogen.sh
-(test -f $srcdir/configure.ac \
- test -f $srcdir/README) || {
-echo -n **Error**: Directory \`$srcdir\' does not look like the
-echo top-level $PKG_NAME directory
-exit 1
-}
+if test x$? = x0; then
+ echo Picked GNOME development environment
+ . ./autogen-gnome.sh
+ exit 0
+fi
-# Automake requires that ChangeLog exist.
-touch ChangeLog
+echo You need to install either gnome-common or xfce4-dev-tools
+exit 1
-which gnome-autogen.sh || {
-echo You need to install gnome-common from the GNOME CVS
-exit 1
-}
-. gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 3220a1d..5ed0b1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,8 @@ dnl ***
dnl *** Initialize automake ***
dnl ***
AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
+AC_CONFIG_MACRO_DIR([m4])
+AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS -I m4)
AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE()
@@ -117,7 +119,10 @@ AC_FUNC_MMAP()
dnl **
dnl *** Check for i18n support ***
dnl **
-dnl XDT_I18N([...@linguas@])
+
+linguas=`ls po/*.po | sed s/.po//g | sed sApo/AA | xargs`
+
+XDT_I18N([$linguas])
dnl *
dnl *** Check for GTK-Doc ***
@@ -227,7 +232,7 @@ fi
dnl ***
dnl *** Check for debugging support ***
dnl ***
-dnl XDT_FEATURE_DEBUG()
+XDT_FEATURE_DEBUG()
dnl **
dnl *** Check for linker optimizations ***
diff --git a/m4/xdt-features.m4 b/m4/xdt-features.m4
new file mode 100644
index 000..ea0c685
--- /dev/null
+++ b/m4/xdt-features.m4
@@ -0,0 +1,285 @@
+dnl $Id$
+dnl
+dnl Copyright (c) 2002-2006
+dnl The Xfce development team. All rights reserved.
+dnl
+dnl Written for Xfce by Benedikt Meurer be...@xfce.org.
+dnl
+dnl This program is free software; you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by the Free
+dnl Software Foundation; either version 2 of the License, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE. See
[Xfce4-commits] tumbler:master Rework build files. Fix bugs introduced in previous commits.
Updating branch refs/heads/master to d1b62a10f3d8447639430f276e04667494b35c3b (commit) from 292fd407ae55590a1d4ec46b0b936c80c5a03384 (commit) commit d1b62a10f3d8447639430f276e04667494b35c3b Author: Jannis Pohlmann jan...@xfce.org Date: Tue Oct 6 14:39:02 2009 +0200 Rework build files. Fix bugs introduced in previous commits. The build checks for plugins were moved into acinclude.m4. autogen.sh now passes command line parameters to its delegates autogen-xfce.sh and autogen-gnome.sh. Removed the ELF visibility stuff from configure.ac and so on. acinclude.m4| 73 ++ autogen-xfce.sh |3 - autogen.sh | 56 --- configure.ac| 144 +-- docs/reference/tumbler/tumbler-sections.txt |5 + plugins/font-thumbnailer/Makefile.am|2 +- plugins/pixbuf-thumbnailer/Makefile.am |2 +- 7 files changed, 147 insertions(+), 138 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 000..927cfd2 --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,73 @@ +dnl vi:set et ai sw=2 sts=2 ts=2: */ +dnl - +dnl Copyright (c) 2009 Jannis Pohlmann jan...@xfce.org +dnl +dnl This program is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU General Public License as +dnl published by the Free Software Foundation; either version 2 of +dnl the License, or (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public +dnl License along with this program; if not, write to the Free +dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +dnl Boston, MA 02110-1301, USA. + + + +dnl TUMBLER_PIXBUF_THUMBNAILER() +dnl +dnl Check whether to build and install the GdkPibuxf thumbnailer +dnl +AC_DEFUN([TUMBLER_PIXBUF_THUMBNAILER], +[ +AC_ARG_ENABLE([pixbuf-thumbnailer], [AC_HELP_STRING([--disable-pixbuf-thumbnailer], [Don't build the GdkPixbuf thumbnailer plugin])], + [ac_tumbler_pixbuf_thumbnailer=$enableval], [ac_tumbler_pixbuf_thumbnailer=yes]) +if test x$ac_tumbler_pixbuf_thumbnailer = xyes; then + PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 = 2.14], [], [ac_tumbler_pixbuf_thumbnailer=no]) +fi + +AC_MSG_CHECKING([whether to build the GdkPixbuf thumbnailer plugin]) +AM_CONDITIONAL([TUMBLER_PIXBUF_THUMBNAILER], [test x$ac_tumbler_pixbuf_thumbnailer = xyes]) +AC_MSG_RESULT([$ac_tumbler_pixbuf_thumbnailer]) +]) + + + +dnl TUMBLER_FONT_THUMBNAILER() +dnl +dnl Check whether to build and install the GdkPibuxf thumbnailer +dnl +AC_DEFUN([TUMBLER_FONT_THUMBNAILER], +[ +AC_ARG_ENABLE([font-thumbnailer], [AC_HELP_STRING([--disable-font-thumbnailer], [Don't build the FreeType font thumbnailer plugin])], + [ac_tumbler_font_thumbnailer=$enableval], [ac_tumbler_font_thumbnailer=yes]) +if test x$ac_tumbler_font_thumbnailer = xyes; then + dnl Check for FreeType 2.x + 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]) + else +dnl We can only build the font thumbnailer if FreeType 2.x is available +ac_tumbler_font_thumbnailer=no + fi + AC_SUBST([FREETYPE_CFLAGS]) + AC_SUBST([FREETYPE_LIBS]) +fi + +AC_MSG_CHECKING([whether to build the FreeType thumbnailer plugin]) +AM_CONDITIONAL([TUMBLER_FONT_THUMBNAILER], [test x$ac_tumbler_font_thumbnailer = xyes]) +AC_MSG_RESULT([$ac_tumbler_font_thumbnailer]) +]) diff --git a/autogen-xfce.sh b/autogen-xfce.sh index 21f1742..9b2486b 100755 --- a/autogen-xfce.sh +++ b/autogen-xfce.sh @@ -29,7 +29,4 @@ EOF exit 1 } -# # initialize GTK-Doc -# gtkdocize || exit 1 - XDT_AUTOGEN_REQUIRED_VERSION=4.7.2 exec xdt-autogen $@ diff --git a/autogen.sh b/autogen.sh index 51551ce..3e3c4c3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,19 +1,51 @@ -which xdt-autogen +#!/bin/sh +# +# vi:set et ai sw=2 sts=2 ts=2: */ +# - +# Copyright (c) 2009 Jannis Pohlmann jan...@xfce.org +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty
[Xfce4-commits] tumbler:master Prepare build environment for Maemo compatibility
Updating branch refs/heads/master
to f13b573199bf3af409d1836e1e2078f97c45cc98 (commit)
from f9053a4334e1a8642ae31284c734052d0e206347 (commit)
commit f13b573199bf3af409d1836e1e2078f97c45cc98
Author: Philip Van Hoof phi...@codeminded.be
Date: Wed Sep 30 15:44:38 2009 +0200
Prepare build environment for Maemo compatibility
Signed-off-by: Jannis Pohlmann jan...@xfce.org
autogen.sh | 49 +++---
configure.in.in = configure.ac | 40 +--
plugins/xdg-cache/Makefile.am |4 +++
3 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 21f1742..27dd499 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,35 +1,24 @@
#!/bin/sh
-#
-# vi:set et ai sw=2 sts=2 ts=2: */
-# -
-# Copyright (c) 2009 Jannis Pohlmann jan...@xfce.org
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# Run this to generate all the initial makefiles, etc.
-(type xdt-autogen) /dev/null 21 || {
- cat 2 EOF
-autogen.sh: You don't seem to have the Xfce development tools installed on
-your system, which are required to build this software.
-Please install the xfce4-dev-tools package first, it is available
-from http://www.xfce.org/.
-EOF
- exit 1
+srcdir=`dirname $0`
+test -z $srcdir srcdir=.
+
+PKG_NAME=tumbler
+REQUIRED_AUTOMAKE_VERSION=1.9
+
+(test -f $srcdir/configure.ac \
+ test -f $srcdir/README) || {
+echo -n **Error**: Directory \`$srcdir\' does not look like the
+echo top-level $PKG_NAME directory
+exit 1
}
-# # initialize GTK-Doc
-# gtkdocize || exit 1
+# Automake requires that ChangeLog exist.
+touch ChangeLog
-XDT_AUTOGEN_REQUIRED_VERSION=4.7.2 exec xdt-autogen $@
+which gnome-autogen.sh || {
+echo You need to install gnome-common from the GNOME CVS
+exit 1
+}
+. gnome-autogen.sh
diff --git a/configure.in.in b/configure.ac
similarity index 91%
rename from configure.in.in
rename to configure.ac
index 5d201e5..3220a1d 100644
--- a/configure.in.in
+++ b/configure.ac
@@ -117,7 +117,7 @@ AC_FUNC_MMAP()
dnl **
dnl *** Check for i18n support ***
dnl **
-XDT_I18N([...@linguas@])
+dnl XDT_I18N([...@linguas@])
dnl *
dnl *** Check for GTK-Doc ***
@@ -127,17 +127,20 @@ GTK_DOC_CHECK(1.9)
dnl ***
dnl *** Check for required packages ***
dnl ***
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.16.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0])
-XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
-XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.72])
-XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14])
-XDT_CHECK_PACKAGE([PNG], [libpng], [1.2.0], [],
-[
+
+PKG_CHECK_MODULES(GLIB, glib-2.0 = 2.16.0)
+PKG_CHECK_MODULES(GIO, gio-2.0 = 2.16.0)
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 = 2.16.0)
+PKG_CHECK_MODULES(DBUS, dbus-1 = 1.0.0)
+PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 = 0.72)
+
+PKG_CHECK_MODULES(PNG, libpng = 1.2.0, [have_libpng=yes], [
dnl libpng.pc not found, try with libpng12.pc
- XDT_CHECK_PACKAGE([PNG], [libpng12], [1.2.0])
+ PKG_CHECK_MODULES(PNG, libpng12 = 1.2.0,
+[have_libpng=yes],
+[jhave_libpng=no])
])
+AM_CONDITIONAL([HAVE_LIBPNG], test x$have_libpng = xyes)
dnl ***
dnl *** Check for the pixbuf thumbnailer plugin ***
@@ -146,10 +149,21 @@ AC_ARG_ENABLE([pixbuf-thumbnailer],
[AC_HELP_STRING([--enable-pixbuf-thumbnailer],
[Enable the pixbuf thumbnailer plugin
@:@default=yes@:@])],,
[enable_pixbuf_thumbnailer=yes])
+
if test x$enable_pixbuf_thumbnailer = xyes; then
- AC_DEFINE([ENABLE_PIXBUF_THUMBNAILER], [1], [Define if the pixbuf
thumbnailer plugin is enabled])
+ PKG_CHECK_MODULES(GDK_PIXBUF,
+gdk-pixbuf-2.0 = 2.14,
+[have_gdkpixbuf=yes],
+[have_gdkpixbuf=no])
+
+ if test x$have_gdkpixbuf = xyes; then
+AC_DEFINE([HAVE_PIXBUF], [1], [Define if the pixbuf thumbnailer plugin is
enabled])
+ fi
+else
+ have_gdkpixbuf
[Xfce4-commits] tumbler:master Remove xfce4-dev-tools specific code from the neutral autogen.sh.
Updating branch refs/heads/master
to d45f5f4513054181673326d8be2b2223bc5e70c3 (commit)
from 004458939fb81a92f2d307a4a4c1a18a66e1e1c5 (commit)
commit d45f5f4513054181673326d8be2b2223bc5e70c3
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Oct 6 15:20:15 2009 +0200
Remove xfce4-dev-tools specific code from the neutral autogen.sh.
autogen.sh | 10 --
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 3e3c4c3..f8695f4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,16 +19,6 @@
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-(type xdt-autogen) /dev/null 21 || {
- cat 2 EOF
-autogen.sh: You don't seem to have the Xfce development tools installed on
-your system, which are required to build this software.
-Please install the xfce4-dev-tools package first, it is available
-from http://www.xfce.org/.
-EOF
- exit 1
-}
-
which xdt-autogen
if test x$? = x0; then
echo Building using the Xfce development environment
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
