debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Define MidoriLoadStatus as alias to WebKitLoadStatus

Browse source
This commit is contained in:
Christian Dywan 2011-10-30 14:29:04 +01:00
parent b2257bd19d
commit 0c69e6ff64
2 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
midori/midori-view.c
View file

@ -118,24 +118,6 @@ struct _MidoriViewClass
G_DEFINE_TYPE (MidoriView, midori_view, GTK_TYPE_VBOX);
GType
midori_load_status_get_type (void)
{
static GType type = 0;
static const GEnumValue values[] = {
{ MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", "Load Provisional" },
{ MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", "Load Committed" },
{ MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", "Load Finished" },
{ 0, NULL, NULL }
};
if (type)
return type;
type = g_enum_register_static ("MidoriLoadStatus", values);
return type;
}
GType
midori_new_view_get_type (void)
{
@ -3373,7 +3355,8 @@ midori_view_set_settings (MidoriView* view,
* midori_view_load_status:
* @web_view: a #MidoriView
*
* Determines the current loading status of a view.
* Determines the current loading status of a view. There is no
* error state, unlike webkit_web_view_get_load_status().
*
* Return value: the current #MidoriLoadStatus
**/

17
midori/midori-view.h
View file

@ -18,18 +18,11 @@
G_BEGIN_DECLS
typedef enum
{
MIDORI_LOAD_PROVISIONAL,
MIDORI_LOAD_COMMITTED,
MIDORI_LOAD_FINISHED
} MidoriLoadStatus;
GType
midori_load_status_get_type (void) G_GNUC_CONST;
#define MIDORI_TYPE_LOAD_STATUS \
(midori_load_status_get_type ())
#define MIDORI_LOAD_PROVISIONAL WEBKIT_LOAD_PROVISIONAL
#define MIDORI_LOAD_COMMITTED WEBKIT_LOAD_COMMITTED
#define MIDORI_LOAD_FINISHED WEBKIT_LOAD_FINISHED
#define MidoriLoadStatus WebKitLoadStatus
#define MIDORI_TYPE_LOAD_STATUS WEBKIT_TYPE_LOAD_STATUS
typedef enum
{