[Xfce4-commits] <xfce4-panel:andrzejr/deskbar-pager> pager-wnck: renaming a11y-related symbols.
Andrzej
noreply at xfce.org
Thu Dec 22 14:56:02 CET 2011
Updating branch refs/heads/andrzejr/deskbar-pager
to 2fadf056ac10d0001e65ef0ce7222075b2c92d28 (commit)
from e319360585143e4508cd3341f91f4293995e617d (commit)
commit 2fadf056ac10d0001e65ef0ce7222075b2c92d28
Author: Andrzej <ndrwrdck at gmail.com>
Date: Thu Dec 22 22:40:58 2011 +0900
pager-wnck: renaming a11y-related symbols.
No attempt of making the code compilable yet.
plugins/pager/pager-wnck-accessible-factory.c | 32 ++--
plugins/pager/pager-wnck-accessible-factory.h | 30 ++--
plugins/pager/pager-wnck-accessible.c | 162 ++++++++++----------
plugins/pager/pager-wnck-accessible.h | 34 ++--
.../pager-wnck-workspace-accessible-factory.c | 32 ++--
.../pager-wnck-workspace-accessible-factory.h | 30 ++--
plugins/pager/pager-wnck-workspace-accessible.c | 147 +++++++++---------
plugins/pager/pager-wnck-workspace-accessible.h | 34 ++--
plugins/pager/pager-wnck.c | 14 +-
9 files changed, 259 insertions(+), 256 deletions(-)
diff --git a/plugins/pager/pager-wnck-accessible-factory.c b/plugins/pager/pager-wnck-accessible-factory.c
index 42cff8b..6d91cba 100644
--- a/plugins/pager/pager-wnck-accessible-factory.c
+++ b/plugins/pager/pager-wnck-accessible-factory.c
@@ -19,53 +19,53 @@
*/
#include <gtk/gtk.h>
-#include "pager-accessible-factory.h"
-#include "pager-accessible.h"
+#include "pager-wnck-accessible-factory.h"
+#include "pager-wnck-accessible.h"
-G_DEFINE_TYPE (WnckPagerAccessibleFactory,
- wnck_pager_accessible_factory, ATK_TYPE_OBJECT_FACTORY);
+G_DEFINE_TYPE (PagerWnckAccessibleFactory,
+ pager_wnck_accessible_factory, ATK_TYPE_OBJECT_FACTORY);
-static AtkObject* wnck_pager_accessible_factory_create_accessible (GObject *obj);
+static AtkObject* pager_wnck_accessible_factory_create_accessible (GObject *obj);
-static GType wnck_pager_accessible_factory_get_accessible_type (void);
+static GType pager_wnck_accessible_factory_get_accessible_type (void);
static void
-wnck_pager_accessible_factory_class_init (WnckPagerAccessibleFactoryClass *klass)
+pager_wnck_accessible_factory_class_init (PagerWnckAccessibleFactoryClass *klass)
{
AtkObjectFactoryClass *class = ATK_OBJECT_FACTORY_CLASS (klass);
- class->create_accessible = wnck_pager_accessible_factory_create_accessible;
- class->get_accessible_type = wnck_pager_accessible_factory_get_accessible_type;
+ class->create_accessible = pager_wnck_accessible_factory_create_accessible;
+ class->get_accessible_type = pager_wnck_accessible_factory_get_accessible_type;
}
static void
-wnck_pager_accessible_factory_init (WnckPagerAccessibleFactory *factory)
+pager_wnck_accessible_factory_init (PagerWnckAccessibleFactory *factory)
{
}
AtkObjectFactory*
-wnck_pager_accessible_factory_new (void)
+pager_wnck_accessible_factory_new (void)
{
GObject *factory;
- factory = g_object_new (WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY, NULL);
+ factory = g_object_new (XFCE_TYPE_PAGER_WNCK_ACCESSIBLE_FACTORY, NULL);
return ATK_OBJECT_FACTORY (factory);
}
static AtkObject*
-wnck_pager_accessible_factory_create_accessible (GObject *obj)
+pager_wnck_accessible_factory_create_accessible (GObject *obj)
{
GtkWidget *widget;
g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);
widget = GTK_WIDGET (obj);
- return wnck_pager_accessible_new (widget);
+ return pager_wnck_accessible_new (widget);
}
static GType
-wnck_pager_accessible_factory_get_accessible_type (void)
+pager_wnck_accessible_factory_get_accessible_type (void)
{
- return WNCK_PAGER_TYPE_ACCESSIBLE;
+ return XFCE_TYPE_PAGER_WNCK_ACCESSIBLE;
}
diff --git a/plugins/pager/pager-wnck-accessible-factory.h b/plugins/pager/pager-wnck-accessible-factory.h
index 9dfef36..e7cc38c 100644
--- a/plugins/pager/pager-wnck-accessible-factory.h
+++ b/plugins/pager/pager-wnck-accessible-factory.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef __WNCK_PAGER_ACCESSIBLE_FACTORY_H__
-#define __WBCK_PAGER_ACCESSIBLE_FACTORY_H__
+#ifndef __PAGER_WNCK_ACCESSIBLE_FACTORY_H__
+#define __PAGER_WNCK_ACCESSIBLE_FACTORY_H__
#include <atk/atk.h>
@@ -27,33 +27,33 @@
extern "C" {
#endif /* __cplusplus */
-#define WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY (wnck_pager_accessible_factory_get_type())
-#define WNCK_PAGER_ACCESSIBLE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY, WnckpagerAccessibleFactory))
-#define WNCK_PAGER_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY, WnckPagerAccessibleFactoryClass))
-#define WNCK_IS_PAGER_ACCESSIBLE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY))
-#define WNCK_IS_PAGER_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY))
-#define WNCK_PAGER_ACCESSIBLE_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY, WnckPagerAccessibleFactoryClass))
+#define XFCE_TYPE_PAGER_WNCK_ACCESSIBLE_FACTORY (pager_wnck_accessible_factory_get_type())
+#define XFCE_PAGER_WNCK_ACCESSIBLE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_PAGER_WNCK_ACCESSIBLE_FACTORY, PagerWnckAccessibleFactory))
+#define XFCE_PAGER_WNCK_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_PAGER_WNCK_ACCESSIBLE_FACTORY, PagerWnckAccessibleFactoryClass))
+#define XFCE_IS_PAGER_WNCK_ACCESSIBLE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_PAGER_WNCK_ACCESSIBLE_FACTORY))
+#define XFCE_IS_PAGER_WNCK_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_PAGER_WNCK_ACCESSIBLE_FACTORY))
+#define XFCE_PAGER_WNCK_ACCESSIBLE_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_PAGER_WNCK_ACCESSIBLE_FACTORY, PagerWnckAccessibleFactoryClass))
-typedef struct _WnckPagerAccessibleFactory WnckPagerAccessibleFactory;
-typedef struct _WnckPagerAccessibleFactoryClass WnckPagerAccessibleFactoryClass;
+typedef struct _PagerWnckAccessibleFactory PagerWnckAccessibleFactory;
+typedef struct _PagerWnckAccessibleFactoryClass PagerWnckAccessibleFactoryClass;
-struct _WnckPagerAccessibleFactory
+struct _PagerWnckAccessibleFactory
{
AtkObjectFactory parent;
};
-struct _WnckPagerAccessibleFactoryClass
+struct _PagerWnckAccessibleFactoryClass
{
AtkObjectFactoryClass parent_class;
};
-GType wnck_pager_accessible_factory_get_type (void) G_GNUC_CONST;
+GType pager_wnck_accessible_factory_get_type (void) G_GNUC_CONST;
-AtkObjectFactory* wnck_pager_accessible_factory_new (void);
+AtkObjectFactory* pager_wnck_accessible_factory_new (void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* __WNCK_PAGER_ACCESSIBLE_FACTORY_H__ */
+#endif /* __PAGER_WNCK_ACCESSIBLE_FACTORY_H__ */
diff --git a/plugins/pager/pager-wnck-accessible.c b/plugins/pager/pager-wnck-accessible.c
index ae6cb1b..da8e8cd 100644
--- a/plugins/pager/pager-wnck-accessible.c
+++ b/plugins/pager/pager-wnck-accessible.c
@@ -25,43 +25,43 @@
#include <gtk/gtk.h>
#include <string.h>
#include <atk/atk.h>
-#include "pager-accessible.h"
-#include "pager-accessible-factory.h"
-#include "workspace-accessible.h"
-#include "private.h"
+#include "pager-wnck.h"
+#include "pager-wnck-accessible.h"
+#include "pager-wnck-accessible-factory.h"
+#include "pager-wnck-workspace-accessible.h"
-typedef struct _WnckPagerAccessiblePriv WnckPagerAccessiblePriv;
-struct _WnckPagerAccessiblePriv
+typedef struct _PagerWnckAccessiblePriv PagerWnckAccessiblePriv;
+struct _PagerWnckAccessiblePriv
{
GSList *children;
};
-static void wnck_pager_accessible_class_init (WnckPagerAccessibleClass *klass);
-static const char* wnck_pager_accessible_get_name (AtkObject *obj);
-static const char* wnck_pager_accessible_get_description (AtkObject *obj);
-static int wnck_pager_accessible_get_n_children (AtkObject *obj);
-static AtkObject* wnck_pager_accessible_ref_child (AtkObject *obj,
+static void pager_wnck_accessible_class_init (PagerWnckAccessibleClass *klass);
+static const char* pager_wnck_accessible_get_name (AtkObject *obj);
+static const char* pager_wnck_accessible_get_description (AtkObject *obj);
+static int pager_wnck_accessible_get_n_children (AtkObject *obj);
+static AtkObject* pager_wnck_accessible_ref_child (AtkObject *obj,
int i);
static void atk_selection_interface_init (AtkSelectionIface *iface);
-static gboolean wnck_pager_add_selection (AtkSelection *selection,
+static gboolean pager_wnck_add_selection (AtkSelection *selection,
int i);
-static gboolean wnck_pager_is_child_selected (AtkSelection *selection,
+static gboolean pager_wnck_is_child_selected (AtkSelection *selection,
int i);
-static AtkObject* wnck_pager_ref_selection (AtkSelection *selection,
+static AtkObject* pager_wnck_ref_selection (AtkSelection *selection,
int i);
-static int wnck_pager_selection_count (AtkSelection *selection);
-static void wnck_pager_accessible_update_workspace (AtkObject *aobj_ws,
- WnckPager *pager,
+static int pager_wnck_selection_count (AtkSelection *selection);
+static void pager_wnck_accessible_update_workspace (AtkObject *aobj_ws,
+ PagerWnck *pager,
int i);
-static void wnck_pager_accessible_finalize (GObject *gobject);
+static void pager_wnck_accessible_finalize (GObject *gobject);
-static WnckPagerAccessiblePriv* get_private_data (GObject *gobject);
+static PagerWnckAccessiblePriv* get_private_data (GObject *gobject);
static void* parent_class;
static GQuark quark_private_data = 0;
GType
-wnck_pager_accessible_get_type (void)
+pager_wnck_accessible_get_type (void)
{
static GType type = 0;
@@ -69,13 +69,13 @@ wnck_pager_accessible_get_type (void)
{
GTypeInfo tinfo =
{
- sizeof (WnckPagerAccessibleClass),
+ sizeof (PagerWnckAccessibleClass),
(GBaseInitFunc) NULL, /* base init */
(GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) wnck_pager_accessible_class_init, /* class init */
+ (GClassInitFunc) pager_wnck_accessible_class_init, /* class init */
(GClassFinalizeFunc) NULL, /* class finalize */
NULL, /* class data */
- sizeof (WnckPagerAccessible), /* instance size */
+ sizeof (PagerWnckAccessible), /* instance size */
0, /* nb preallocs */
NULL, /* instance init */
NULL /* value table */
@@ -97,7 +97,7 @@ wnck_pager_accessible_get_type (void)
GTypeQuery query;
GType derived_atk_type;
- derived_type = g_type_parent (WNCK_TYPE_PAGER);
+ derived_type = g_type_parent (XFCE_TYPE_PAGER_WNCK);
factory = atk_registry_get_factory (atk_get_default_registry (),
derived_type);
@@ -107,7 +107,7 @@ wnck_pager_accessible_get_type (void)
tinfo.instance_size = query.instance_size;
type = g_type_register_static (derived_atk_type,
- "WnckPagerAccessible", &tinfo, 0);
+ "PagerWnckAccessible", &tinfo, 0);
g_type_add_interface_static (type, ATK_TYPE_SELECTION, &atk_selection_info);
}
@@ -120,35 +120,35 @@ atk_selection_interface_init (AtkSelectionIface *iface)
{
g_return_if_fail (iface != NULL);
- iface->add_selection = wnck_pager_add_selection;
- iface->ref_selection = wnck_pager_ref_selection;
- iface->get_selection_count = wnck_pager_selection_count;
- iface->is_child_selected = wnck_pager_is_child_selected;
+ iface->add_selection = pager_wnck_add_selection;
+ iface->ref_selection = pager_wnck_ref_selection;
+ iface->get_selection_count = pager_wnck_selection_count;
+ iface->is_child_selected = pager_wnck_is_child_selected;
}
static void
-wnck_pager_accessible_class_init (WnckPagerAccessibleClass *klass)
+pager_wnck_accessible_class_init (PagerWnckAccessibleClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GObjectClass *obj_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
- class->get_name = wnck_pager_accessible_get_name;
- class->get_description = wnck_pager_accessible_get_description;
- class->get_n_children = wnck_pager_accessible_get_n_children;
- class->ref_child = wnck_pager_accessible_ref_child;
+ class->get_name = pager_wnck_accessible_get_name;
+ class->get_description = pager_wnck_accessible_get_description;
+ class->get_n_children = pager_wnck_accessible_get_n_children;
+ class->ref_child = pager_wnck_accessible_ref_child;
- obj_class->finalize = wnck_pager_accessible_finalize;
- quark_private_data = g_quark_from_static_string ("wnck-pager-accessible-private-data");
+ obj_class->finalize = pager_wnck_accessible_finalize;
+ quark_private_data = g_quark_from_static_string ("pager-wnck-accessible-private-data");
}
static gboolean
-wnck_pager_add_selection (AtkSelection *selection,
+pager_wnck_add_selection (AtkSelection *selection,
int i)
{
- WnckPager *pager;
+ PagerWnck *pager;
WnckWorkspace *wspace;
GtkWidget *widget;
int n_spaces;
@@ -167,8 +167,8 @@ wnck_pager_add_selection (AtkSelection *selection,
return FALSE;
}
- pager = WNCK_PAGER (widget);
- n_spaces = _wnck_pager_get_n_workspaces (pager);
+ pager = XFCE_PAGER_WNCK (widget);
+ n_spaces = _pager_wnck_get_n_workspaces (pager);
if (i < 0 || i >= n_spaces)
return FALSE;
@@ -176,9 +176,9 @@ wnck_pager_add_selection (AtkSelection *selection,
/*
* Activate the following worksapce as current workspace
*/
- wspace = _wnck_pager_get_workspace (pager, i);
+ wspace = _pager_wnck_get_workspace (pager, i);
/* FIXME: Is gtk_get_current_event_time() good enough here? I have no idea */
- _wnck_pager_activate_workspace (wspace, gtk_get_current_event_time ());
+ _pager_wnck_activate_workspace (wspace, gtk_get_current_event_time ());
return TRUE;
}
@@ -187,10 +187,10 @@ wnck_pager_add_selection (AtkSelection *selection,
* Returns the AtkObject of the selected WorkSpace
*/
static AtkObject*
-wnck_pager_ref_selection (AtkSelection *selection,
+pager_wnck_ref_selection (AtkSelection *selection,
int i)
{
- WnckPager *pager;
+ PagerWnck *pager;
GtkWidget *widget;
WnckWorkspace *active_wspace;
AtkObject *accessible;
@@ -210,12 +210,12 @@ wnck_pager_ref_selection (AtkSelection *selection,
*/
return NULL;
}
- pager = WNCK_PAGER (widget);
+ pager = XFCE_PAGER_WNCK (widget);
- active_wspace = WNCK_WORKSPACE (_wnck_pager_get_active_workspace (pager));
+ active_wspace = WNCK_WORKSPACE (_pager_wnck_get_active_workspace (pager));
wsno = wnck_workspace_get_number (active_wspace);
- accessible = ATK_OBJECT (wnck_pager_accessible_ref_child (ATK_OBJECT (selection), wsno));
+ accessible = ATK_OBJECT (pager_wnck_accessible_ref_child (ATK_OBJECT (selection), wsno));
return accessible;
}
@@ -225,7 +225,7 @@ wnck_pager_ref_selection (AtkSelection *selection,
* b'coz only one child can be selected at a time.
*/
static int
-wnck_pager_selection_count (AtkSelection *selection)
+pager_wnck_selection_count (AtkSelection *selection)
{
GtkWidget *widget;
@@ -252,10 +252,10 @@ wnck_pager_selection_count (AtkSelection *selection)
*and returns TRUE on selection.
*/
static gboolean
-wnck_pager_is_child_selected (AtkSelection *selection,
+pager_wnck_is_child_selected (AtkSelection *selection,
int i)
{
- WnckPager *pager;
+ PagerWnck *pager;
GtkWidget *widget;
WnckWorkspace *active_wspace;
int wsno;
@@ -273,8 +273,8 @@ wnck_pager_is_child_selected (AtkSelection *selection,
return FALSE;
}
- pager = WNCK_PAGER (widget);
- active_wspace = _wnck_pager_get_active_workspace (pager);
+ pager = XFCE_PAGER_WNCK (widget);
+ active_wspace = _pager_wnck_get_active_workspace (pager);
wsno = wnck_workspace_get_number (active_wspace);
@@ -282,13 +282,13 @@ wnck_pager_is_child_selected (AtkSelection *selection,
}
AtkObject*
-wnck_pager_accessible_new (GtkWidget *widget)
+pager_wnck_accessible_new (GtkWidget *widget)
{
GObject *object;
AtkObject *aobj_pager;
GtkAccessible *gtk_accessible;
- object = g_object_new (WNCK_PAGER_TYPE_ACCESSIBLE, NULL);
+ object = g_object_new (XFCE_TYPE_PAGER_WNCK_ACCESSIBLE, NULL);
aobj_pager = ATK_OBJECT (object);
@@ -306,9 +306,9 @@ wnck_pager_accessible_new (GtkWidget *widget)
}
static void
-wnck_pager_accessible_finalize (GObject *gobject)
+pager_wnck_accessible_finalize (GObject *gobject)
{
- WnckPagerAccessiblePriv *pager_accessible_priv;
+ PagerWnckAccessiblePriv *pager_accessible_priv;
GSList *children;
pager_accessible_priv = get_private_data (gobject);
@@ -334,9 +334,9 @@ wnck_pager_accessible_finalize (GObject *gobject)
}
static const char*
-wnck_pager_accessible_get_name (AtkObject *obj)
+pager_wnck_accessible_get_name (AtkObject *obj)
{
- g_return_val_if_fail (WNCK_PAGER_IS_ACCESSIBLE (obj), NULL);
+ g_return_val_if_fail (XFCE_IS_PAGER_WNCK_ACCESSIBLE (obj), NULL);
if (obj->name == NULL)
obj->name = g_strdup (_("Workspace Switcher"));
@@ -345,9 +345,9 @@ wnck_pager_accessible_get_name (AtkObject *obj)
}
static const char*
-wnck_pager_accessible_get_description (AtkObject *obj)
+pager_wnck_accessible_get_description (AtkObject *obj)
{
- g_return_val_if_fail (WNCK_PAGER_IS_ACCESSIBLE (obj), NULL);
+ g_return_val_if_fail (XFCE_IS_PAGER_WNCK_ACCESSIBLE (obj), NULL);
if (obj->description == NULL)
obj->description = g_strdup (_("Tool to switch between workspaces"));
@@ -359,13 +359,13 @@ wnck_pager_accessible_get_description (AtkObject *obj)
* Number of workspaces is returned as n_children
*/
static int
-wnck_pager_accessible_get_n_children (AtkObject* obj)
+pager_wnck_accessible_get_n_children (AtkObject* obj)
{
GtkAccessible *accessible;
GtkWidget *widget;
- WnckPager *pager;
+ PagerWnck *pager;
- g_return_val_if_fail (WNCK_PAGER_IS_ACCESSIBLE (obj), 0);
+ g_return_val_if_fail (XFCE_IS_PAGER_WNCK_ACCESSIBLE (obj), 0);
accessible = GTK_ACCESSIBLE (obj);
#if GTK_CHECK_VERSION(2,21,0)
@@ -378,27 +378,27 @@ wnck_pager_accessible_get_n_children (AtkObject* obj)
/* State is defunct */
return 0;
- pager = WNCK_PAGER (widget);
+ pager = XFCE_PAGER_WNCK (widget);
- return _wnck_pager_get_n_workspaces (pager);
+ return _pager_wnck_get_n_workspaces (pager);
}
/*
* Will return appropriate static AtkObject for the workspaces
*/
static AtkObject*
-wnck_pager_accessible_ref_child (AtkObject *obj,
+pager_wnck_accessible_ref_child (AtkObject *obj,
int i)
{
GtkAccessible *accessible;
GtkWidget *widget;
- WnckPager *pager;
+ PagerWnck *pager;
int n_spaces = 0;
int len;
- WnckPagerAccessiblePriv *pager_accessible_priv;
+ PagerWnckAccessiblePriv *pager_accessible_priv;
AtkObject *ret;
- g_return_val_if_fail (WNCK_PAGER_IS_ACCESSIBLE (obj), NULL);
+ g_return_val_if_fail (XFCE_IS_PAGER_WNCK_ACCESSIBLE (obj), NULL);
g_return_val_if_fail (ATK_IS_OBJECT (obj), NULL);
accessible = GTK_ACCESSIBLE (obj);
@@ -412,11 +412,11 @@ wnck_pager_accessible_ref_child (AtkObject *obj,
/* State is defunct */
return NULL;
- pager = WNCK_PAGER (widget);
+ pager = XFCE_PAGER_WNCK (widget);
pager_accessible_priv = get_private_data (G_OBJECT (obj));
len = g_slist_length (pager_accessible_priv->children);
- n_spaces = _wnck_pager_get_n_workspaces (pager);
+ n_spaces = _pager_wnck_get_n_workspaces (pager);
if (i < 0 || i >= n_spaces)
return NULL;
@@ -429,14 +429,14 @@ wnck_pager_accessible_ref_child (AtkObject *obj,
AtkRegistry *default_registry;
AtkObjectFactory *factory;
WnckWorkspace *wspace;
- WnckWorkspaceAccessible *space_accessible;
+ PagerWnckWorkspaceAccessible *space_accessible;
default_registry = atk_get_default_registry ();
factory = atk_registry_get_factory (default_registry,
WNCK_TYPE_WORKSPACE);
- wspace = _wnck_pager_get_workspace (pager, len);
- space_accessible = WNCK_WORKSPACE_ACCESSIBLE (atk_object_factory_create_accessible (factory,
+ wspace = _pager_wnck_get_workspace (pager, len);
+ space_accessible = XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE (atk_object_factory_create_accessible (factory,
G_OBJECT (wspace)));
atk_object_set_parent (ATK_OBJECT (space_accessible), obj);
@@ -448,18 +448,18 @@ wnck_pager_accessible_ref_child (AtkObject *obj,
ret = g_slist_nth_data (pager_accessible_priv->children, i);
g_object_ref (G_OBJECT (ret));
- wnck_pager_accessible_update_workspace (ret, pager, i);
+ pager_wnck_accessible_update_workspace (ret, pager, i);
return ret;
}
static void
-wnck_pager_accessible_update_workspace (AtkObject *aobj_ws,
- WnckPager *pager,
+pager_wnck_accessible_update_workspace (AtkObject *aobj_ws,
+ PagerWnck *pager,
int i)
{
g_free (aobj_ws->name);
- aobj_ws->name = g_strdup (_wnck_pager_get_workspace_name (pager, i));
+ aobj_ws->name = g_strdup (_pager_wnck_get_workspace_name (pager, i));
g_free (aobj_ws->description);
aobj_ws->description = g_strdup_printf (_("Click this to switch to workspace %s"),
@@ -467,16 +467,16 @@ wnck_pager_accessible_update_workspace (AtkObject *aobj_ws,
aobj_ws->role = ATK_ROLE_UNKNOWN;
}
-static WnckPagerAccessiblePriv*
+static PagerWnckAccessiblePriv*
get_private_data (GObject *gobject)
{
- WnckPagerAccessiblePriv *private_data;
+ PagerWnckAccessiblePriv *private_data;
private_data = g_object_get_qdata (gobject,
quark_private_data);
if (!private_data)
{
- private_data = g_new0 (WnckPagerAccessiblePriv, 1);
+ private_data = g_new0 (PagerWnckAccessiblePriv, 1);
g_object_set_qdata (gobject,
quark_private_data,
private_data);
diff --git a/plugins/pager/pager-wnck-accessible.h b/plugins/pager/pager-wnck-accessible.h
index ef0356a..0aac5b9 100644
--- a/plugins/pager/pager-wnck-accessible.h
+++ b/plugins/pager/pager-wnck-accessible.h
@@ -18,45 +18,45 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef __WNCK_PAGER_ACCESSIBLE_H__
-#define __WNCK_PAGER_ACCESSIBLE_H__
+#ifndef __PAGER_WNCK_ACCESSIBLE_H__
+#define __PAGER_WNCK_ACCESSIBLE_H__
#include <gtk/gtk.h>
#include <atk/atk.h>
-#include "pager.h"
-#include "screen.h"
+#include "pager-wnck.h"
+//#include "screen.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#define WNCK_PAGER_TYPE_ACCESSIBLE (wnck_pager_accessible_get_type ())
-#define WNCK_PAGER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), WNCK_PAGER_TYPE_ACCESSIBLE, WnckPagerAccessible))
-#define WNCK_PAGER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), WNCK_PAGER_TYPE_ACCESSIBLE, WnckPagerAccessibleClass))
-#define WNCK_PAGER_IS_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WNCK_PAGER_TYPE_ACCESSIBLE))
-#define WNCK_PAGER_IS_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), WnckPagerAccessible))
-#define WNCK_PAGER_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), WNCK_PAGER_TYPE_ACCESSIBLE, WnckPagerAccessibleClass))
+#define XFCE_TYPE_PAGER_WNCK_ACCESSIBLE (pager_wnck_accessible_get_type ())
+#define XFCE_PAGER_WNCK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_PAGER_WNCK_ACCESSIBLE, PagerWnckAccessible))
+#define XFCE_PAGER_WNCK_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_PAGER_WNCK_ACCESSIBLE, PagerWnckAccessibleClass))
+#define XFCE_IS_PAGER_WNCK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_PAGER_WNCK_ACCESSIBLE))
+#define XFCE_IS_PAGER_WNCK_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PagerWnckAccessible))
+#define XFCE_PAGER_WNCK_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_PAGER_WNCK_ACCESSIBLE, PagerWnckAccessibleClass))
-typedef struct _WnckPagerAccessible WnckPagerAccessible;
-typedef struct _WnckPagerAccessibleClass WnckPagerAccessibleClass;
+typedef struct _PagerWnckAccessible PagerWnckAccessible;
+typedef struct _PagerWnckAccessibleClass PagerWnckAccessibleClass;
-struct _WnckPagerAccessible
+struct _PagerWnckAccessible
{
GtkAccessible parent;
};
-struct _WnckPagerAccessibleClass
+struct _PagerWnckAccessibleClass
{
GtkAccessibleClass parent_class;
};
-GType wnck_pager_accessible_get_type (void) G_GNUC_CONST;
+GType pager_wnck_accessible_get_type (void) G_GNUC_CONST;
-AtkObject* wnck_pager_accessible_new (GtkWidget *widget);
+AtkObject* pager_wnck_accessible_new (GtkWidget *widget);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* __WNCK_PAGER_ACCESSIBLE_H__ */
+#endif /* __PAGER_WNCK_ACCESSIBLE_H__ */
diff --git a/plugins/pager/pager-wnck-workspace-accessible-factory.c b/plugins/pager/pager-wnck-workspace-accessible-factory.c
index 8722558..0b0599a 100644
--- a/plugins/pager/pager-wnck-workspace-accessible-factory.c
+++ b/plugins/pager/pager-wnck-workspace-accessible-factory.c
@@ -19,46 +19,46 @@
*/
#include <gtk/gtk.h>
-#include "workspace-accessible-factory.h"
-#include "workspace-accessible.h"
+#include "pager-wnck-workspace-accessible-factory.h"
+#include "pager-wnck-workspace-accessible.h"
-G_DEFINE_TYPE (WnckWorkspaceAccessibleFactory,
- wnck_workspace_accessible_factory, ATK_TYPE_OBJECT_FACTORY);
+G_DEFINE_TYPE (PagerWnckWorkspaceAccessibleFactory,
+ pager_wnck_workspace_accessible_factory, ATK_TYPE_OBJECT_FACTORY);
-static AtkObject* wnck_workspace_accessible_factory_create_accessible (GObject *obj);
+static AtkObject* pager_wnck_workspace_accessible_factory_create_accessible (GObject *obj);
-static GType wnck_workspace_accessible_factory_get_accessible_type (void);
+static GType pager_wnck_workspace_accessible_factory_get_accessible_type (void);
static void
-wnck_workspace_accessible_factory_class_init (WnckWorkspaceAccessibleFactoryClass *klass)
+pager_wnck_workspace_accessible_factory_class_init (PagerWnckWorkspaceAccessibleFactoryClass *klass)
{
AtkObjectFactoryClass *class = ATK_OBJECT_FACTORY_CLASS (klass);
- class->create_accessible = wnck_workspace_accessible_factory_create_accessible;
- class->get_accessible_type = wnck_workspace_accessible_factory_get_accessible_type;
+ class->create_accessible = pager_wnck_workspace_accessible_factory_create_accessible;
+ class->get_accessible_type = pager_wnck_workspace_accessible_factory_get_accessible_type;
}
static void
-wnck_workspace_accessible_factory_init (WnckWorkspaceAccessibleFactory *factory)
+pager_wnck_workspace_accessible_factory_init (PagerWnckWorkspaceAccessibleFactory *factory)
{
}
AtkObjectFactory*
-wnck_workspace_accessible_factory_new (void)
+pager_wnck_workspace_accessible_factory_new (void)
{
GObject *factory;
- factory = g_object_new (WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY, NULL);
+ factory = g_object_new (XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY, NULL);
return ATK_OBJECT_FACTORY (factory);
}
static AtkObject*
-wnck_workspace_accessible_factory_create_accessible (GObject *obj)
+pager_wnck_workspace_accessible_factory_create_accessible (GObject *obj)
{
- return wnck_workspace_accessible_new (obj);
+ return pager_wnck_workspace_accessible_new (obj);
}
static GType
-wnck_workspace_accessible_factory_get_accessible_type (void)
+pager_wnck_workspace_accessible_factory_get_accessible_type (void)
{
- return WNCK_WORKSPACE_TYPE_ACCESSIBLE;
+ return XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE;
}
diff --git a/plugins/pager/pager-wnck-workspace-accessible-factory.h b/plugins/pager/pager-wnck-workspace-accessible-factory.h
index c73f660..a888837 100644
--- a/plugins/pager/pager-wnck-workspace-accessible-factory.h
+++ b/plugins/pager/pager-wnck-workspace-accessible-factory.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
-#define __WBCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
+#ifndef __PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
+#define __PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
#include <atk/atk.h>
@@ -27,33 +27,33 @@
extern "C" {
#endif /* __cplusplus */
-#define WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY (wnck_workspace_accessible_factory_get_type())
-#define WNCK_WORKSPACE_ACCESSIBLE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY, WnckWorkspaceAccessibleFactory))
-#define WNCK_WORKSPACE_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY, WnckWorkspaceAccessibleFactoryClass))
-#define WNCK_IS_WORKSPACE_ACCESSIBLE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY))
-#define WNCK_IS_WORKSPACE_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY))
-#define WNCK_WORKSPACE_ACCESSIBLE_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY, WnckWorkspaceAccessibleFactoryClass))
+#define XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY (pager_wnck_workspace_accessible_factory_get_type())
+#define XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY, PagerWnckWorkspaceAccessibleFactory))
+#define XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY, PagerWnckWorkspaceAccessibleFactoryClass))
+#define XFCE_IS_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY))
+#define XFCE_IS_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY))
+#define XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY, PagerWnckWorkspaceAccessibleFactoryClass))
-typedef struct _WnckWorkspaceAccessibleFactory WnckWorkspaceAccessibleFactory;
-typedef struct _WnckWorkspaceAccessibleFactoryClass WnckWorkspaceAccessibleFactoryClass;
+typedef struct _PagerWnckWorkspaceAccessibleFactory PagerWnckWorkspaceAccessibleFactory;
+typedef struct _PagerWnckWorkspaceAccessibleFactoryClass PagerWnckWorkspaceAccessibleFactoryClass;
-struct _WnckWorkspaceAccessibleFactory
+struct _PagerWnckWorkspaceAccessibleFactory
{
AtkObjectFactory parent;
};
-struct _WnckWorkspaceAccessibleFactoryClass
+struct _PagerWnckWorkspaceAccessibleFactoryClass
{
AtkObjectFactoryClass parent_class;
};
-GType wnck_workspace_accessible_factory_get_type (void) G_GNUC_CONST;
+GType pager_wnck_workspace_accessible_factory_get_type (void) G_GNUC_CONST;
-AtkObjectFactory* wnck_workspace_accessible_factory_new (void);
+AtkObjectFactory* pager_wnck_workspace_accessible_factory_new (void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__ */
+#endif /* __PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__ */
diff --git a/plugins/pager/pager-wnck-workspace-accessible.c b/plugins/pager/pager-wnck-workspace-accessible.c
index 8addbff..5823657 100644
--- a/plugins/pager/pager-wnck-workspace-accessible.c
+++ b/plugins/pager/pager-wnck-workspace-accessible.c
@@ -22,33 +22,34 @@
#include <gtk/gtk.h>
#include <errno.h>
#include <unistd.h>
-#include "workspace-accessible.h"
-#include "private.h"
-static void wnck_workspace_accessible_class_init (WnckWorkspaceAccessibleClass *klass);
-static const char* wnck_workspace_accessible_get_name (AtkObject *obj);
-static const char* wnck_workspace_accessible_get_description (AtkObject *obj);
-static int wnck_workspace_accessible_get_index_in_parent (AtkObject *obj);
-static void atk_component_interface_init (AtkComponentIface *iface);
-static void wnck_workspace_accessible_get_extents (AtkComponent *component,
- int *x,
- int *y,
- int *width,
- int *height,
- AtkCoordType coords);
-static void wnck_workspace_accessible_get_position (AtkComponent *component,
- int *x,
- int *y,
- AtkCoordType coords);
-static gboolean wnck_workspace_accessible_contains (AtkComponent *component,
- int x,
- int y,
- AtkCoordType coords);
-static void wnck_workspace_accessible_get_size (AtkComponent *component,
- int *width,
- int *height);
+#include "pager-wnck.h"
+#include "pager-wnck-workspace-accessible.h"
+
+static void pager_wnck_workspace_accessible_class_init (PagerWnckWorkspaceAccessibleClass *klass);
+static const char* pager_wnck_workspace_accessible_get_name (AtkObject *obj);
+static const char* pager_wnck_workspace_accessible_get_description (AtkObject *obj);
+static int pager_wnck_workspace_accessible_get_index_in_parent (AtkObject *obj);
+static void atk_component_interface_init (AtkComponentIface *iface);
+static void pager_wnck_workspace_accessible_get_extents (AtkComponent *component,
+ int *x,
+ int *y,
+ int *width,
+ int *height,
+ AtkCoordType coords);
+static void pager_wnck_workspace_accessible_get_position (AtkComponent *component,
+ int *x,
+ int *y,
+ AtkCoordType coords);
+static gboolean pager_wnck_workspace_accessible_contains (AtkComponent *component,
+ int x,
+ int y,
+ AtkCoordType coords);
+static void pager_wnck_workspace_accessible_get_size (AtkComponent *component,
+ int *width,
+ int *height);
GType
-wnck_workspace_accessible_get_type (void)
+pager_wnck_workspace_accessible_get_type (void)
{
static GType type = 0;
@@ -56,13 +57,13 @@ wnck_workspace_accessible_get_type (void)
{
const GTypeInfo tinfo =
{
- sizeof (WnckWorkspaceAccessibleClass),
+ sizeof (PagerWnckWorkspaceAccessibleClass),
(GBaseInitFunc) NULL, /* base init */
(GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) wnck_workspace_accessible_class_init,
+ (GClassInitFunc) pager_wnck_workspace_accessible_class_init,
(GClassFinalizeFunc) NULL, /* class finalize */
NULL, /* class data */
- sizeof (WnckWorkspaceAccessible), /* instance size*/
+ sizeof (PagerWnckWorkspaceAccessible), /* instance size*/
0, /* nb preallocs */
(GInstanceInitFunc) NULL, /* instance init */
NULL /* value table */
@@ -75,7 +76,7 @@ wnck_workspace_accessible_get_type (void)
NULL
};
- type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE, "WnckWorkspaceAccessible", &tinfo, 0);
+ type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE, "PagerWnckWorkspaceAccessible", &tinfo, 0);
g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
}
return type;
@@ -86,30 +87,30 @@ atk_component_interface_init (AtkComponentIface *iface)
{
g_return_if_fail (iface != NULL);
- iface->get_extents = wnck_workspace_accessible_get_extents;
- iface->get_size = wnck_workspace_accessible_get_size;
- iface->get_position = wnck_workspace_accessible_get_position;
- iface->contains = wnck_workspace_accessible_contains;
+ iface->get_extents = pager_wnck_workspace_accessible_get_extents;
+ iface->get_size = pager_wnck_workspace_accessible_get_size;
+ iface->get_position = pager_wnck_workspace_accessible_get_position;
+ iface->contains = pager_wnck_workspace_accessible_contains;
}
static void
-wnck_workspace_accessible_get_extents (AtkComponent *component,
- int *x,
- int *y,
- int *width,
- int *height,
- AtkCoordType coords)
+pager_wnck_workspace_accessible_get_extents (AtkComponent *component,
+ int *x,
+ int *y,
+ int *width,
+ int *height,
+ AtkCoordType coords)
{
AtkGObjectAccessible *atk_gobj;
WnckWorkspace *workspace;
- WnckPager *pager;
+ PagerWnck *pager;
GdkRectangle rect;
GtkWidget *widget;
AtkObject *parent;
GObject *g_obj;
int px, py;
- g_return_if_fail (WNCK_IS_WORKSPACE_ACCESSIBLE (component));
+ g_return_if_fail (XFCE_IS_PAGER_WNCK_WORKSPACE_ACCESSIBLE (component));
atk_gobj = ATK_GOBJECT_ACCESSIBLE (component);
g_obj = atk_gobject_accessible_get_object (atk_gobj);
@@ -134,14 +135,14 @@ wnck_workspace_accessible_get_extents (AtkComponent *component,
return;
}
- g_return_if_fail (WNCK_IS_PAGER (widget));
- pager = WNCK_PAGER (widget);
+ g_return_if_fail (XFCE_IS_PAGER_WNCK (widget));
+ pager = XFCE_PAGER_WNCK (widget);
- g_return_if_fail (WNCK_IS_PAGER (pager));
+ g_return_if_fail (XFCE_IS_PAGER_WNCK (pager));
atk_component_get_position (ATK_COMPONENT (parent), &px,&py, coords);
- _wnck_pager_get_workspace_rect (pager, WNCK_WORKSPACE_ACCESSIBLE (component)->index, &rect);
+ _pager_wnck_get_workspace_rect (pager, XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE (component)->index, &rect);
*x = rect.x + px;
*y = rect.y + py;
@@ -150,37 +151,37 @@ wnck_workspace_accessible_get_extents (AtkComponent *component,
}
static void
-wnck_workspace_accessible_get_size (AtkComponent *component,
- int *width,
- int *height)
+pager_wnck_workspace_accessible_get_size (AtkComponent *component,
+ int *width,
+ int *height)
{
AtkCoordType coords = ATK_XY_SCREEN;
int x, y;
/* FIXME: Value for initialization of coords picked randomly to please gcc */
- wnck_workspace_accessible_get_extents (component, &x, &y, width, height, coords);
+ pager_wnck_workspace_accessible_get_extents (component, &x, &y, width, height, coords);
}
static void
-wnck_workspace_accessible_get_position (AtkComponent *component,
- int *x,
- int *y,
- AtkCoordType coords)
+pager_wnck_workspace_accessible_get_position (AtkComponent *component,
+ int *x,
+ int *y,
+ AtkCoordType coords)
{
int width, height;
- wnck_workspace_accessible_get_extents (component, x, y, &width, &height, coords);
+ pager_wnck_workspace_accessible_get_extents (component, x, y, &width, &height, coords);
}
static gboolean
-wnck_workspace_accessible_contains (AtkComponent *component,
- int x,
- int y,
- AtkCoordType coords)
+pager_wnck_workspace_accessible_contains (AtkComponent *component,
+ int x,
+ int y,
+ AtkCoordType coords)
{
int lx, ly, width, height;
- wnck_workspace_accessible_get_extents (component, &lx, &ly, &width, &height, coords);
+ pager_wnck_workspace_accessible_get_extents (component, &lx, &ly, &width, &height, coords);
/*
* Check if the specified co-ordinates fall within the workspace.
@@ -192,39 +193,39 @@ wnck_workspace_accessible_contains (AtkComponent *component,
}
static void
-wnck_workspace_accessible_class_init (WnckWorkspaceAccessibleClass *klass)
+pager_wnck_workspace_accessible_class_init (PagerWnckWorkspaceAccessibleClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- class->get_name = wnck_workspace_accessible_get_name;
- class->get_description = wnck_workspace_accessible_get_description;
- class->get_index_in_parent = wnck_workspace_accessible_get_index_in_parent;
+ class->get_name = pager_wnck_workspace_accessible_get_name;
+ class->get_description = pager_wnck_workspace_accessible_get_description;
+ class->get_index_in_parent = pager_wnck_workspace_accessible_get_index_in_parent;
}
AtkObject*
-wnck_workspace_accessible_new (GObject *obj)
+pager_wnck_workspace_accessible_new (GObject *obj)
{
GObject *object;
AtkObject *atk_object;
g_return_val_if_fail (WNCK_IS_WORKSPACE (obj), NULL);
- object = g_object_new (WNCK_WORKSPACE_TYPE_ACCESSIBLE, NULL);
+ object = g_object_new (XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE, NULL);
atk_object = ATK_OBJECT (object);
atk_object_initialize (atk_object, obj);
g_return_val_if_fail (ATK_IS_OBJECT (atk_object), NULL);
- WNCK_WORKSPACE_ACCESSIBLE (atk_object)->index =
+ XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE (atk_object)->index =
wnck_workspace_get_number (WNCK_WORKSPACE (obj));
return atk_object;
}
static const char*
-wnck_workspace_accessible_get_name (AtkObject *obj)
+pager_wnck_workspace_accessible_get_name (AtkObject *obj)
{
- g_return_val_if_fail (WNCK_IS_WORKSPACE_ACCESSIBLE (obj), NULL);
+ g_return_val_if_fail (XFCE_IS_PAGER_WNCK_WORKSPACE_ACCESSIBLE (obj), NULL);
if (obj->name != NULL)
{
@@ -235,9 +236,9 @@ wnck_workspace_accessible_get_name (AtkObject *obj)
}
static const char*
-wnck_workspace_accessible_get_description (AtkObject *obj)
+pager_wnck_workspace_accessible_get_description (AtkObject *obj)
{
- g_return_val_if_fail (WNCK_IS_WORKSPACE_ACCESSIBLE (obj), NULL);
+ g_return_val_if_fail (XFCE_IS_PAGER_WNCK_WORKSPACE_ACCESSIBLE (obj), NULL);
if (obj->description != NULL)
{
@@ -248,9 +249,9 @@ wnck_workspace_accessible_get_description (AtkObject *obj)
}
static gint
-wnck_workspace_accessible_get_index_in_parent (AtkObject *obj)
+pager_wnck_workspace_accessible_get_index_in_parent (AtkObject *obj)
{
- g_return_val_if_fail (WNCK_IS_WORKSPACE_ACCESSIBLE (obj), -1);
+ g_return_val_if_fail (XFCE_IS_PAGER_WNCK_WORKSPACE_ACCESSIBLE (obj), -1);
- return WNCK_WORKSPACE_ACCESSIBLE (obj)->index;
+ return XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE (obj)->index;
}
diff --git a/plugins/pager/pager-wnck-workspace-accessible.h b/plugins/pager/pager-wnck-workspace-accessible.h
index 6aaa6e5..f53b48f 100644
--- a/plugins/pager/pager-wnck-workspace-accessible.h
+++ b/plugins/pager/pager-wnck-workspace-accessible.h
@@ -18,47 +18,47 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef __WNCK_WORKSPACE_ACCESSIBLE_H__
-#define __WNCK_WORKSPACE_ACCESSIBLE_H__
+#ifndef __PAGER_WNCK_WORKSPACE_ACCESSIBLE_H__
+#define __PAGER_WNCK_WORKSPACE_ACCESSIBLE_H__
#include <gtk/gtk.h>
#include <atk/atk.h>
-#include "workspace.h"
-#include "pager-accessible.h"
+//#include "workspace.h"
+#include "pager-wnck-accessible.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#define WNCK_WORKSPACE_TYPE_ACCESSIBLE (wnck_workspace_accessible_get_type ())
-#define WNCK_WORKSPACE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), WNCK_WORKSPACE_TYPE_ACCESSIBLE, WnckWorkspaceAccessible))
-#define WNCK_WORKSPACE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), WNCK_WORKSPACE_TYPE_ACCESSIBLE, WnckWorkspaceAccessibleClass))
-#define WNCK_IS_WORKSPACE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WNCK_WORKSPACE_TYPE_ACCESSIBLE))
-#define WNCK_IS_WORKSPACE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), WnckWorkspaceAccessible))
-#define WNCK_WORKSPACE_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), WNCK_WORKSPACE_TYPE_ACCESSIBLE, WnckWorkspaceAccessibleClass))
+#define XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE (pager_wnck_workspace_accessible_get_type ())
+#define XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE, PagerWnckWorkspaceAccessible))
+#define XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE, PagerWnckWorkspaceAccessibleClass))
+#define XFCE_IS_PAGER_WNCK_WORKSPACE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE))
+#define XFCE_IS_PAGER_WNCK_WORKSPACE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PagerWnckWorkspaceAccessible))
+#define XFCE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE, PagerWnckWorkspaceAccessibleClass))
-typedef struct _WnckWorkspaceAccessible WnckWorkspaceAccessible;
-typedef struct _WnckWorkspaceAccessibleClass WnckWorkspaceAccessibleClass;
+typedef struct _PagerWnckWorkspaceAccessible PagerWnckWorkspaceAccessible;
+typedef struct _PagerWnckWorkspaceAccessibleClass PagerWnckWorkspaceAccessibleClass;
-struct _WnckWorkspaceAccessible
+struct _PagerWnckWorkspaceAccessible
{
AtkGObjectAccessible parent;
int index;
};
-struct _WnckWorkspaceAccessibleClass
+struct _PagerWnckWorkspaceAccessibleClass
{
AtkGObjectAccessibleClass parent_class;
};
-GType wnck_workspace_accessible_get_type (void) G_GNUC_CONST;
+GType pager_wnck_workspace_accessible_get_type (void) G_GNUC_CONST;
-AtkObject* wnck_workspace_accessible_new (GObject *obj);
+AtkObject* pager_wnck_workspace_accessible_new (GObject *obj);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* __WNCK_WORKSPACE_ACCESSIBLE_H__ */
+#endif /* __PAGER_WNCK_WORKSPACE_ACCESSIBLE_H__ */
diff --git a/plugins/pager/pager-wnck.c b/plugins/pager/pager-wnck.c
index ef67f83..1304a35 100644
--- a/plugins/pager/pager-wnck.c
+++ b/plugins/pager/pager-wnck.c
@@ -34,6 +34,8 @@
#include "pager.h"
#include "pager-wnck.h"
+#include "pager-wnck-accessible-factory.h"
+#include "pager-wnck-workspace-accessible-factory.h"
#define PAGER_WNCK_NO_MANAGER_TOKEN 0 /* from wnck xutils.h */
#define PAGER_WNCK_ACTIVATE_TIMEOUT 1000 /* from wnck private.h */
@@ -2819,13 +2821,13 @@ pager_wnck_get_accessible (GtkWidget *widget)
* Specify what factory to use to create accessible
* objects
*/
- /* atk_registry_set_factory_type (registry, */
- /* WNCK_TYPE_PAGER, */
- /* WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY); */
+ atk_registry_set_factory_type (registry,
+ XFCE_TYPE_PAGER_WNCK,
+ XFCE_TYPE_PAGER_WNCK_ACCESSIBLE_FACTORY);
- /* atk_registry_set_factory_type (registry, */
- /* WNCK_TYPE_WORKSPACE, */
- /* WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY); */
+ atk_registry_set_factory_type (registry,
+ WNCK_TYPE_WORKSPACE,
+ XFCE_TYPE_PAGER_WNCK_WORKSPACE_ACCESSIBLE_FACTORY);
}
first_time = FALSE;
}
More information about the Xfce4-commits
mailing list