aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-12-23 12:51:23 -0200
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-12-23 12:51:23 -0200
commitdfa0e9d779a1f341937251eaebffe1c720120cfe (patch)
tree77f36ec2cb0720a4e696f59059ba2081baae7e7e /src
parent7933c506c9d2a52fb38ffc5f09bf92c8eea7ca06 (diff)
get rid of glib-helpers.h
The only definition there is a macro. Such macro exists already at glib, and we don't really need it, as it is used only on two places, and the definition we use is trivial. So, just get rid of it for good. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/Makefile.in1
-rw-r--r--src/camorama-window.c6
-rw-r--r--src/glib-helpers.h38
4 files changed, 3 insertions, 43 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e4f169..6037764 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,6 @@ camorama_SOURCES = \
camorama-window.c \
camorama-window.h \
filter.c \
- glib-helpers.h \
main.c \
support.c \
v4l.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 0669aab..6ccf327 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -322,7 +322,6 @@ camorama_SOURCES = \
camorama-window.c \
camorama-window.h \
filter.c \
- glib-helpers.h \
main.c \
support.c \
v4l.c \
diff --git a/src/camorama-window.c b/src/camorama-window.c
index 2a28fae..07261b7 100644
--- a/src/camorama-window.c
+++ b/src/camorama-window.c
@@ -28,12 +28,12 @@
# include <config.h>
#endif
+#include <glib.h>
#include <glib/gi18n.h>
#include "callbacks.h"
#include "camorama-filter-chain.h"
#include "camorama-globals.h"
#include "filter.h"
-#include "glib-helpers.h"
#include "support.h"
static GQuark menu_item_filter_type = 0;
@@ -77,8 +77,8 @@ static void delete_filter_clicked(GtkTreeSelection *sel,
GList *paths = gtk_tree_selection_get_selected_rows(sel, &model);
struct weak_target target = { model, NULL };
- g_list_foreach(paths, G_FUNC(reference_path), &target);
- g_list_foreach(target.list, G_FUNC(delete_filter), model);
+ g_list_foreach(paths, (GFunc)(reference_path), &target);
+ g_list_foreach(target.list, (GFunc)(delete_filter), model);
g_list_free_full(target.list,
(GDestroyNotify) gtk_tree_row_reference_free);
g_list_free_full(paths, (GDestroyNotify) gtk_tree_path_free);
diff --git a/src/glib-helpers.h b/src/glib-helpers.h
deleted file mode 100644
index 3894b4c..0000000
--- a/src/glib-helpers.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* this file is part of criawips, a gnome presentation application
- *
- * AUTHORS
- * Sven Herzberg <herzi@gnome-de.org>
- *
- * Copyright (C) 2005 Sven Herzberg
- *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef GLIB_HELPERS_H
-#define GLIB_HELPERS_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#undef G_FUNC
-#undef G_SOURCE_FUNC
-#define G_FUNC(func) ((GFunc)(func))
-#define G_SOURCE_FUNC(func) ((GSourceFunc)(func))
-
-G_END_DECLS
-
-#endif /* GLIB_HELPERS_H */

Privacy Policy