projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Rework kdbus core files
[platform/upstream/glib.git]
/
gio
/
gpollfilemonitor.c
diff --git
a/gio/gpollfilemonitor.c
b/gio/gpollfilemonitor.c
index
f6e853a
..
10c2d86
100644
(file)
--- a/
gio/gpollfilemonitor.c
+++ b/
gio/gpollfilemonitor.c
@@
-13,20
+13,19
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
-#include
<config.h>
+#include
"config.h"
#include <string.h>
#include "gpollfilemonitor.h"
#include <string.h>
#include "gpollfilemonitor.h"
+#include "gfile.h"
#include "gfilemonitor.h"
#include "gfilemonitor.h"
+#include "gfileinfo.h"
-#include "gioalias.h"
static gboolean g_poll_file_monitor_cancel (GFileMonitor* monitor);
static void schedule_poll_timeout (GPollFileMonitor* poll_monitor);
static gboolean g_poll_file_monitor_cancel (GFileMonitor* monitor);
static void schedule_poll_timeout (GPollFileMonitor* poll_monitor);
@@
-41,6
+40,7
@@
struct _GPollFileMonitor
#define POLL_TIME_SECS 5
#define POLL_TIME_SECS 5
+#define g_poll_file_monitor_get_type _g_poll_file_monitor_get_type
G_DEFINE_TYPE (GPollFileMonitor, g_poll_file_monitor, G_TYPE_FILE_MONITOR)
static void
G_DEFINE_TYPE (GPollFileMonitor, g_poll_file_monitor, G_TYPE_FILE_MONITOR)
static void
@@
-52,8
+52,7
@@
g_poll_file_monitor_finalize (GObject* object)
g_object_unref (poll_monitor->file);
g_object_unref (poll_monitor->file);
- if (G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize)
- (*G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize) (object);
+ G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize (object);
}
}
@@
-74,7
+73,8
@@
g_poll_file_monitor_init (GPollFileMonitor* poll_monitor)
}
static int
}
static int
-safe_strcmp (const char *a, const char *b)
+safe_strcmp (const char *a,
+ const char *b)
{
if (a == NULL && b == NULL)
return 0;
{
if (a == NULL && b == NULL)
return 0;
@@
-111,9
+111,9
@@
calc_event_type (GFileInfo *last,
}
static void
}
static void
-got_new_info (GObject *source_object,
- GAsyncResult *res,
-
gpointer
user_data)
+got_new_info (GObject
*source_object,
+
GAsyncResult *res,
+
gpointer
user_data)
{
GPollFileMonitor* poll_monitor = user_data;
GFileInfo *info;
{
GPollFileMonitor* poll_monitor = user_data;
GFileInfo *info;
@@
-162,10
+162,10
@@
poll_file_timeout (gpointer data)
poll_monitor->timeout = FALSE;
poll_monitor->timeout = FALSE;
- g_file_query_info_async (poll_monitor->file, G_FILE_ATTRIBUTE_ETAG_VALUE "," G_FILE_ATTRIBUTE_STD_SIZE,
+ g_file_query_info_async (poll_monitor->file, G_FILE_ATTRIBUTE_ETAG_VALUE "," G_FILE_ATTRIBUTE_ST
ANDAR
D_SIZE,
0, 0, NULL, got_new_info, g_object_ref (poll_monitor));
0, 0, NULL, got_new_info, g_object_ref (poll_monitor));
- return
FALS
E;
+ return
G_SOURCE_REMOV
E;
}
static void
}
static void
@@
-175,9
+175,9
@@
schedule_poll_timeout (GPollFileMonitor* poll_monitor)
}
static void
}
static void
-got_initial_info (GObject *source_object,
- GAsyncResult *res,
-
gpointer
user_data)
+got_initial_info (GObject
*source_object,
+
GAsyncResult *res,
+
gpointer
user_data)
{
GPollFileMonitor* poll_monitor = user_data;
GFileInfo *info;
{
GPollFileMonitor* poll_monitor = user_data;
GFileInfo *info;
@@
-201,7
+201,7
@@
got_initial_info (GObject *source_object,
* Returns: a new #GFileMonitor for the given #GFile.
**/
GFileMonitor*
* Returns: a new #GFileMonitor for the given #GFile.
**/
GFileMonitor*
-g_poll_file_monitor_new (GFile *file)
+
_
g_poll_file_monitor_new (GFile *file)
{
GPollFileMonitor* poll_monitor;
{
GPollFileMonitor* poll_monitor;
@@
-209,7
+209,7
@@
g_poll_file_monitor_new (GFile *file)
poll_monitor->file = g_object_ref (file);
poll_monitor->file = g_object_ref (file);
- g_file_query_info_async (file, G_FILE_ATTRIBUTE_ETAG_VALUE "," G_FILE_ATTRIBUTE_STD_SIZE,
+ g_file_query_info_async (file, G_FILE_ATTRIBUTE_ETAG_VALUE "," G_FILE_ATTRIBUTE_ST
ANDAR
D_SIZE,
0, 0, NULL, got_initial_info, g_object_ref (poll_monitor));
return G_FILE_MONITOR (poll_monitor);
0, 0, NULL, got_initial_info, g_object_ref (poll_monitor));
return G_FILE_MONITOR (poll_monitor);