Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/otte/G_TYPE_POINTER' into 'master'

Browse Source 
Get rid of G_TYPE_POINTER

See merge request GNOME/gtk!3900
This commit is contained in:
Benjamin Otte
2021-08-30 03:50:30 +00:00
parent 4f31d3587d e2d321a16a
commit 7404a6fc4f
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkfilechooserprivate.h
View File

@@ -23,7 +23,7 @@
#include "gtkfilesystemmodel.h"
#include "gtkliststore.h"
#include "gtkrecentmanager.h"
#include "gtksearchengine.h"
#include "gtksearchengineprivate.h"
#include "gtkquery.h"
#include "gtksizegroup.h"
#include "gtktreemodelsort.h"

2
gtk/gtkfilesystemmodel.c
View File

@@ -1041,7 +1041,7 @@ _gtk_file_system_model_class_init (GtkFileSystemModelClass *class)
G_STRUCT_OFFSET (GtkFileSystemModelClass, finished_loading),
NULL, NULL,
NULL,
G_TYPE_NONE, 1, G_TYPE_POINTER);
G_TYPE_NONE, 1, G_TYPE_ERROR);
}
static void

4
gtk/gtkpathbar.c
View File

@@ -282,8 +282,8 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class)
NULL, NULL,
_gtk_marshal_VOID__POINTER_POINTER_BOOLEAN,
G_TYPE_NONE, 3,
G_TYPE_POINTER,
G_TYPE_POINTER,
G_TYPE_FILE,
G_TYPE_FILE,
G_TYPE_BOOLEAN);
gtk_widget_class_set_css_name (widget_class, "pathbar");

4
gtk/gtkplacessidebar.c
View File

@@ -4191,7 +4191,7 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class)
_gtk_marshal_INT__OBJECT_OBJECT_POINTER,
GDK_TYPE_DRAG_ACTION, 2,
G_TYPE_OBJECT,
G_TYPE_POINTER /* GSList of GFile */ );
GDK_TYPE_FILE_LIST);
/*
* GtkPlacesSidebar::drag-action-ask:
@@ -4237,7 +4237,7 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class)
_gtk_marshal_VOID__OBJECT_POINTER_INT,
G_TYPE_NONE, 3,
G_TYPE_OBJECT,
G_TYPE_POINTER, /* GSList of GFile */
GDK_TYPE_FILE_LIST,
GDK_TYPE_DRAG_ACTION);
/*

8
gtk/gtksearchengine.c
View File

@@ -20,15 +20,15 @@
*/
#include "config.h"
#include "gtksearchengine.h"
#include "gtksearchenginemodel.h"
#include "gtksearchenginequartz.h"
#include "gtksearchengineprivate.h"
#include "gtksearchenginemodelprivate.h"
#include "gtksearchenginequartzprivate.h"
#include "gtkintl.h"
#include <gdk/gdk.h> /* for GDK_WINDOWING_MACOS */
#if defined(HAVE_TRACKER3)
#include "gtksearchenginetracker3.h"
#include "gtksearchenginetracker3private.h"
#endif
struct _GtkSearchEnginePrivate {

2
gtk/gtksearchenginemodel.c
View File

@@ -23,7 +23,7 @@
#include <gdk/gdk.h>
#include "gtksearchenginemodel.h"
#include "gtksearchenginemodelprivate.h"
#include "gtkprivate.h"
#include <string.h>

2
gtk/gtksearchenginemodel.h → gtk/gtksearchenginemodelprivate.h
View File

@@ -20,7 +20,7 @@
#ifndef __GTK_SEARCH_ENGINE_MODEL_H__
#define __GTK_SEARCH_ENGINE_MODEL_H__
#include "gtksearchengine.h"
#include "gtksearchengineprivate.h"
#include "gtkfilesystemmodel.h"
G_BEGIN_DECLS

0
gtk/gtksearchengine.h → gtk/gtksearchengineprivate.h
View File

2
gtk/gtksearchenginequartz.c
View File

@@ -18,7 +18,7 @@
#include <Cocoa/Cocoa.h>
#include <macos/gdkmacos.h>
#include "gtksearchenginequartz.h"
#include "gtksearchenginequartzprivate.h"
/* This file is a mixture of an objective-C object and a GObject,
* so be careful to not confuse yourself.

2
gtk/gtksearchenginequartz.h → gtk/gtksearchenginequartzprivate.h
View File

@@ -18,7 +18,7 @@
#ifndef __GTK_SEARCH_ENGINE_QUARTZ_H__
#define __GTK_SEARCH_ENGINE_QUARTZ_H__
#include "gtksearchengine.h"
#include "gtksearchengineprivate.h"
G_BEGIN_DECLS

2
gtk/gtksearchenginetracker3.c
View File

@@ -32,7 +32,7 @@
#include <gtk/gtk.h>
#include <libtracker-sparql/tracker-sparql.h>
#include "gtksearchenginetracker3.h"
#include "gtksearchenginetracker3private.h"
#define MINER_FS_BUS_NAME "org.freedesktop.Tracker3.Miner.Files"

2
gtk/gtksearchenginetracker3.h → gtk/gtksearchenginetracker3private.h
View File

@@ -24,7 +24,7 @@
#ifndef __GTK_SEARCH_ENGINE_TRACKER3_H__
#define __GTK_SEARCH_ENGINE_TRACKER3_H__
#include "gtksearchengine.h"
#include "gtksearchengineprivate.h"
G_BEGIN_DECLS