office/evince
office/evince
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/evince synced 2024-07-02 15:48:59 +00:00
Code Issues Projects Releases Wiki Activity

Remove the internal copy of gtkinfobar and use GtkInfoBar directly

Browse Source
This commit is contained in:
Carlos Garcia Campos 2010-03-31 18:06:02 +02:00
parent 764836d36a
commit b81ab84ffb
8 changed files with 6 additions and 1384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -761,7 +761,6 @@ backend/pixbuf/Makefile
backend/ps/Makefile
backend/tiff/Makefile
cut-n-paste/Makefile
cut-n-paste/evinfobar/Makefile
cut-n-paste/gimpcellrenderertoggle/Makefile
cut-n-paste/smclient/Makefile
cut-n-paste/toolbar-editor/Makefile

2
cut-n-paste/Makefile.am
View File

@ -1,3 +1,3 @@
SUBDIRS = zoom-control toolbar-editor totem-screensaver evinfobar smclient gimpcellrenderertoggle
SUBDIRS = zoom-control toolbar-editor totem-screensaver smclient gimpcellrenderertoggle
-include $(top_srcdir)/git.mk

11
cut-n-paste/evinfobar/Makefile.am
View File

@ -1,11 +0,0 @@
noinst_LTLIBRARIES = libevinfobar.la
libevinfobar_la_SOURCES = \
evinfobar.c \
evinfobar.h
libevinfobar_la_CFLAGS = \
$(SHELL_CORE_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED)
-include $(top_srcdir)/git.mk

1245
cut-n-paste/evinfobar/evinfobar.c
View File

File diff suppressed because it is too large Load Diff

115
cut-n-paste/evinfobar/evinfobar.h
View File

@ -1,115 +0,0 @@
/*
* gtkinfobar.h
* This file is part of GTK+
*
* Copyright (C) 2005 - Paolo Maggi
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the gedit Team, 2005. See the gedit AUTHORS file for a
* list of people on the gedit Team.
* See the gedit ChangeLog files for a list of changes.
*
* Modified by the GTK+ Team, 2008-2009.
*/
#ifndef __EV_INFO_BAR_H__
#define __EV_INFO_BAR_H__
#include <gtk/gtk.h>
G_BEGIN_DECLS
/*
* Type checking and casting macros
*/
#define EV_TYPE_INFO_BAR (ev_info_bar_get_type())
#define EV_INFO_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), EV_TYPE_INFO_BAR, EvInfoBar))
#define EV_INFO_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_INFO_BAR, EvInfoBarClass))
#define EV_IS_INFO_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), EV_TYPE_INFO_BAR))
#define EV_IS_INFO_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_INFO_BAR))
#define EV_INFO_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EV_TYPE_INFO_BAR, EvInfoBarClass))
typedef struct _EvInfoBarPrivate EvInfoBarPrivate;
typedef struct _EvInfoBarClass EvInfoBarClass;
typedef struct _EvInfoBar EvInfoBar;
struct _EvInfoBar
{
GtkHBox parent;
/*< private > */
EvInfoBarPrivate *priv;
};
struct _EvInfoBarClass
{
GtkHBoxClass parent_class;
/* Signals */
void (* response) (EvInfoBar *info_bar, gint response_id);
/* Keybinding signals */
void (* close) (EvInfoBar *info_bar);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
void (*_gtk_reserved5) (void);
void (*_gtk_reserved6) (void);
};
GType ev_info_bar_get_type (void) G_GNUC_CONST;
GtkWidget *ev_info_bar_new (void);
GtkWidget *ev_info_bar_new_with_buttons (const gchar *first_button_text,
...);
GtkWidget *ev_info_bar_get_action_area (EvInfoBar *info_bar);
GtkWidget *ev_info_bar_get_content_area (EvInfoBar *info_bar);
void ev_info_bar_add_action_widget (EvInfoBar *info_bar,
GtkWidget *child,
gint response_id);
GtkWidget *ev_info_bar_add_button (EvInfoBar *info_bar,
const gchar *button_text,
gint response_id);
void ev_info_bar_add_buttons (EvInfoBar *info_bar,
const gchar *first_button_text,
...);
void ev_info_bar_set_response_sensitive (EvInfoBar *info_bar,
gint response_id,
gboolean setting);
void ev_info_bar_set_default_response (EvInfoBar *info_bar,
gint response_id);
/* Emit response signal */
void ev_info_bar_response (EvInfoBar *info_bar,
gint response_id);
void ev_info_bar_set_message_type (EvInfoBar *info_bar,
GtkMessageType message_type);
GtkMessageType ev_info_bar_get_message_type (EvInfoBar *info_bar);
G_END_DECLS
#endif /* __EV_INFO_BAR_H__ */

2
shell/Makefile.am
View File

@ -6,7 +6,6 @@ INCLUDES= \
-I$(top_srcdir)/cut-n-paste/zoom-control/ \
-I$(top_srcdir)/cut-n-paste/toolbar-editor/ \
-I$(top_srcdir)/cut-n-paste/totem-screensaver/ \
-I$(top_srcdir)/cut-n-paste/evinfobar/ \
-I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/ \
-I$(top_srcdir)/cut-n-paste/smclient/ \
-I$(top_srcdir)/libdocument \
@ -102,7 +101,6 @@ evince_LDADD= \
$(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \
$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \
$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \
$(top_builddir)/cut-n-paste/evinfobar/libevinfobar.la \
$(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \
$(top_builddir)/cut-n-paste/smclient/libsmclient.la \
$(top_builddir)/properties/libevproperties.la \

8
shell/ev-message-area.c
View File

@ -23,8 +23,6 @@
#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)
@ -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)

6
shell/ev-message-area.h
View File

@ -26,8 +26,6 @@
#include <gtk/gtk.h>
#include "evinfobar.h"
G_BEGIN_DECLS
#define EV_TYPE_MESSAGE_AREA (ev_message_area_get_type ())
@ -42,14 +40,14 @@ typedef struct _EvMessageAreaClass EvMessageAreaClass;
typedef struct _EvMessageAreaPrivate EvMessageAreaPrivate;
struct _EvMessageArea {
EvInfoBar parent_instance;
GtkInfoBar parent_instance;
/*< private >*/
EvMessageAreaPrivate *priv;
};
struct _EvMessageAreaClass {
EvInfoBarClass parent_class;
GtkInfoBarClass parent_class;
};
GType ev_message_area_get_type (void) G_GNUC_CONST;