always set hide_tooltip to TRUE if we are handling a leave notify event.

[~andy/gtk] / gtk / gtkprintunixdialog.c

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index b18af88a1c910f83a08b89608f486f92395331a2..66b65c8bdb00f50e099234a02379aa7a68c6fdb2 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -21,6 +21,7 @@
 #include "config.h"
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <math.h>
 
@@ -45,7 +46,6 @@
 #include "gtkframe.h"
 #include "gtkalignment.h"
 #include "gtklabel.h"
-#include "gtktooltips.h"
 #include "gtkeventbox.h"
 
 #include "gtkprintbackend.h"
@@ -123,7 +123,6 @@ struct GtkPrintUnixDialogPrivate
 
   GtkPageSetup *page_setup;
 
-  GtkTooltips *tooltips;
   GtkWidget *all_pages_radio;
   GtkWidget *current_page_radio;
   GtkWidget *page_range_radio;
@@ -271,9 +270,6 @@ gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog)
   priv->print_backends = NULL;
   priv->current_page = -1;
 
-  priv->tooltips = gtk_tooltips_new ();
-  g_object_ref_sink (priv->tooltips);
-
   priv->page_setup = gtk_page_setup_new ();
 
   g_signal_connect (dialog, 
@@ -315,12 +311,6 @@ gtk_print_unix_dialog_finalize (GObject *object)
 
   unschedule_idle_mark_conflicts (dialog);
 
-  if (priv->tooltips)
-    {
-      g_object_unref (priv->tooltips);
-      priv->tooltips = NULL;
-    }
-
   if (priv->request_details_tag)
     {
       g_source_remove (priv->request_details_tag);
@@ -1057,6 +1047,8 @@ update_dialog_from_capabilities (GtkPrintUnixDialog *dialog)
                            caps & GTK_PRINT_CAPABILITY_REVERSE);
   gtk_widget_set_sensitive (priv->scale_spin,
                            caps & GTK_PRINT_CAPABILITY_SCALE);
+  gtk_widget_set_sensitive (GTK_WIDGET (priv->pages_per_sheet),
+                           caps & GTK_PRINT_CAPABILITY_NUMBER_UP);
 
   if (caps & GTK_PRINT_CAPABILITY_PREVIEW)
     gtk_widget_show (priv->preview_button);
@@ -1539,7 +1531,7 @@ create_main_page (GtkPrintUnixDialog *dialog)
                    0, 0);
  
   radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)), _("Ra_nge"));
-  gtk_tooltips_set_tip (priv->tooltips, radio, _("Specify one or more page ranges,\n e.g. 1-3,7,11"), NULL);
+  gtk_widget_set_tooltip_text (radio, _("Specify one or more page ranges,\n e.g. 1-3,7,11"));
  
   priv->page_range_radio = radio;
   gtk_widget_show (radio);