Don't use members from the widget directly.

This commit is contained in:
Sebastian Ramacher 2012-03-06 13:37:11 +01:00
parent 930f94fc1f
commit daea420fe6
2 changed files with 17 additions and 39 deletions

View file

@ -230,7 +230,7 @@ zathura_page_widget_get_property(GObject* object, guint prop_id, GValue* value,
static gboolean static gboolean
zathura_page_widget_expose(GtkWidget* widget, GdkEventExpose* event) zathura_page_widget_expose(GtkWidget* widget, GdkEventExpose* event)
{ {
cairo_t* cairo = gdk_cairo_create(widget->window); cairo_t* cairo = gdk_cairo_create(gtk_widget_get_window(widget));
if (cairo == NULL) { if (cairo == NULL) {
girara_error("Could not retreive cairo object"); girara_error("Could not retreive cairo object");
return FALSE; return FALSE;
@ -253,8 +253,10 @@ zathura_page_widget_draw(GtkWidget* widget, cairo_t* cairo)
g_static_mutex_lock(&(priv->lock)); g_static_mutex_lock(&(priv->lock));
#if GTK_MAJOR_VERSION == 2 #if GTK_MAJOR_VERSION == 2
const unsigned int page_height = widget->allocation.height; GtkAllocation allocation;
const unsigned int page_width = widget->allocation.width; gtk_widget_get_allocation(widget, &allocation);
const unsigned int page_height = allocation.height;
const unsigned int page_width = allocation.width;
#else #else
const unsigned int page_height = gtk_widget_get_allocated_height(widget); const unsigned int page_height = gtk_widget_get_allocated_height(widget);
const unsigned int page_width = gtk_widget_get_allocated_width(widget); const unsigned int page_width = gtk_widget_get_allocated_width(widget);
@ -416,7 +418,7 @@ redraw_rect(ZathuraPage* widget, zathura_rectangle_t* rectangle)
#if (GTK_MAJOR_VERSION == 3) #if (GTK_MAJOR_VERSION == 3)
gtk_widget_queue_draw_area(GTK_WIDGET(widget), grect.x, grect.y, grect.width, grect.height); gtk_widget_queue_draw_area(GTK_WIDGET(widget), grect.x, grect.y, grect.width, grect.height);
#else #else
gdk_window_invalidate_rect(GTK_WIDGET(widget)->window, &grect, TRUE); gdk_window_invalidate_rect(gtk_widget_get_window(GTK_WIDGET(widget)), &grect, TRUE);
#endif #endif
} }

View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-03-05 17:21+0100\n" "POT-Creation-Date: 2012-03-06 12:16+0100\n"
"PO-Revision-Date: 2012-03-05 17:26+0100\n" "PO-Revision-Date: 2012-03-05 17:26+0100\n"
"Last-Translator: Sebastian Ramacher <s.ramacher@gmx.at>\n" "Last-Translator: Sebastian Ramacher <s.ramacher@gmx.at>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -30,21 +30,12 @@ msgstr "Ungültige Eingabe '%s' angegeben."
msgid "Invalid index '%s' given." msgid "Invalid index '%s' given."
msgstr "Ungültiger Index '%s' angegeben." msgstr "Ungültiger Index '%s' angegeben."
#: ../commands.c:28 #: ../commands.c:28 ../commands.c:63 ../commands.c:90 ../commands.c:132
#: ../commands.c:63 #: ../commands.c:218 ../commands.c:235 ../commands.c:261 ../commands.c:335
#: ../commands.c:90
#: ../commands.c:132
#: ../commands.c:218
#: ../commands.c:235
#: ../commands.c:261
#: ../commands.c:335
msgid "No document opened." msgid "No document opened."
msgstr "Kein Dokument geöffnet." msgstr "Kein Dokument geöffnet."
#: ../commands.c:34 #: ../commands.c:34 ../commands.c:69 ../commands.c:96 ../commands.c:341
#: ../commands.c:69
#: ../commands.c:96
#: ../commands.c:341
msgid "Invalid number of arguments given." msgid "Invalid number of arguments given."
msgstr "Ungültige Anzahl an Argumenten angegeben." msgstr "Ungültige Anzahl an Argumenten angegeben."
@ -86,18 +77,15 @@ msgstr "Zu viele Argumente angegeben."
msgid "No arguments given." msgid "No arguments given."
msgstr "Keine Argumente angegeben." msgstr "Keine Argumente angegeben."
#: ../commands.c:241 #: ../commands.c:241 ../commands.c:267
#: ../commands.c:267
msgid "Document saved." msgid "Document saved."
msgstr "Dokument gespeichert." msgstr "Dokument gespeichert."
#: ../commands.c:243 #: ../commands.c:243 ../commands.c:269
#: ../commands.c:269
msgid "Failed to save document." msgid "Failed to save document."
msgstr "Konnte Dokument nicht speichern." msgstr "Konnte Dokument nicht speichern."
#: ../commands.c:246 #: ../commands.c:246 ../commands.c:272
#: ../commands.c:272
msgid "Invalid number of arguments." msgid "Invalid number of arguments."
msgstr "Ungültige Anzahl an Argumenten." msgstr "Ungültige Anzahl an Argumenten."
@ -221,21 +209,10 @@ msgstr "Speichere Dokument (und überschreibe bestehende)"
msgid "Save attachments" msgid "Save attachments"
msgstr "Speichere Anhänge" msgstr "Speichere Anhänge"
#: ../document.c:383 #: ../document.c:383 ../document.c:407 ../document.c:426 ../document.c:448
#: ../document.c:407 #: ../document.c:467 ../document.c:489 ../document.c:508 ../document.c:551
#: ../document.c:426 #: ../document.c:571 ../document.c:594 ../document.c:623 ../document.c:652
#: ../document.c:448 #: ../document.c:676 ../document.c:697 ../document.c:718
#: ../document.c:467
#: ../document.c:489
#: ../document.c:508
#: ../document.c:551
#: ../document.c:571
#: ../document.c:594
#: ../document.c:623
#: ../document.c:652
#: ../document.c:676
#: ../document.c:697
#: ../document.c:718
#, c-format #, c-format
msgid "%s not implemented" msgid "%s not implemented"
msgstr "%s ist nicht implementiert." msgstr "%s ist nicht implementiert."
@ -259,4 +236,3 @@ msgstr "Pfad zum Pluginverzeichnis"
#: ../zathura.c:59 #: ../zathura.c:59
msgid "Fork into the background" msgid "Fork into the background"
msgstr "" msgstr ""