File use-gtk3.diff of Package hp-drive-guard
---
configure.ac | 2 +-
src/client.c | 6 +++---
src/setup.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@
AM_GNU_GETTEXT_VERSION([0.17])
PKG_CHECK_MODULES(GLIB, glib-2.0)
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(GTK, gtk+-3.0)
PKG_CHECK_MODULES(DBUS, dbus-glib-1)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify)
PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)
--- a/src/client.c
+++ b/src/client.c
@@ -245,7 +245,7 @@
if (drive_guard->current_tooltip != drive_guard->current_state)
{
drive_guard->current_tooltip = drive_guard->current_state;
- gtk_status_icon_set_tooltip (drive_guard->status_icon,
+ gtk_status_icon_set_tooltip_text (drive_guard->status_icon,
gettext (tooltip_msgs [drive_guard->current_tooltip]));
}
@@ -581,7 +581,7 @@
}
drive_guard->status_icon = gtk_status_icon_new_from_pixbuf (drive_guard->state_pixbuf [DRIVE_GUARD_DRIVE_STATE_NONE]);
- gtk_status_icon_set_tooltip (drive_guard->status_icon,
+ gtk_status_icon_set_tooltip_text (drive_guard->status_icon,
_("Looking for HP DriveGuard service"));
init_state_change_notification (drive_guard);
queue_state_change_notification (drive_guard);
@@ -635,7 +635,7 @@
return 1;
textdomain (PACKAGE);
- gtk_set_locale ();
+ setlocale (LC_ALL, "");
notify_init ("DriveGuard");
--- a/src/setup.c
+++ b/src/setup.c
@@ -171,7 +171,7 @@
vbox1 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox1);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox1, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox1, FALSE, FALSE, 0);
device_enable = gtk_check_button_new_with_label (_("Enable HP DriveGuard"));
gtk_widget_show (device_enable);