X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.h;h=373528e35f730db3ac1cb40c1febe7698d6749fd;hb=3ae58f457bcdfa90b26dad4c9d192f045874ddae;hp=f1ff986eeaf86b6b59b1b9f9061b18a0b9415cc8;hpb=c8565d21d4a5e45bbe67ff7cf268582c0acad72f;p=chaz%2Fopenbox

diff --git a/openbox/mainloop.h b/openbox/mainloop.h
index f1ff986e..373528e3 100644
--- a/openbox/mainloop.h
+++ b/openbox/mainloop.h
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mainloop.h for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,11 +29,9 @@ ObMainLoop *ob_main_loop_new(Display *display);
 void        ob_main_loop_destroy(ObMainLoop *loop);
 
 typedef void (*ObMainLoopXHandler) (const XEvent *e, gpointer data);
-typedef void (*ObMainLoopXDoneHandler) (gpointer data);
 
 void ob_main_loop_x_add(ObMainLoop *loop,
                         ObMainLoopXHandler handler,
-                        ObMainLoopXDoneHandler done_handler,
                         gpointer data,
                         GDestroyNotify notify);
 void ob_main_loop_x_remove(ObMainLoop *loop,
@@ -62,18 +61,14 @@ void ob_main_loop_timeout_add(ObMainLoop *loop,
                               gulong microseconds,
                               GSourceFunc handler,
                               gpointer data,
+                              GEqualFunc cmp,
                               GDestroyNotify notify);
 void ob_main_loop_timeout_remove(ObMainLoop *loop,
                                  GSourceFunc handler);
 void ob_main_loop_timeout_remove_data(ObMainLoop *loop,
                                       GSourceFunc handler,
-                                      gpointer data);
-
-struct _ObAction;
-
-/*! Queues an action, which will be run when there are no more X events
-  to process */
-void ob_main_loop_queue_action(ObMainLoop *loop, struct _ObAction *act);
+                                      gpointer data,
+                                      gboolean cancel_dest);
 
 void ob_main_loop_run(ObMainLoop *loop);
 void ob_main_loop_exit(ObMainLoop *loop);