[gnome-nettool] Make gnome-nettool build with -DGSEAL_ENABLE
- From: Andre Klapper <aklapper src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-nettool] Make gnome-nettool build with -DGSEAL_ENABLE
- Date: Tue, 6 Apr 2010 19:27:44 +0000 (UTC)
commit 2e60ec1b6f727c638c7e9518a34ce5e270713dbb
Author: Andre Klapper <a9016009 gmx de>
Date: Thu Mar 11 11:29:52 2010 +0100
Make gnome-nettool build with -DGSEAL_ENABLE
configure.in | 2 +-
src/nettool.c | 8 ++++----
src/ping.c | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/configure.in b/configure.in
index 7f46c80..2ca910b 100644
--- a/configure.in
+++ b/configure.in
@@ -28,7 +28,7 @@ dnl ** pkg-config dependacy checks **
dnl ******************************************
-GTK_REQUIRED=2.12.0
+GTK_REQUIRED=2.19.7
GCONF_REQUIRED=1.1.11
PKG_CHECK_MODULES(NETTOOL,
diff --git a/src/nettool.c b/src/nettool.c
index 88e880a..753e1b2 100644
--- a/src/nettool.c
+++ b/src/nettool.c
@@ -475,7 +475,7 @@ netinfo_toggle_state (Netinfo * netinfo, gboolean state,
PANGO_WEIGHT_NORMAL);
netinfo_progress_indicator_stop (netinfo);
- gdk_window_set_cursor ((netinfo->output)->window, NULL);
+ gdk_window_set_cursor (gtk_widget_get_window(netinfo->output), NULL);
netinfo->child_pid = 0;
gtk_statusbar_pop (GTK_STATUSBAR (netinfo->status_bar), 0);
@@ -487,9 +487,9 @@ netinfo_toggle_state (Netinfo * netinfo, gboolean state,
netinfo_progress_indicator_start (netinfo);
cursor = gdk_cursor_new (GDK_WATCH);
- if (!GTK_WIDGET_REALIZED (netinfo->output))
+ if (!gtk_widget_get_realized (netinfo->output))
gtk_widget_realize (GTK_WIDGET (netinfo->output));
- gdk_window_set_cursor ((netinfo->output)->window, cursor);
+ gdk_window_set_cursor (gtk_widget_get_window(netinfo->output), cursor);
gdk_cursor_unref (cursor);
if (netinfo->stbar_text) {
@@ -529,7 +529,7 @@ netinfo_toggle_button (Netinfo * netinfo)
button = gtk_button_new ();
gtk_widget_show (GTK_WIDGET (button));
gtk_container_add (GTK_CONTAINER (parent), button);
- GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default (GTK_WIDGET (button), TRUE);
alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_widget_show (alignment);
diff --git a/src/ping.c b/src/ping.c
index 211950a..2c973c3 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -62,7 +62,7 @@ draw_centered_text (GtkWidget *widget, gint x, gint y, gchar *text)
x -= width/2;
- gtk_paint_layout (widget->style, widget->window,
+ gtk_paint_layout (gtk_widget_get_style(widget), gtk_widget_get_window(widget),
GTK_STATE_NORMAL, TRUE,
NULL, NULL, NULL, x, y,
layout);
@@ -137,8 +137,8 @@ draw_ping_graph (Netinfo *netinfo)
gchar *tmpstr;
widget = netinfo->graph;
- window = widget->window;
- style = widget->style;
+ window = gtk_widget_get_window(widget);
+ style = gtk_widget_get_style(widget);
rangemax = packets_transmitted;
rangemin = MAX (0, rangemax - ntodisplay);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]