set minimum requirements for glib to 2.13.0 and for gtk+ to 2.11.0 in

2007-07-17  Jaap Haitsma  <jaap@haitsma.org>

	* configure.in: set minimum requirements for glib to 2.13.0 and for
	gtk+ to 2.11.0 in order to use new tooltip API of gtk 2.12

	* almost all applets: See individual Changelogs for changes
	Use gtk-about i.s.o. gnome-stock-about. Fixes bug #456955
	Use g_set_application name such that the application name
	gets shown correctly in the about dialog. Convert usage of GtkTooltips
	to new tooltips API of GTK 2.12 Fixes bug #457145
 	

svn path=/trunk/; revision=10289

4 files changed, 15 insertions, 11 deletions

diff --git a/accessx-status/ChangeLog b/accessx-status/ChangeLog
index e2879e179..895704f51 100644
--- a/accessx-status/ChangeLog
+++ b/accessx-status/ChangeLog
@@ -1,3 +1,14 @@
+2007-07-17  Jaap Haitsma <jaap@haitsma.org>
+
+	* GNOME_AccessxApplet.xml: use gtk-about i.s.o. gnome-stock-about
+	Fixes bug #456955
+
+	* applet.c: (about_cb), (create_applet),
+	(accessx_status_applet_destroy), (accessx_status_applet_fill):
+	* applet.h: Use g_set_application name such that the application name
+	gets shown correctly in the about dialog. Convert usage of GtkTooltips
+	to new tooltips API of GTK 2.12 Fixes bug #457145
+
 2006-11-15  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* docs/C/accessx-status.xml: Fix build.
diff --git a/accessx-status/GNOME_AccessxApplet.xml b/accessx-status/GNOME_AccessxApplet.xml
index 877dea85d..a770c2207 100644
--- a/accessx-status/GNOME_AccessxApplet.xml
+++ b/accessx-status/GNOME_AccessxApplet.xml
@@ -6,7 +6,7 @@
          <menuitem name="Item 2" verb="Help" _label="_Help"
                    pixtype="stock" pixname="gtk-help"/>
          <menuitem name="Item 3" verb="About" _label="_About"
-                   pixtype="stock" pixname="gnome-stock-about"/>
+                   pixtype="stock" pixname="gtk-about"/>
       </popup>
    </popups>
 </Root>
diff --git a/accessx-status/applet.c b/accessx-status/applet.c
index baf8c617b..efa7f2279 100644
--- a/accessx-status/applet.c
+++ b/accessx-status/applet.c
@@ -135,7 +135,6 @@ about_cb (BonoboUIComponent          *uic,
 	};
 	
 	gtk_show_about_dialog (NULL,
-		"name",		_("AccessX Status"),
 		"version",	VERSION,
 		"comments",	_("Shows the state of AccessX features such "
 				  "as latched modifiers"),
@@ -1038,6 +1037,8 @@ create_applet (PanelApplet *applet)
 	GdkPixbuf	    *pixbuf;
         gint                 large_toolbar_pixels;
 
+	g_set_application_name (_("AccessX Status"));
+
 	sapplet->xkb = NULL;
 	sapplet->xkb_display = NULL;
 	sapplet->box = NULL;
@@ -1122,8 +1123,6 @@ accessx_status_applet_destroy (GtkWidget *widget, gpointer user_data)
 		XkbFreeKeyboard (sapplet->xkb, 0, True);
 	if (sapplet->xkb_display) 
 		XCloseDisplay (sapplet->xkb_display);
-	if (sapplet->tooltips)
-		g_object_unref (sapplet->tooltips);
 }
 
 static void
@@ -1312,11 +1311,7 @@ accessx_status_applet_fill (PanelApplet *applet)
 					      NULL);
 	}
 
-	sapplet->tooltips = gtk_tooltips_new ();
-	g_object_ref (sapplet->tooltips);
-	gtk_object_sink (GTK_OBJECT (sapplet->tooltips));
-	gtk_tooltips_set_tip (sapplet->tooltips, GTK_WIDGET (sapplet->applet), 
-			      _("Keyboard Accessibility Status"), NULL);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (sapplet->applet), _("Keyboard Accessibility Status"));
 
 	atk_object = gtk_widget_get_accessible (GTK_WIDGET (sapplet->applet));
 	atk_object_set_name (atk_object, _("AccessX Status"));
diff --git a/accessx-status/applet.h b/accessx-status/applet.h
index 5704290bc..324f08c41 100644
--- a/accessx-status/applet.h
+++ b/accessx-status/applet.h
@@ -21,7 +21,6 @@
 #define __ACCESSX_APPLET_H__
 
 #include <gtk/gtkiconfactory.h>
-#include <gtk/gtktooltips.h>
 #include <gtk/gtkwidget.h>
 
 #include <panel-applet.h>
@@ -73,7 +72,6 @@ typedef struct
 	GtkWidget        *hyper_indicator;
 	GtkWidget        *super_indicator;
 	GtkWidget        *alt_graph_indicator;
-	GtkTooltips      *tooltips;
 	PanelAppletOrient orient;
 	GtkIconFactory   *icon_factory;
 	gboolean          initialized;