summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Snyder <dsnyder@Davids-MacBook-Pro.local>2012-03-11 23:16:56 -0700
committerDavid Snyder <dsnyder@Davids-MacBook-Pro.local>2012-03-11 23:16:56 -0700
commit191f8f8ae98f8b848da9d7bd21a0fd73244669e5 (patch)
treec2d7ec180d7ed16655ea7d04c7680e7a1f8cfd12
parent726f43b9937c5289ef15e4a96ae6773c5c2802a8 (diff)
removed xtoq_free_image
-rw-r--r--src/libcompositewm/xtoq.c5
-rw-r--r--src/libcompositewm/xtoq.h15
2 files changed, 4 insertions, 16 deletions
diff --git a/src/libcompositewm/xtoq.c b/src/libcompositewm/xtoq.c
index f634f7f..0973978 100644
--- a/src/libcompositewm/xtoq.c
+++ b/src/libcompositewm/xtoq.c
@@ -142,11 +142,6 @@ xtoq_get_image(xtoq_context_t *context) {
return xtoq_image;
}
-void
-xtoq_free_image(xcb_image_t *img) {
- free(img);
-}
-
int
xtoq_start_event_loop (xtoq_context_t *context,
xtoq_event_cb_t callback)
diff --git a/src/libcompositewm/xtoq.h b/src/libcompositewm/xtoq.h
index aa550f1..3afeff5 100644
--- a/src/libcompositewm/xtoq.h
+++ b/src/libcompositewm/xtoq.h
@@ -38,7 +38,7 @@
#include <xcb/xtest.h>
#include <xcb/xfixes.h>
#include "data.h"
-#include <xcb/xcb_keysyms.h> //aaron
+#include <xcb/xcb_keysyms.h>
#include "xtoq_internal.h"
/**
@@ -48,7 +48,8 @@ extern xtoq_context_t *root_context;
/**
* Sets up the connection and grabs the root window from the specified screen
- * @param display The display to connect to
+ * @param display the display to connect to
+ * @return The root context which contains the root window
*/
xtoq_context_t *
xtoq_init(char *display);
@@ -75,20 +76,12 @@ test_xtoq_get_image(xtoq_context_t * context);
/**
* free the memory used by an xtoq_image_t created
* during a call to test_xtoq_image_create
+ * @param xtoq_image an image to be freed
*/
void
xtoq_image_destroy(xtoq_image_t * xtoq_image);
/**
- * Free the image returned by xtoq_get_image
- * @param img The xcb_image_t that needs to
- * be freed
- */
-
-void
-xtoq_free_image(xcb_image_t *img);
-
-/**
* Set input focus to the window in context
* @param context The context containing the window
*/