Updating branch refs/heads/master
to 1bd3d679d4591dd6689f0f7008e69d5fe8fe177e (commit)
from 34b77702471d93f2d8f19e736d616ea0b01f4664 (commit)
commit 1bd3d679d4591dd6689f0f7008e69d5fe8fe177e
Author: Landry Breuil <lan...@xfce.org>
Date: Thu Feb 14 21:30:41 2013 +0100
Remove the #ifdef machinery checking if GtkTooltip is available
Gtk 2.15.4 was released 4 years ago and GtkTooltip is here since 2.12...
panel-plugin/datetime-dialog.c | 23 -----------------------
panel-plugin/datetime.c | 4 ----
panel-plugin/datetime.h | 8 --------
3 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/panel-plugin/datetime-dialog.c b/panel-plugin/datetime-dialog.c
index 4ef3ab8..ede858f 100644
--- a/panel-plugin/datetime-dialog.c
+++ b/panel-plugin/datetime-dialog.c
@@ -170,7 +170,6 @@ datetime_layout_changed(GtkComboBox *cbox, t_datetime *dt)
/* read layout */
layout = gtk_combo_box_get_active(cbox);
-#if USE_GTK_TOOLTIP_API
switch(layout)
{
case LAYOUT_DATE:
@@ -196,24 +195,6 @@ datetime_layout_changed(GtkComboBox *cbox, t_datetime *dt)
gtk_widget_show(dt->time_font_hbox);
gtk_widget_hide(dt->time_tooltip_label);
}
-#else
- switch(layout)
- {
- case LAYOUT_DATE:
- gtk_widget_set_sensitive(dt->date_frame, TRUE);
- gtk_widget_set_sensitive(dt->time_frame, FALSE);
- break;
-
- case LAYOUT_TIME:
- gtk_widget_set_sensitive(dt->date_frame, FALSE);
- gtk_widget_set_sensitive(dt->time_frame, TRUE);
- break;
-
- default:
- gtk_widget_set_sensitive(dt->date_frame, TRUE);
- gtk_widget_set_sensitive(dt->time_frame, TRUE);
- }
-#endif
datetime_apply_layout(dt, layout);
datetime_update(dt);
@@ -431,7 +412,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(bin),vbox);
-#if USE_GTK_TOOLTIP_API
/* tooltip label */
str = g_markup_printf_escaped("<span style=\"italic\">%s</span>",
_("The date will appear in a tooltip."));
@@ -440,7 +420,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
gtk_label_set_use_markup(GTK_LABEL(datetime->date_tooltip_label), TRUE);
gtk_misc_set_alignment(GTK_MISC(datetime->date_tooltip_label), 0.0f, 0.0f);
gtk_box_pack_start(GTK_BOX(vbox), datetime->date_tooltip_label, FALSE,
FALSE, 0);
-#endif
/* hbox */
datetime->date_font_hbox = gtk_hbox_new(FALSE, 2);
@@ -534,7 +513,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(bin),vbox);
-#if USE_GTK_TOOLTIP_API
/* tooltip label */
str = g_markup_printf_escaped("<span style=\"italic\">%s</span>",
_("The time will appear in a tooltip."));
@@ -543,7 +521,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
gtk_label_set_use_markup(GTK_LABEL(datetime->time_tooltip_label), TRUE);
gtk_misc_set_alignment(GTK_MISC(datetime->time_tooltip_label), 0.0f, 0.0f);
gtk_box_pack_start(GTK_BOX(vbox), datetime->time_tooltip_label, FALSE,
FALSE, 0);
-#endif
/* hbox */
datetime->time_font_hbox = gtk_hbox_new(FALSE, 2);
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 559020e..181c273 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -177,7 +177,6 @@ gboolean datetime_update(t_datetime *datetime)
return TRUE;
}
-#if USE_GTK_TOOLTIP_API
static gboolean datetime_tooltip_timer(t_datetime *datetime)
{
DBG("wake");
@@ -244,7 +243,6 @@ static gboolean datetime_query_tooltip(GtkWidget *widget,
return TRUE;
}
-#endif
static void on_calendar_realized(GtkWidget *widget, t_datetime *datetime)
{
@@ -420,7 +418,6 @@ void datetime_apply_layout(t_datetime *datetime, t_layout
layout)
break;
}
-#if USE_GTK_TOOLTIP_API
/* update tooltip handler */
if (datetime->tooltip_handler_id)
{
@@ -441,7 +438,6 @@ void datetime_apply_layout(t_datetime *datetime, t_layout
layout)
default:
gtk_widget_set_has_tooltip(GTK_WIDGET(datetime->button), FALSE);
}
-#endif
/* set order based on layout-selection */
switch(datetime->layout)
diff --git a/panel-plugin/datetime.h b/panel-plugin/datetime.h
index 73aa4ed..5f09f83 100644
--- a/panel-plugin/datetime.h
+++ b/panel-plugin/datetime.h
@@ -22,8 +22,6 @@
#ifndef DATETIME_H
#define DATETIME_H
-#define USE_GTK_TOOLTIP_API GTK_CHECK_VERSION(2,15,4)
-
/* enums */
enum {
DATE = 0,
@@ -48,10 +46,8 @@ typedef struct {
GtkWidget *time_label;
guint update_interval; /* time between updates in milliseconds */
guint timeout_id;
-#if USE_GTK_TOOLTIP_API
guint tooltip_timeout_id;
gulong tooltip_handler_id;
-#endif
/* settings */
gchar *date_font;
@@ -62,17 +58,13 @@ typedef struct {
/* option widgets */
GtkWidget *date_frame;
-#if USE_GTK_TOOLTIP_API
GtkWidget *date_tooltip_label;
-#endif
GtkWidget *date_font_hbox;
GtkWidget *date_font_selector;
GtkWidget *date_format_combobox;
GtkWidget *date_format_entry;
GtkWidget *time_frame;
-#if USE_GTK_TOOLTIP_API
GtkWidget *time_tooltip_label;
-#endif
GtkWidget *time_font_hbox;
GtkWidget *time_font_selector;
GtkWidget *time_format_combobox;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
