[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / shell / ev-message-area.c

diff --git a/shell/ev-message-area.c b/shell/ev-message-area.c
index 4d3389871daf40d28c6d82a6c075e011e4ab0957..2c4be7533e778abf4fe715c674fd2f8f10e31fd9 100644 (file)
--- a/shell/ev-message-area.c
+++ b/shell/ev-message-area.c
@@ -18,13 +18,11 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-
 #include "ev-message-area.h"
 
 #define EV_MESSAGE_AREA_GET_PRIVATE(obj) \
@@ -55,7 +53,7 @@ static void ev_message_area_get_property (GObject      *object,
                                          GValue       *value,
                                          GParamSpec   *pspec);
 
-G_DEFINE_TYPE (EvMessageArea, ev_message_area, EV_TYPE_INFO_BAR)
+G_DEFINE_TYPE (EvMessageArea, ev_message_area, GTK_TYPE_INFO_BAR)
 
 static void
 ev_message_area_class_init (EvMessageAreaClass *class)
@@ -108,7 +106,7 @@ ev_message_area_init (EvMessageArea *area)
        gtk_label_set_line_wrap (GTK_LABEL (area->priv->label), TRUE);
        gtk_label_set_selectable (GTK_LABEL (area->priv->label), TRUE);
        gtk_misc_set_alignment (GTK_MISC (area->priv->label), 0.0, 0.5);
-       GTK_WIDGET_SET_FLAGS (area->priv->label, GTK_CAN_FOCUS);
+       gtk_widget_set_can_focus (area->priv->label, TRUE);
        gtk_box_pack_start (GTK_BOX (vbox), area->priv->label, TRUE, TRUE, 0);
        gtk_widget_show (area->priv->label);
 
@@ -117,7 +115,7 @@ ev_message_area_init (EvMessageArea *area)
        gtk_label_set_line_wrap (GTK_LABEL (area->priv->secondary_label), TRUE);
        gtk_label_set_selectable (GTK_LABEL (area->priv->secondary_label), TRUE);
        gtk_misc_set_alignment (GTK_MISC (area->priv->secondary_label), 0.0, 0.5);
-       GTK_WIDGET_SET_FLAGS (area->priv->secondary_label, GTK_CAN_FOCUS);
+       gtk_widget_set_can_focus (area->priv->secondary_label, TRUE);
        gtk_box_pack_start (GTK_BOX (vbox), area->priv->secondary_label, TRUE, TRUE, 0);
 
        area->priv->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);
@@ -131,7 +129,7 @@ ev_message_area_init (EvMessageArea *area)
        gtk_box_pack_start (GTK_BOX (area->priv->main_box), hbox, TRUE, TRUE, 0);
        gtk_widget_show (hbox);
 
-       content_area = ev_info_bar_get_content_area (EV_INFO_BAR (area));
+       content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (area));
        gtk_container_add (GTK_CONTAINER (content_area), area->priv->main_box);
        gtk_widget_show (area->priv->main_box);
 }
@@ -242,7 +240,7 @@ _ev_message_area_add_buttons_valist (EvMessageArea *area,
        response_id = va_arg (args, gint);
 
        while (text != NULL) {
-               ev_info_bar_add_button (EV_INFO_BAR (area), text, response_id);
+               gtk_info_bar_add_button (GTK_INFO_BAR (area), text, response_id);
 
                text = va_arg (args, gchar*);
                if (text == NULL)
@@ -293,7 +291,7 @@ ev_message_area_set_image (EvMessageArea *area,
 
        area->priv->message_type = GTK_MESSAGE_OTHER;
 
-       parent = area->priv->image->parent;
+       parent = gtk_widget_get_parent (area->priv->image);
        gtk_container_add (GTK_CONTAINER (parent), image);
        gtk_container_remove (GTK_CONTAINER (parent), area->priv->image);
        gtk_box_reorder_child (GTK_BOX (parent), image, 0);