[Goodies-commits] r4904 - xfce4-datetime-plugin/trunk/panel-plugin

[Diego Ongaro]

Author: ongardie
Date: 2008-06-07 23:15:48 +0000 (Sat, 07 Jun 2008)
New Revision: 4904

Modified:
   xfce4-datetime-plugin/trunk/panel-plugin/datetime-dialog.c
   xfce4-datetime-plugin/trunk/panel-plugin/datetime.c
   xfce4-datetime-plugin/trunk/panel-plugin/datetime.h
Log:
Revert old tooltip implementation (from r2680)


Modified: xfce4-datetime-plugin/trunk/panel-plugin/datetime-dialog.c
===================================================================
--- xfce4-datetime-plugin/trunk/panel-plugin/datetime-dialog.c	2008-06-07 22:23:16 UTC (rev 4903)
+++ xfce4-datetime-plugin/trunk/panel-plugin/datetime-dialog.c	2008-06-07 23:15:48 UTC (rev 4904)
@@ -39,9 +39,7 @@
 /* Layouts */
 static const char *layout_strs[] = {
   N_("Date only"),
-  N_("Date only, time in tooltip"),
   N_("Time only"),
-  N_("Time only, date in tooltip"),
   N_("Date, then time"),
   N_("Time, then date")
 };

Modified: xfce4-datetime-plugin/trunk/panel-plugin/datetime.c
===================================================================
--- xfce4-datetime-plugin/trunk/panel-plugin/datetime.c	2008-06-07 22:23:16 UTC (rev 4903)
+++ xfce4-datetime-plugin/trunk/panel-plugin/datetime.c	2008-06-07 23:15:48 UTC (rev 4904)
@@ -156,11 +156,9 @@
   switch(datetime->layout)
   {
     case LAYOUT_DATE:
-    case LAYOUT_DATE_TIMETT:
       gtk_widget_hide(GTK_WIDGET(datetime->time_label));
       break;
     case LAYOUT_TIME:
-    case LAYOUT_TIME_DATETT:
       gtk_widget_hide(GTK_WIDGET(datetime->date_label));
       break;
     default:
@@ -180,26 +178,6 @@
       gtk_box_reorder_child(GTK_BOX(datetime->vbox), datetime->date_label, 1);
   }
 
-  /* update tooltip */
-  switch(datetime->layout)
-  {
-    case LAYOUT_DATE_TIMETT:
-      gtk_tooltips_set_tip(GTK_TOOLTIPS(datetime->tips), datetime->button,
-          gtk_label_get_text(GTK_LABEL(datetime->time_label)), NULL);
-      break;
-    case LAYOUT_TIME_DATETT:
-      gtk_tooltips_set_tip(GTK_TOOLTIPS(datetime->tips), datetime->button,
-          gtk_label_get_text(GTK_LABEL(datetime->date_label)), NULL);
-      break;
-    default:
-      gtk_tooltips_set_tip(GTK_TOOLTIPS(datetime->tips), datetime->button,
-          NULL, NULL);
-#if USE_GTK_TOOLTIP_API
-      gtk_widget_set_has_tooltip(datetime->button, FALSE);
-#endif
-      break;
-  }
-
   /*
    * Compute the time to the next update and start the timer.
    * The wake interval is the time remaining
@@ -602,9 +580,6 @@
   gtk_box_reorder_child(GTK_BOX(datetime->vbox), datetime->time_label, 0);
   gtk_box_reorder_child(GTK_BOX(datetime->vbox), datetime->date_label, 1);
 
-  /* create tooltips */
-  datetime->tips = gtk_tooltips_new ();
-
   /* connect widget signals to functions */
   g_signal_connect(datetime->button, "button-press-event",
       G_CALLBACK(datetime_clicked), datetime);

Modified: xfce4-datetime-plugin/trunk/panel-plugin/datetime.h
===================================================================
--- xfce4-datetime-plugin/trunk/panel-plugin/datetime.h	2008-06-07 22:23:16 UTC (rev 4903)
+++ xfce4-datetime-plugin/trunk/panel-plugin/datetime.h	2008-06-07 23:15:48 UTC (rev 4904)
@@ -31,9 +31,7 @@
 typedef enum
 {
   LAYOUT_DATE = 0,
-  LAYOUT_DATE_TIMETT,
   LAYOUT_TIME,
-  LAYOUT_TIME_DATETT,
   LAYOUT_DATE_TIME,
   LAYOUT_TIME_DATE,
   LAYOUT_COUNT