summaryrefslogtreecommitdiff
path: root/maximus/xutils.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-11-29 04:07:54 -0800
committerStefano Karapetsas <[email protected]>2013-11-29 04:07:54 -0800
commit3418016449e06e42f6d164a6fe9594fbe8adafe8 (patch)
tree5d30f753870030c945ffad8b45b590f0f8325852 /maximus/xutils.c
parentc861b869257e89c1d4872476f3311dd52094a92d (diff)
parent81fb93c89e044fc20cae33523150a11f865daa0a (diff)
downloadmate-netbook-3418016449e06e42f6d164a6fe9594fbe8adafe8.tar.bz2
mate-netbook-3418016449e06e42f6d164a6fe9594fbe8adafe8.tar.xz
Merge pull request #7 from infirit/master
Back to libwnck plus various fixes
Diffstat (limited to 'maximus/xutils.c')
-rw-r--r--maximus/xutils.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/maximus/xutils.c b/maximus/xutils.c
index 4e79569..3ff03bb 100644
--- a/maximus/xutils.c
+++ b/maximus/xutils.c
@@ -25,7 +25,8 @@
#include "xutils.h"
#include <string.h>
#include <stdio.h>
-#include <libmatewnck/libmatewnck.h>
+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
+#include <libwnck/libwnck.h>
#ifdef __GNUC__
#define UNUSED_VARIABLE __attribute__ ((unused))
@@ -34,13 +35,13 @@
#endif
void
-_matewnck_error_trap_push (void)
+_wnck_error_trap_push (void)
{
gdk_error_trap_push ();
}
int
-_matewnck_error_trap_pop (void)
+_wnck_error_trap_pop (void)
{
XSync (gdk_display, False);
return gdk_error_trap_pop ();
@@ -65,14 +66,14 @@ latin1_to_utf8 (const char *latin1)
}
void
-_matewnck_get_wmclass (Window xwindow,
+_wnck_get_wmclass (Window xwindow,
char **res_class,
char **res_name)
{
XClassHint ch;
char UNUSED_VARIABLE *retval;
- _matewnck_error_trap_push ();
+ _wnck_error_trap_push ();
ch.res_name = NULL;
ch.res_class = NULL;
@@ -80,7 +81,7 @@ _matewnck_get_wmclass (Window xwindow,
XGetClassHint (gdk_display, xwindow,
&ch);
- _matewnck_error_trap_pop ();
+ _wnck_error_trap_pop ();
retval = NULL;