mousetweaks r235 - in trunk: . help help/C src

[gerdk svn gnome org]

Author: gerdk
Date: Mon Aug 18 16:24:53 2008
New Revision: 235
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=235&view=rev

Log:
2008-08-18 Gerd Kohlberger <gerdk svn gnome org>

	* src/pointer-capture-applet.c:
	* src/dwell-click-applet.c:
	* src/mt-common.c:
	* src/mt-common.h:

	Switch to gtk_show_uri and move the code to mt-common.

	* configure.ac: Bump gtk requirement to 2.13.1
	* Makfile.am: Add --disable-scrollkeeper
	
	* help/mousetweaks.omf.in: Add .omf template
	* help/Makefile.am: Move legal.xml to DOC_ENTITIES
	* help/C/mousetweaks.xml: Add "maintainer" and "description" roles
	needed by scrollkeeper.



Added:
   trunk/help/mousetweaks.omf.in
Removed:
   trunk/help/C/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/help/C/mousetweaks.xml
   trunk/help/Makefile.am
   trunk/src/dwell-click-applet.c
   trunk/src/mt-common.c
   trunk/src/mt-common.h
   trunk/src/pointer-capture-applet.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Aug 18 16:24:53 2008
@@ -2,17 +2,14 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install
+DISTCHECK_CONFIGURE_FLAGS =		\
+	--disable-schemas-install	\
+	--disable-scrollkeeper
 
 EXTRA_DIST =			\
 	gnome-doc-utils.make	\
-	xmldocs.make		\
-	omf.make		\
 	MAINTAINERS		\
 	COPYING.GPL		\
 	COPYING.FDL
 
-DISTCLEANFILES =		\
-	gnome-doc-utils.make	\
-	omf.make		\
-	xmldocs.make
+DISTCLEANFILES = gnome-doc-utils.make

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Aug 18 16:24:53 2008
@@ -37,7 +37,7 @@
 dnl *** dependencies ***
 
 PKG_CHECK_MODULES(DEPENDENCIES,
-	gtk+-2.0 >= 2.10.0
+	gtk+-2.0 >= 2.13.1
 	libglade-2.0 >= 2.4.0
 	gconf-2.0 >= 2.16.0
 	dbus-glib-1 >= 0.7

Modified: trunk/help/C/mousetweaks.xml
==============================================================================
--- trunk/help/C/mousetweaks.xml	(original)
+++ trunk/help/C/mousetweaks.xml	Mon Aug 18 16:24:53 2008
@@ -11,7 +11,7 @@
 <article id="index" lang="en">
   <articleinfo>
     <title><application>Mousetweaks</application> Manual</title>
-
+    <abstract role="description"></abstract>
     <copyright>
       <year>2007 - 2008</year>
 
@@ -21,7 +21,7 @@
     &legal;
 
     <authorgroup>
-      <author>
+      <author role="maintainer">
         <firstname>Francesco</firstname>
 
         <surname>Fumanti</surname>
@@ -1014,4 +1014,4 @@
       file COPYING.FDL included with the source code of this program.</para>
     </sect2>
   </sect1>
-</article>
\ No newline at end of file
+</article>

Modified: trunk/help/Makefile.am
==============================================================================
--- trunk/help/Makefile.am	(original)
+++ trunk/help/Makefile.am	Mon Aug 18 16:24:53 2008
@@ -1,8 +1,8 @@
 AUTOMAKE_OPTIONS = -Wno-portability
+include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
 DOC_MODULE = mousetweaks
-DOC_INCLUDES = legal.xml
+DOC_ENTITIES = legal.xml
+DOC_INCLUDES =
 DOC_LINGUAS = el es oc sv
-
-include $(top_srcdir)/gnome-doc-utils.make

Added: trunk/help/mousetweaks.omf.in
==============================================================================
--- (empty file)
+++ trunk/help/mousetweaks.omf.in	Mon Aug 18 16:24:53 2008
@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone="no"?>
+<omf>
+  <resource>
+    <subject category="GNOME|Accessibility"/>
+    <type>manual</type>
+    <relation seriesid="09192735-b643-67d7-2908-4d262a55bc64e0"/>
+    <rights type="GNU FDL" license.version="1.2" holder="Francesco Fumanti"/>
+  </resource>
+</omf>

Modified: trunk/src/dwell-click-applet.c
==============================================================================
--- trunk/src/dwell-click-applet.c	(original)
+++ trunk/src/dwell-click-applet.c	Mon Aug 18 16:24:53 2008
@@ -20,7 +20,6 @@
 #include <panel-applet.h>
 #include <gconf/gconf-client.h>
 #include <dbus/dbus-glib.h>
-#include <libgnomeui/gnome-help.h>
 
 #include "mt-common.h"
 
@@ -345,18 +344,10 @@
 	     gpointer           data,
 	     const char        *cname)
 {
-    GError *error = NULL;
+    DwellData *dd = data;
 
-    if (!gnome_help_display_desktop (NULL,
-				     "mousetweaks",
-				     "mousetweaks",
-				     NULL,
-				     &error)) {
-	mt_common_show_dialog (_("Failed to Display Help"),
-			       error->message,
-			       MT_MESSAGE_WARNING);
-	g_error_free (error);
-    }
+    mt_common_show_help (gtk_widget_get_screen (dd->box),
+			 gtk_get_current_event_time ());
 }
 
 static void

Modified: trunk/src/mt-common.c
==============================================================================
--- trunk/src/mt-common.c	(original)
+++ trunk/src/mt-common.c	Mon Aug 18 16:24:53 2008
@@ -21,6 +21,18 @@
 
 #include "mt-common.h"
 
+void
+mt_common_show_help (GdkScreen *screen, guint32 timestamp)
+{
+    GError *error = NULL;
+
+    if (!gtk_show_uri (screen, "ghelp:mousetweaks", timestamp, &error)) {
+	mt_common_show_dialog (_("Failed to Display Help"),
+			       error->message, MT_MESSAGE_WARNING);
+	g_error_free (error);
+    }
+}
+
 gint
 mt_common_show_dialog (const gchar  *primary,
 		       const gchar  *secondary,

Modified: trunk/src/mt-common.h
==============================================================================
--- trunk/src/mt-common.h	(original)
+++ trunk/src/mt-common.h	Mon Aug 18 16:24:53 2008
@@ -75,6 +75,8 @@
     MT_MESSAGE_LOGOUT
 } MtMessageType;
 
+void mt_common_show_help   (GdkScreen     *screen,
+			    guint32        timestamp);
 gint mt_common_show_dialog (const gchar   *primary,
 			    const gchar   *secondary,
 			    MtMessageType  type);

Modified: trunk/src/pointer-capture-applet.c
==============================================================================
--- trunk/src/pointer-capture-applet.c	(original)
+++ trunk/src/pointer-capture-applet.c	Mon Aug 18 16:24:53 2008
@@ -19,7 +19,6 @@
 #include <glade/glade.h>
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
-#include <libgnomeui/gnome-help.h>
 
 #include "mt-common.h"
 
@@ -55,38 +54,24 @@
 		     gpointer           data,
 		     const char        *cname)
 {
-    CaptureData *cd = (CaptureData *) data;
+    CaptureData *cd = data;
 
     gtk_window_present (GTK_WINDOW (cd->prefs));
 }
 
 static void
-show_help (void)
-{
-    GError *error = NULL;
-
-    if (!gnome_help_display_desktop (NULL,
-				     "mousetweaks",
-				     "mousetweaks",
-				     NULL,
-				     &error)) {
-	mt_common_show_dialog (_("Couldn't display help"),
-			       error->message,
-			       MT_MESSAGE_WARNING);
-	g_error_free (error);
-    }
-}
-
-static void
 capture_help (BonoboUIComponent *component, gpointer data, const char *cname)
 {
-    show_help ();
+    CaptureData *cd = data;
+
+    mt_common_show_help (gtk_widget_get_screen (cd->area),
+			 gtk_get_current_event_time ());
 }
 
 static void
 capture_about (BonoboUIComponent *component, gpointer data, const char *cname)
 {
-    CaptureData *cd = (CaptureData *) data;
+    CaptureData *cd = data;
 
     gtk_window_present (GTK_WINDOW (glade_xml_get_widget (cd->xml, "about")));
 }
@@ -324,7 +309,8 @@
 static void
 prefs_help (GtkButton *button, gpointer data)
 {
-    show_help ();
+    mt_common_show_help (gtk_widget_get_screen (GTK_WIDGET (button)),
+			 gtk_get_current_event_time ());
 }
 
 static void