[Xfce4-commits] r25759 - in thunar/trunk: . docs/reference/thunar-vfs/tmpl thunar

[Benedikt Meurer]

Author: benny
Date: 2007-05-25 09:17:10 +0000 (Fri, 25 May 2007)
New Revision: 25759

Modified:
   thunar/trunk/ChangeLog
   thunar/trunk/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml
   thunar/trunk/thunar/thunar-dialogs.c
Log:
2007-05-25	Benedikt Meurer <benny at xfce.org>

	* thunar/thunar-dialogs.c(thunar_dialogs_show_about): Add support
	  for new GTK+ 2.11 API.
	* docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml: Add new
	  signal "ask-replace" to the reference manual.




Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog	2007-05-25 00:44:00 UTC (rev 25758)
+++ thunar/trunk/ChangeLog	2007-05-25 09:17:10 UTC (rev 25759)
@@ -1,3 +1,10 @@
+2007-05-25	Benedikt Meurer <benny at xfce.org>
+
+	* thunar/thunar-dialogs.c(thunar_dialogs_show_about): Add support
+	  for new GTK+ 2.11 API.
+	* docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml: Add new
+	  signal "ask-replace" to the reference manual.
+
 2007-05-23	Benedikt Meurer <benny at xfce.org>
 
 	* thunar-vfs/thunar-vfs-io-jobs.c, thunar-vfs/thunar-vfs-job.{c,h},

Modified: thunar/trunk/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml
===================================================================
--- thunar/trunk/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml	2007-05-25 00:44:00 UTC (rev 25758)
+++ thunar/trunk/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml	2007-05-25 09:17:10 UTC (rev 25759)
@@ -27,6 +27,7 @@
 @THUNAR_VFS_JOB_RESPONSE_NO: 
 @THUNAR_VFS_JOB_RESPONSE_CANCEL: 
 @THUNAR_VFS_JOB_RESPONSE_NO_ALL: 
+ at THUNAR_VFS_JOB_RESPONSE_RETRY: 
 
 <!-- ##### STRUCT ThunarVfsJob ##### -->
 <para>
@@ -44,6 +45,16 @@
 @arg2: 
 @Returns: 
 
+<!-- ##### SIGNAL ThunarVfsJob::ask-replace ##### -->
+<para>
+
+</para>
+
+ at thunarvfsjob: the object which received the signal.
+ at arg1: 
+ at arg2: 
+ at Returns: 
+
 <!-- ##### SIGNAL ThunarVfsJob::error ##### -->
 <para>
 

Modified: thunar/trunk/thunar/thunar-dialogs.c
===================================================================
--- thunar/trunk/thunar/thunar-dialogs.c	2007-05-25 00:44:00 UTC (rev 25758)
+++ thunar/trunk/thunar/thunar-dialogs.c	2007-05-25 09:17:10 UTC (rev 25759)
@@ -100,7 +100,11 @@
                          "documenters", documenters,
                          "license", XFCE_LICENSE_GPL,
                          "logo", logo,
+#if GTK_CHECK_VERSION(2,11,0)
+                         "program-name", title,
+#else
                          "name", title,
+#endif
                          "translator-credits", _("translator-credits"),
                          "version", PACKAGE_VERSION,
                          "website", "http://thunar.xfce.org/",