Commit c5522bc2 authored by Alberts Muktupāvels's avatar Alberts Muktupāvels

remove marshallers, use NULL

Documentation suggests to use NULL.
parent 076db95d
......@@ -102,12 +102,6 @@ clock_appletlibdir = $(pkglibdir)
clock_appletlib_LTLIBRARIES = libclock-applet.la
$(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
clock-marshallers.c: clock-marshallers.list
$(AM_V_GEN)glib-genmarshal --prefix _clock_marshal --header --body --internal $< > $@
clock-marshallers.h: clock-marshallers.list
$(AM_V_GEN)glib-genmarshal --prefix _clock_marshal --header --internal $< > $@
clock_enum_headers = \
$(top_srcdir)/applets/clock/clock-utils.h
......@@ -140,8 +134,6 @@ clock-typebuiltins.h: $(clock_enum_headers)
$(clock_enum_headers) > $@
BUILT_SOURCES = \
clock-marshallers.c \
clock-marshallers.h \
clock-resources.c \
clock-resources.h \
clock-typebuiltins.c \
......@@ -173,7 +165,7 @@ EXTRA_DIST = \
org.gnome.panel.ClockApplet.panel-applet.in.in \
$(ui_FILES) \
clock.gresource.xml \
clock-marshallers.list
$(NULL)
CLEANFILES = \
$(BUILT_SOURCES) \
......
......@@ -209,7 +209,7 @@ calendar_client_class_init (CalendarClientClass *klass)
G_STRUCT_OFFSET (CalendarClientClass, tasks_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE,
0);
......@@ -220,7 +220,7 @@ calendar_client_class_init (CalendarClientClass *klass)
G_STRUCT_OFFSET (CalendarClientClass, tasks_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE,
0);
}
......
......@@ -155,7 +155,7 @@ calendar_sources_class_init (CalendarSourcesClass *klass)
appointment_sources_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE,
0);
......@@ -167,7 +167,7 @@ calendar_sources_class_init (CalendarSourcesClass *klass)
task_sources_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE,
0);
}
......
......@@ -1750,7 +1750,7 @@ calendar_window_class_init (CalendarWindowClass *klass)
G_STRUCT_OFFSET (CalendarWindowClass, edit_locations),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE, 0);
g_object_class_install_property (
......
......@@ -14,7 +14,6 @@
#include "clock-location-tile.h"
#include "clock-location.h"
#include "clock-utils.h"
#include "clock-marshallers.h"
#include "set-timezone.h"
G_DEFINE_TYPE (ClockLocationTile, clock_location_tile, GTK_TYPE_BIN)
......@@ -103,7 +102,7 @@ clock_location_tile_class_init (ClockLocationTileClass *this_class)
G_STRUCT_OFFSET (ClockLocationTileClass, tile_pressed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE, 0);
signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
G_TYPE_FROM_CLASS (g_obj_class),
......@@ -111,7 +110,7 @@ clock_location_tile_class_init (ClockLocationTileClass *this_class)
G_STRUCT_OFFSET (ClockLocationTileClass, need_clock_format),
NULL,
NULL,
_clock_marshal_INT__VOID,
NULL,
G_TYPE_INT, 0);
}
......
......@@ -17,7 +17,6 @@
#include <gio/gio.h>
#include "clock-location.h"
#include "clock-marshallers.h"
#include "set-timezone.h"
#include "system-timezone.h"
......@@ -108,7 +107,7 @@ clock_location_class_init (ClockLocationClass *this_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClockLocationClass, weather_updated),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
NULL,
G_TYPE_NONE, 1, G_TYPE_POINTER);
location_signals[SET_CURRENT] =
......@@ -117,7 +116,7 @@ clock_location_class_init (ClockLocationClass *this_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClockLocationClass, set_current),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE, 0);
g_type_class_add_private (this_class, sizeof (ClockLocationPrivate));
......
......@@ -13,7 +13,6 @@
#include "clock.h"
#include "clock-map.h"
#include "clock-sunpos.h"
#include "clock-marshallers.h"
G_DEFINE_TYPE (ClockMap, clock_map, GTK_TYPE_WIDGET)
......@@ -117,7 +116,7 @@ clock_map_class_init (ClockMapClass *this_class)
G_STRUCT_OFFSET (ClockMapClass, need_locations),
NULL,
NULL,
_clock_marshal_POINTER__VOID,
NULL,
G_TYPE_POINTER, 0);
}
......
POINTER:VOID
VOID:OBJECT,STRING
INT:VOID
......@@ -143,7 +143,7 @@ system_timezone_class_init (SystemTimezoneClass *class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SystemTimezoneClass, changed),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
NULL,
G_TYPE_NONE, 1, G_TYPE_STRING);
g_type_class_add_private (class, sizeof (SystemTimezonePrivate));
......
......@@ -81,7 +81,6 @@ IT_PROG_INTLTOOL([0.40.6])
AC_PROG_CC
AM_PATH_PYTHON
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
......
......@@ -49,7 +49,6 @@ IGNORE_HFILES = \
panel-applet-bindings.h \
panel-applet-enums.h \
panel-applet-factory.h \
panel-applet-marshal.h \
panel-applet-private.h \
$(NULL)
......
......@@ -140,7 +140,6 @@ gnome_panel_LDFLAGS = \
gnome_desktop_item_edit_SOURCES = \
gnome-desktop-item-edit.c \
panel-ditem-editor.c \
panel-marshal.c \
panel-util.c \
xstuff.c
......@@ -170,13 +169,6 @@ panel_enum_headers = \
$(top_srcdir)/gnome-panel/panel-enums-gsettings.h \
$(top_srcdir)/gnome-panel/panel-types.h
panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
panel-marshal.c: panel-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN)echo "#include \"panel-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=panel_marshal >> $@
panel-typebuiltins.c: $(panel_enum_headers)
$(AM_V_GEN)glib-mkenums \
--fhead "#include \"panel-typebuiltins.h\"\n\n" \
......@@ -210,8 +202,6 @@ BUILT_SOURCES = \
panel-typebuiltins.h \
panel-resources.c \
panel-resources.h \
panel-marshal.c \
panel-marshal.h \
$(NULL)
ui_FILES = \
......@@ -238,7 +228,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(ui_FILES) \
panel.gresource.xml \
panel-marshal.list \
wanda_no_sea.png \
$(desktop_in_in_files) \
$(NULL)
......
......@@ -11,7 +11,6 @@
#include "panel-widget.h"
#include "panel-types.h"
#include "panel-util.h"
#include "panel-marshal.h"
#include "panel-typebuiltins.h"
#include "panel-globals.h"
......
......@@ -23,7 +23,6 @@
#include <panel-applets-manager.h>
#include "panel-applet-container.h"
#include "panel-marshal.h"
struct _PanelAppletContainerPrivate {
GDBusProxy *applet_proxy;
......@@ -164,7 +163,7 @@ panel_applet_container_class_init (PanelAppletContainerClass *klass)
G_STRUCT_OFFSET (PanelAppletContainerClass, applet_move),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE,
0);
signals[APPLET_REMOVE] =
......@@ -174,7 +173,7 @@ panel_applet_container_class_init (PanelAppletContainerClass *klass)
G_STRUCT_OFFSET (PanelAppletContainerClass, applet_remove),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE,
0);
signals[CHILD_PROPERTY_CHANGED] =
......@@ -185,7 +184,7 @@ panel_applet_container_class_init (PanelAppletContainerClass *klass)
G_STRUCT_OFFSET (PanelAppletContainerClass, child_property_changed),
NULL,
NULL,
panel_marshal_VOID__STRING_POINTER,
NULL,
G_TYPE_NONE, 2,
G_TYPE_STRING,
G_TYPE_POINTER);
......
......@@ -200,7 +200,7 @@ panel_icon_chooser_class_init (PanelIconChooserClass *class)
changed),
NULL,
NULL,
g_cclosure_marshal_VOID__STRING,
NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
......
......@@ -35,7 +35,6 @@
#include "panel-bindings.h"
#include "panel.h"
#include "applet.h"
#include "panel-marshal.h"
#include "panel-layout.h"
#include "panel-lockdown.h"
#include "panel-object-loader.h"
......@@ -483,7 +482,7 @@ panel_applet_frame_class_init (PanelAppletFrameClass *klass)
g_signal_new ("move_focus_out_of_applet",
G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (PanelAppletFrameClass, move_focus_out_of_applet),
NULL, NULL, g_cclosure_marshal_VOID__ENUM,
NULL, NULL, NULL,
G_TYPE_NONE, 1, GTK_TYPE_DIRECTION_TYPE);
binding_set = gtk_binding_set_by_class (gobject_class);
......
......@@ -36,7 +36,6 @@
#include "panel-ditem-editor.h"
#include "panel-icon-names.h"
#include "panel-util.h"
#include "panel-marshal.h"
struct _PanelDItemEditorPrivate
{
......@@ -387,7 +386,7 @@ panel_ditem_editor_class_init (PanelDItemEditorClass *class)
changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE, 0);
ditem_edit_signals[CHANGED] =
......@@ -398,7 +397,7 @@ panel_ditem_editor_class_init (PanelDItemEditorClass *class)
changed),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE, 0);
ditem_edit_signals[NAME_CHANGED] =
......@@ -409,7 +408,7 @@ panel_ditem_editor_class_init (PanelDItemEditorClass *class)
name_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__STRING,
NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
......@@ -421,7 +420,7 @@ panel_ditem_editor_class_init (PanelDItemEditorClass *class)
command_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__STRING,
NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
......@@ -433,7 +432,7 @@ panel_ditem_editor_class_init (PanelDItemEditorClass *class)
comment_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__STRING,
NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
......@@ -445,7 +444,7 @@ panel_ditem_editor_class_init (PanelDItemEditorClass *class)
icon_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__STRING,
NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
......@@ -457,7 +456,7 @@ panel_ditem_editor_class_init (PanelDItemEditorClass *class)
error_reported),
NULL,
NULL,
panel_marshal_VOID__STRING_STRING,
NULL,
G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING);
......
BOOLEAN:VOID
VOID:STRING,STRING
VOID:STRING,POINTER
......@@ -41,7 +41,6 @@
#include "panel-multiscreen.h"
#include "panel-a11y.h"
#include "panel-typebuiltins.h"
#include "panel-marshal.h"
#include "panel-widget.h"
#include "panel-bindings.h"
#include "panel-struts.h"
......@@ -3873,7 +3872,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
G_STRUCT_OFFSET (PanelToplevelClass, hiding),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE,
0);
......@@ -3884,7 +3883,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
G_STRUCT_OFFSET (PanelToplevelClass, unhiding),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE,
0);
......@@ -3895,7 +3894,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
G_STRUCT_OFFSET (PanelToplevelClass, popup_panel_menu),
NULL,
NULL,
panel_marshal_BOOLEAN__VOID,
NULL,
G_TYPE_BOOLEAN,
0);
......@@ -3906,7 +3905,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
G_STRUCT_OFFSET (PanelToplevelClass, toggle_expand),
NULL,
NULL,
panel_marshal_BOOLEAN__VOID,
NULL,
G_TYPE_BOOLEAN,
0);
......@@ -3917,7 +3916,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
G_STRUCT_OFFSET (PanelToplevelClass, expand),
NULL,
NULL,
panel_marshal_BOOLEAN__VOID,
NULL,
G_TYPE_BOOLEAN,
0);
......@@ -3928,7 +3927,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
G_STRUCT_OFFSET (PanelToplevelClass, unexpand),
NULL,
NULL,
panel_marshal_BOOLEAN__VOID,
NULL,
G_TYPE_BOOLEAN,
0);
......@@ -3939,7 +3938,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
G_STRUCT_OFFSET (PanelToplevelClass, toggle_hidden),
NULL,
NULL,
panel_marshal_BOOLEAN__VOID,
NULL,
G_TYPE_BOOLEAN,
0);
......@@ -3950,7 +3949,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
G_STRUCT_OFFSET (PanelToplevelClass, begin_move),
NULL,
NULL,
panel_marshal_BOOLEAN__VOID,
NULL,
G_TYPE_BOOLEAN,
0);
......@@ -3961,7 +3960,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
G_STRUCT_OFFSET (PanelToplevelClass, begin_resize),
NULL,
NULL,
panel_marshal_BOOLEAN__VOID,
NULL,
G_TYPE_BOOLEAN,
0);
......
......@@ -21,7 +21,6 @@
#include "panel.h"
#include "panel-bindings.h"
#include "panel-util.h"
#include "panel-marshal.h"
#include "panel-typebuiltins.h"
#include "panel-applet-frame.h"
#include "panel-globals.h"
......@@ -275,7 +274,7 @@ panel_widget_class_init (PanelWidgetClass *class)
G_STRUCT_OFFSET (PanelWidgetClass, applet_move),
NULL,
NULL,
g_cclosure_marshal_VOID__POINTER,
NULL,
G_TYPE_NONE,
1,
G_TYPE_POINTER);
......@@ -287,7 +286,7 @@ panel_widget_class_init (PanelWidgetClass *class)
G_STRUCT_OFFSET (PanelWidgetClass, applet_added),
NULL,
NULL,
g_cclosure_marshal_VOID__POINTER,
NULL,
G_TYPE_NONE,
1,
G_TYPE_POINTER);
......@@ -299,7 +298,7 @@ panel_widget_class_init (PanelWidgetClass *class)
G_STRUCT_OFFSET (PanelWidgetClass, applet_removed),
NULL,
NULL,
g_cclosure_marshal_VOID__POINTER,
NULL,
G_TYPE_NONE,
1,
G_TYPE_POINTER);
......@@ -311,7 +310,7 @@ panel_widget_class_init (PanelWidgetClass *class)
G_STRUCT_OFFSET (PanelWidgetClass, push_move),
NULL,
NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE,
1,
GTK_TYPE_DIRECTION_TYPE);
......@@ -323,7 +322,7 @@ panel_widget_class_init (PanelWidgetClass *class)
G_STRUCT_OFFSET (PanelWidgetClass, switch_move),
NULL,
NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE,
1,
GTK_TYPE_DIRECTION_TYPE);
......@@ -335,7 +334,7 @@ panel_widget_class_init (PanelWidgetClass *class)
G_STRUCT_OFFSET (PanelWidgetClass, tab_move),
NULL,
NULL,
g_cclosure_marshal_VOID__BOOLEAN,
NULL,
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
......@@ -347,7 +346,7 @@ panel_widget_class_init (PanelWidgetClass *class)
G_STRUCT_OFFSET (PanelWidgetClass, end_move),
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
NULL,
G_TYPE_NONE,
0);
......
......@@ -36,13 +36,6 @@ libpanel_applet_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(NULL)
panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
panel-applet-marshal.c: panel-applet-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN)echo "#include \"panel-applet-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=panel_applet_marshal >> $@
panel_applet_enum_headers = $(top_srcdir)/libpanel-applet/panel-applet.h
panel-applet-enums.c: $(panel_applet_enum_headers)
......@@ -76,14 +69,12 @@ panel-applet-enums.h: $(panel_applet_enum_headers)
BUILT_SOURCES = \
panel-applet-enums.c \
panel-applet-enums.h \
panel-applet-marshal.c \
panel-applet-marshal.h
$(NULL)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpanel-applet.pc
EXTRA_DIST = \
panel-applet-marshal.list \
libpanel-applet.pc.in
CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
......
......@@ -37,7 +37,6 @@
#include "panel-applet-private.h"
#include "panel-applet-bindings.h"
#include "panel-applet-factory.h"
#include "panel-applet-marshal.h"
#include "panel-applet-enums.h"
/**
......@@ -1187,8 +1186,7 @@ panel_applet_set_property (GObject *object,
* panel_applet_constructed() with a proper message if this is
* the case. */
if (applet->priv->closure)
g_closure_set_marshal (applet->priv->closure,
panel_applet_marshal_BOOLEAN__STRING);
g_closure_set_marshal (applet->priv->closure, g_cclosure_marshal_generic);
break;
case PROP_CONNECTION:
applet->priv->connection = g_value_dup_object (value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment