diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /gtk/gtkaboutdialog.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'gtk/gtkaboutdialog.c')
| -rw-r--r-- | gtk/gtkaboutdialog.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index acf1aff93a..388b69abe1 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -2010,7 +2010,8 @@ text_view_visibility_notify_event (GtkWidget *text_view, { GdkDevice *dev = d->data; - gdk_window_get_device_position (text_view->window, dev, &wx, &wy, NULL); + gdk_window_get_device_position (gtk_widget_get_window (text_view), dev, + &wx, &wy, NULL); gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), GTK_TEXT_WINDOW_WIDGET, @@ -2564,7 +2565,7 @@ gtk_about_dialog_set_license_type (GtkAboutDialog *about, g_string_append (str, "\n"); g_string_append (str, priv->copyright); g_string_append (str, "\n\n"); - g_string_append_printf (str, gettext (gtk_license_preamble), url); + g_string_append_printf (str, _(gtk_license_preamble), url); g_free (priv->license); priv->license = g_string_free (str, FALSE); |