From: Timm Bäder Date: Tue, 10 Sep 2019 11:11:03 +0000 (+0200) Subject: Rename gtkbookmarkmanager.h to gtkbookmarksmanagerprivate.h X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~863 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ce72154913c420f6d002b2ae2bbb8c15a3a8331e;p=gtk4.git Rename gtkbookmarkmanager.h to gtkbookmarksmanagerprivate.h It's a private type, so gets a private header file name. --- diff --git a/gtk/gtkbookmarksmanager.c b/gtk/gtkbookmarksmanager.c index 1acbe16d39..87f1f708a7 100644 --- a/gtk/gtkbookmarksmanager.c +++ b/gtk/gtkbookmarksmanager.c @@ -27,7 +27,7 @@ #include -#include "gtkbookmarksmanager.h" +#include "gtkbookmarksmanagerprivate.h" #include "gtkfilechooser.h" /* for the GError types */ static void diff --git a/gtk/gtkbookmarksmanager.h b/gtk/gtkbookmarksmanager.h deleted file mode 100644 index b876511a98..0000000000 --- a/gtk/gtkbookmarksmanager.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */ -/* GTK - The GIMP Toolkit - * gtkbookmarksmanager.h: Utilities to manage and monitor ~/.gtk-bookmarks - * Copyright (C) 2003, Red Hat, Inc. - * Copyright (C) 2007-2008 Carlos Garnacho - * Copyright (C) 2011 Suse - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, see . - * - * Authors: Federico Mena Quintero - */ - -#ifndef __GTK_BOOKMARKS_MANAGER_H__ -#define __GTK_BOOKMARKS_MANAGER_H__ - -#include - -typedef void (* GtkBookmarksChangedFunc) (gpointer data); - -typedef struct -{ - /* This list contains GtkBookmark structs */ - GSList *bookmarks; - - GFileMonitor *bookmarks_monitor; - gulong bookmarks_monitor_changed_id; - - gpointer changed_func_data; - GtkBookmarksChangedFunc changed_func; -} GtkBookmarksManager; - -typedef struct -{ - GFile *file; - gchar *label; -} GtkBookmark; - -GtkBookmarksManager *_gtk_bookmarks_manager_new (GtkBookmarksChangedFunc changed_func, - gpointer changed_func_data); - - -void _gtk_bookmarks_manager_free (GtkBookmarksManager *manager); - -GSList *_gtk_bookmarks_manager_list_bookmarks (GtkBookmarksManager *manager); - -gboolean _gtk_bookmarks_manager_insert_bookmark (GtkBookmarksManager *manager, - GFile *file, - gint position, - GError **error); - -gboolean _gtk_bookmarks_manager_remove_bookmark (GtkBookmarksManager *manager, - GFile *file, - GError **error); - -gboolean _gtk_bookmarks_manager_reorder_bookmark (GtkBookmarksManager *manager, - GFile *file, - gint new_position, - GError **error); - -gboolean _gtk_bookmarks_manager_has_bookmark (GtkBookmarksManager *manager, - GFile *file); - -gchar * _gtk_bookmarks_manager_get_bookmark_label (GtkBookmarksManager *manager, - GFile *file); - -gboolean _gtk_bookmarks_manager_set_bookmark_label (GtkBookmarksManager *manager, - GFile *file, - const gchar *label, - GError **error); - -gboolean _gtk_bookmarks_manager_get_is_builtin (GtkBookmarksManager *manager, - GFile *file); - -gboolean _gtk_bookmarks_manager_get_is_xdg_dir_builtin (GUserDirectory xdg_type); - -#endif /* __GTK_BOOKMARKS_MANAGER_H__ */ diff --git a/gtk/gtkbookmarksmanagerprivate.h b/gtk/gtkbookmarksmanagerprivate.h new file mode 100644 index 0000000000..b876511a98 --- /dev/null +++ b/gtk/gtkbookmarksmanagerprivate.h @@ -0,0 +1,87 @@ +/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */ +/* GTK - The GIMP Toolkit + * gtkbookmarksmanager.h: Utilities to manage and monitor ~/.gtk-bookmarks + * Copyright (C) 2003, Red Hat, Inc. + * Copyright (C) 2007-2008 Carlos Garnacho + * Copyright (C) 2011 Suse + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . + * + * Authors: Federico Mena Quintero + */ + +#ifndef __GTK_BOOKMARKS_MANAGER_H__ +#define __GTK_BOOKMARKS_MANAGER_H__ + +#include + +typedef void (* GtkBookmarksChangedFunc) (gpointer data); + +typedef struct +{ + /* This list contains GtkBookmark structs */ + GSList *bookmarks; + + GFileMonitor *bookmarks_monitor; + gulong bookmarks_monitor_changed_id; + + gpointer changed_func_data; + GtkBookmarksChangedFunc changed_func; +} GtkBookmarksManager; + +typedef struct +{ + GFile *file; + gchar *label; +} GtkBookmark; + +GtkBookmarksManager *_gtk_bookmarks_manager_new (GtkBookmarksChangedFunc changed_func, + gpointer changed_func_data); + + +void _gtk_bookmarks_manager_free (GtkBookmarksManager *manager); + +GSList *_gtk_bookmarks_manager_list_bookmarks (GtkBookmarksManager *manager); + +gboolean _gtk_bookmarks_manager_insert_bookmark (GtkBookmarksManager *manager, + GFile *file, + gint position, + GError **error); + +gboolean _gtk_bookmarks_manager_remove_bookmark (GtkBookmarksManager *manager, + GFile *file, + GError **error); + +gboolean _gtk_bookmarks_manager_reorder_bookmark (GtkBookmarksManager *manager, + GFile *file, + gint new_position, + GError **error); + +gboolean _gtk_bookmarks_manager_has_bookmark (GtkBookmarksManager *manager, + GFile *file); + +gchar * _gtk_bookmarks_manager_get_bookmark_label (GtkBookmarksManager *manager, + GFile *file); + +gboolean _gtk_bookmarks_manager_set_bookmark_label (GtkBookmarksManager *manager, + GFile *file, + const gchar *label, + GError **error); + +gboolean _gtk_bookmarks_manager_get_is_builtin (GtkBookmarksManager *manager, + GFile *file); + +gboolean _gtk_bookmarks_manager_get_is_xdg_dir_builtin (GUserDirectory xdg_type); + +#endif /* __GTK_BOOKMARKS_MANAGER_H__ */ diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 2197e39615..79bc9801b3 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -30,6 +30,7 @@ #include #include "gtkintl.h" +#include "gtkbookmarksmanagerprivate.h" #include "gtkbutton.h" #include "gtkcelllayout.h" #include "gtkcellrenderertext.h" diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h index 6379e0ab60..fab92fc243 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -19,7 +19,6 @@ #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__ #define __GTK_FILE_CHOOSER_PRIVATE_H__ -#include "gtkbookmarksmanager.h" #include "gtkfilechooser.h" #include "gtkfilesystem.h" #include "gtkfilesystemmodel.h" diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index b229972dad..ea3c0e217e 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -22,6 +22,7 @@ #include "gtkfilechooserwidget.h" #include "gtkfilechooserwidgetprivate.h" +#include "gtkbookmarksmanagerprivate.h" #include "gtkbindings.h" #include "gtkbutton.h" #include "gtkcelllayout.h" diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 64514f5577..6b70746b77 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -33,7 +33,7 @@ #include "gtkplacessidebarprivate.h" #include "gtksidebarrowprivate.h" #include "gdk/gdkkeysyms.h" -#include "gtkbookmarksmanager.h" +#include "gtkbookmarksmanagerprivate.h" #include "gtkcelllayout.h" #include "gtkfilesystem.h" #include "gtkicontheme.h"