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

5 files changed, 17 insertions, 20 deletions

diff --git a/mini-commander/ChangeLog b/mini-commander/ChangeLog
index 8ea46213c..729937d0a 100644
--- a/mini-commander/ChangeLog
+++ b/mini-commander/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-17  Jaap Haitsma  <jaap@haitsma.org>
+
+	* src/GNOME_MiniCommanderApplet.xml: Use gtk-about i.s.o. 
+	gnome-stock-about. Fixes bug #456955
+
+	* src/about.c: (about_box):
+	* src/mini-commander_applet.c: (mc_applet_draw), (mc_destroyed),
+	(mini_commander_applet_fill):
+	* src/mini-commander_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
+
 2007-04-04  Claudio Saavedra  <csaavedra@alumnos.utalca.cl>
 
 	* help/es/es.po: Updated Spanish translation by Jorge González.
diff --git a/mini-commander/src/GNOME_MiniCommanderApplet.xml b/mini-commander/src/GNOME_MiniCommanderApplet.xml
index 1862d685f..0dafacc9b 100644
--- a/mini-commander/src/GNOME_MiniCommanderApplet.xml
+++ b/mini-commander/src/GNOME_MiniCommanderApplet.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/mini-commander/src/about.c b/mini-commander/src/about.c
index f3de64d7c..eb187aece 100644
--- a/mini-commander/src/about.c
+++ b/mini-commander/src/about.c
@@ -44,7 +44,6 @@ void about_box (BonoboUIComponent *uic,
 	};
 
 	gtk_show_about_dialog (NULL,
-		"name",		_("Command Line"), 
 		"version",	VERSION,
 		"copyright",	"\xc2\xa9 1998-2005 Oliver Maruhn and others",
 		"comments",	_("This GNOME applet adds a command line to "
diff --git a/mini-commander/src/mini-commander_applet.c b/mini-commander/src/mini-commander_applet.c
index ddca6ef48..56e245368 100644
--- a/mini-commander/src/mini-commander_applet.c
+++ b/mini-commander/src/mini-commander_applet.c
@@ -243,7 +243,7 @@ mc_applet_draw (MCData *mc)
     icon = gtk_image_new_from_stock (COMMANDLINE_BROWSER_STOCK, button_icon_size);
     gtk_container_add (GTK_CONTAINER (button), icon);
 
-    gtk_tooltips_set_tip (mc->tooltips, button, _("Browser"), NULL);
+    gtk_widget_set_tooltip_text (button, _("Browser"));
     gtk_box_pack_start (GTK_BOX (hbox_buttons), button, TRUE, TRUE, 0);
 	
     set_atk_name_description (button,
@@ -261,7 +261,7 @@ mc_applet_draw (MCData *mc)
     icon = gtk_image_new_from_stock (COMMANDLINE_HISTORY_STOCK, 								     button_icon_size);
     gtk_container_add (GTK_CONTAINER (button), icon);
 
-    gtk_tooltips_set_tip (mc->tooltips, button, _("History"), NULL);
+    gtk_widget_set_tooltip_text (button, _("History"));
     gtk_box_pack_end (GTK_BOX (hbox_buttons), button, TRUE, TRUE, 0);
 
     set_atk_name_description (button,
@@ -290,13 +290,8 @@ mc_destroyed (GtkWidget *widget,
     }
     g_object_unref (client);
 
-    g_object_unref (mc->tooltips);	
-
     mc_macros_free (mc->preferences.macros);
 
-    if (mc->about_dialog)
-        gtk_widget_destroy (mc->about_dialog);
-
     if (mc->prefs_dialog.dialog)
         gtk_widget_destroy (mc->prefs_dialog.dialog);
 
@@ -365,6 +360,7 @@ mini_commander_applet_fill (PanelApplet *applet)
 	    exit (1);
     }
 
+    g_set_application_name (_("Command Line"));
     
     gtk_window_set_default_icon_name ("gnome-mini-commander");
     
@@ -375,12 +371,6 @@ mini_commander_applet_fill (PanelApplet *applet)
     panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
     mc_load_preferences (mc);
     command_line_init_stock_icons ();
-
-    mc->about_dialog = NULL;
-
-    mc->tooltips = gtk_tooltips_new ();
-    g_object_ref (mc->tooltips);
-    gtk_object_sink (GTK_OBJECT (mc->tooltips));
   
     g_signal_connect (mc->applet, "change_orient",
 		      G_CALLBACK (mc_orient_changed), mc);
diff --git a/mini-commander/src/mini-commander_applet.h b/mini-commander/src/mini-commander_applet.h
index 8ea05d597..44aa0afb5 100644
--- a/mini-commander/src/mini-commander_applet.h
+++ b/mini-commander/src/mini-commander_applet.h
@@ -29,7 +29,6 @@
 G_BEGIN_DECLS
 
 #include <gtk/gtkwidget.h>
-#include <gtk/gtktooltips.h>
 #include <panel-applet.h>
 
 typedef struct _MCData MCData;
@@ -45,10 +44,6 @@ typedef struct _MCData MCData;
 struct _MCData {
     PanelApplet   *applet;
 
-    GtkTooltips   *tooltips;
-
-    GtkWidget     *about_dialog;
-
     GtkWidget     *applet_box;
 
     GtkWidget     *entry;