qulogic/libgnt

Merge with release-2.x.y.

2019-05-19, Elliott Sales de Andrade
2b331e084d56
Merge with release-2.x.y.
--- a/ChangeLog Tue May 14 05:01:28 2019 -0400
+++ b/ChangeLog Sun May 19 02:37:51 2019 -0400
@@ -6,6 +6,9 @@
version 3.0.0 (????/??/??):
* Fix a use after free when using Python. (PR #357 kdex)
+version 2.14.0 (????/??/??):
+ ...
+
version 2.13.0 (2018/03/08):
* Fixed build against curses 6.0 with opaque structs set. (#16764 dimstar)
(PR #268 Daniel Kamil Kozar)
--- a/doc/libgnt-docs.xml Tue May 14 05:01:28 2019 -0400
+++ b/doc/libgnt-docs.xml Sun May 19 02:37:51 2019 -0400
@@ -111,9 +111,17 @@
<title>Index of new symbols in 2.8.0</title>
<xi:include href="xml/api-index-2.8.0.xml"><xi:fallback /></xi:include>
</index>
- <index id="api-2.7.2">
- <title>Index of new symbols in 2.7.2</title>
- <xi:include href="xml/api-index-2.7.2.xml"><xi:fallback /></xi:include>
+ <index id="api-2.7.3">
+ <title>Index of new symbols in 2.7.3</title>
+ <xi:include href="xml/api-index-2.7.3.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-2.6.0">
+ <title>Index of new symbols in 2.6.0</title>
+ <xi:include href="xml/api-index-2.6.0.xml"><xi:fallback /></xi:include>
+ </index>
+ <index id="api-2.4.2">
+ <title>Index of new symbols in 2.4.2</title>
+ <xi:include href="xml/api-index-2.4.2.xml"><xi:fallback /></xi:include>
</index>
<index id="api-2.4.0">
<title>Index of new symbols in 2.4.0</title>
@@ -127,14 +135,14 @@
<title>Index of new symbols in 2.2.0</title>
<xi:include href="xml/api-index-2.2.0.xml"><xi:fallback /></xi:include>
</index>
+ <index id="api-2.1.1">
+ <title>Index of new symbols in 2.1.1</title>
+ <xi:include href="xml/api-index-2.1.1.xml"><xi:fallback /></xi:include>
+ </index>
<index id="api-2.1.0">
<title>Index of new symbols in 2.1.0</title>
<xi:include href="xml/api-index-2.1.0.xml"><xi:fallback /></xi:include>
</index>
- <index id="api-2.0.0">
- <title>Index of new symbols in 2.0.0</title>
- <xi:include href="xml/api-index-2.0.0.xml"><xi:fallback /></xi:include>
- </index>
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
</part>
</book>
--- a/gnt.h.in Tue May 14 05:01:28 2019 -0400
+++ b/gnt.h.in Sun May 19 02:37:51 2019 -0400
@@ -85,7 +85,7 @@
* Present a window. If the event was triggered because of user interaction,
* the window is moved to the foreground. Otherwise, the Urgent hint is set.
*
- * Since: 2.0.0
+ * Since: 2.1.0
*/
void gnt_window_present(GntWidget *window);
--- a/gntbindable.h Tue May 14 05:01:28 2019 -0400
+++ b/gntbindable.h Sun May 19 02:37:51 2019 -0400
@@ -68,8 +68,20 @@
typedef gboolean (*GntBindableActionCallback) (GntBindable *bindable, GList *params);
typedef gboolean (*GntBindableActionCallbackNoParam)(GntBindable *bindable);
+#ifndef GNT_DISABLE_DEPRECATED
+/**
+ * GntBindableAction:
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail.
+ */
typedef struct _GntBindableAction GntBindableAction;
+/**
+ * GntBindableActionParam:
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail.
+ */
typedef struct _GntBindableActionParam GntBindableActionParam;
+#endif
struct _GntBindableAction
{
@@ -86,6 +98,7 @@
GList *list;
};
+#ifndef GNT_DISABLE_DEPRECATED
/*GntBindableAction *gnt_bindable_action_parse(const char *name);*/
/**
@@ -93,6 +106,8 @@
* @action: The bindable action.
*
* Free a bindable action.
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail.
*/
void gnt_bindable_action_free(GntBindableAction *action);
@@ -101,8 +116,11 @@
* @param: The GntBindableActionParam to free.
*
* Free a GntBindableActionParam.
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail.
*/
void gnt_bindable_action_param_free(GntBindableActionParam *param);
+#endif
/**
* gnt_bindable_class_register_action:
@@ -145,6 +163,8 @@
* Discover if a key is bound.
*
* Returns: %TRUE if the the key has an action associated with it.
+ *
+ * Since: 2.4.2
*/
gboolean gnt_bindable_check_key(GntBindable *bindable, const char *keys);
@@ -166,6 +186,8 @@
* Returns a GntTree populated with "key" -> "binding" for the widget.
*
* Returns: (transfer full): The GntTree.
+ *
+ * Since: 2.1.1
*/
GntBindable * gnt_bindable_bindings_view(GntBindable *bind);
@@ -177,6 +199,8 @@
* From this window a user can select a listing to rebind a new key for the given action.
*
* Returns: %TRUE
+ *
+ * Since: 2.1.1
*/
gboolean gnt_bindable_build_help_window(GntBindable *bindable);
--- a/gntentry.c Tue May 14 05:01:28 2019 -0400
+++ b/gntentry.c Sun May 19 02:37:51 2019 -0400
@@ -1080,6 +1080,11 @@
NULL, NULL, NULL,
G_TYPE_NONE, 0);
+ /**
+ * GntEntry::completion:
+ *
+ * Since: 2.1.0
+ */
signals[SIG_COMPLETION] =
g_signal_new("completion",
G_TYPE_FROM_CLASS(klass),
--- a/gntfilesel.c Tue May 14 05:01:28 2019 -0400
+++ b/gntfilesel.c Sun May 19 02:37:51 2019 -0400
@@ -546,7 +546,7 @@
widget_class->size_request = gnt_file_sel_size_request;
/**
- * GntFileSel::file-selected
+ * GntFileSel::file-selected:
* @widget: The file selection window that received the signal
* @path: The full path to the selected file
* @file: The name of the file only
@@ -554,6 +554,7 @@
* The ::file-selected signal is emitted when the Select button or the
* file tree on a #GntFileSel is activated.
*
+ * Since: 2.1.0
*/
signals[SIG_FILE_SELECTED] =
g_signal_new("file_selected",
@@ -564,7 +565,7 @@
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
/**
- * GntFileSel::cancelled
+ * GntFileSel::cancelled:
* @widget: The file selection window that received the signal
*
* The ::cancelled signal is emitted when the Cancel button on a
--- a/gntfilesel.h Tue May 14 05:01:28 2019 -0400
+++ b/gntfilesel.h Sun May 19 02:37:51 2019 -0400
@@ -37,12 +37,25 @@
#define GNT_TYPE_FILE_SEL gnt_file_sel_get_type()
#define GNT_TYPE_FILE gnt_file_get_type()
+#ifndef GNT_DISABLE_DEPRECATED
+/**
+ * GntFileType:
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail. Use #GFile
+ * from GIO for a similar abstraction.
+ */
typedef enum
{
GNT_FILE_REGULAR,
GNT_FILE_DIR
} GntFileType;
+/**
+ * GntFile:
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail. Use #GFile
+ * from GIO for a similar abstraction.
+ */
typedef struct
{
char *fullpath;
@@ -50,6 +63,7 @@
GntFileType type;
unsigned long size;
} GntFile;
+#endif
G_BEGIN_DECLS
@@ -75,12 +89,16 @@
void (*gnt_reserved4)(void);
};
+#ifndef GNT_DISABLE_DEPRECATED
/**
* gnt_file_get_type:
*
* Returns: The #GType for the #GntFile boxed structure.
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail.
*/
GType gnt_file_get_type(void);
+#endif
/**
* gnt_file_sel_new:
@@ -183,12 +201,15 @@
*/
void gnt_file_sel_set_suggested_filename(GntFileSel *sel, const char *suggest);
+#ifndef GNT_DISABLE_DEPRECATED
/**
* gnt_file_sel_set_read_fn:
* @sel: The file selector.
* @read_fn: The custom read function.
*
* Set custom functions to read the names of files.
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail.
*/
void gnt_file_sel_set_read_fn(GntFileSel *sel, gboolean (*read_fn)(const char *path, GList **files, GError **error));
@@ -200,6 +221,8 @@
* Create a new GntFile.
*
* Returns: The newly created GntFile.
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail.
*/
GntFile* gnt_file_new(const char *name, unsigned long size);
@@ -210,8 +233,11 @@
* Create a new GntFile for a directory.
*
* Returns: The newly created GntFile.
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail.
*/
GntFile* gnt_file_new_dir(const char *name);
+#endif
G_END_DECLS
--- a/gntinternal.h Tue May 14 05:01:28 2019 -0400
+++ b/gntinternal.h Sun May 19 02:37:51 2019 -0400
@@ -35,14 +35,6 @@
# define gnt_warning g_warning
#endif
-#ifndef G_GNUC_NULL_TERMINATED
-# if defined(__GNUC__) && __GNUC__ >= 4
-# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-# else
-# define G_GNUC_NULL_TERMINATED
-# endif
-#endif
-
extern int gnt_need_conversation_to_locale;
extern const char *C_(const char *x);
const gchar *gnt_get_config_dir(void);
--- a/gntprogressbar.h Tue May 14 05:01:28 2019 -0400
+++ b/gntprogressbar.h Sun May 19 02:37:51 2019 -0400
@@ -50,6 +50,8 @@
* Get the #GType for GntProgressBar
*
* Returns: The GType for GntProrgressBar
+ *
+ * Since: 2.6.0
*/
G_DECLARE_FINAL_TYPE(GntProgressBar, gnt_progress_bar, GNT, PROGRESS_BAR,
GntWidget)
@@ -60,6 +62,8 @@
* Create a new GntProgressBar
*
* Returns: The new GntProgressBar
+ *
+ * Since: 2.6.0
*/
GntWidget *
gnt_progress_bar_new (void);
@@ -70,6 +74,8 @@
* @fraction: The value between 0 and 1 to display
*
* Set the progress for a progress bar
+ *
+ * Since: 2.6.0
*/
void
gnt_progress_bar_set_fraction (GntProgressBar *pbar, gdouble fraction);
@@ -80,6 +86,8 @@
* @orientation: The orientation to use
*
* Set the orientation for a progress bar
+ *
+ * Since: 2.6.0
*/
void
gnt_progress_bar_set_orientation (GntProgressBar *pbar, GntProgressBarOrientation orientation);
@@ -90,6 +98,8 @@
* @show: A boolean indicating if the value is shown
*
* Controls whether the progress value is shown
+ *
+ * Since: 2.6.0
*/
void
gnt_progress_bar_set_show_progress (GntProgressBar *pbar, gboolean show);
@@ -101,6 +111,8 @@
* Get the progress that is displayed
*
* Returns: The progress displayed as a value between 0 and 1
+ *
+ * Since: 2.6.0
*/
gdouble
gnt_progress_bar_get_fraction (GntProgressBar *pbar);
@@ -112,6 +124,8 @@
* Get the orientation for the progress bar
*
* Returns: The current orientation of the progress bar
+ *
+ * Since: 2.6.0
*/
GntProgressBarOrientation
gnt_progress_bar_get_orientation (GntProgressBar *pbar);
@@ -123,6 +137,8 @@
* Get a boolean describing if the progress value is shown
*
* Returns: %TRUE if the progress value is shown, %FALSE otherwise.
+ *
+ * Since: 2.6.0
*/
gboolean
gnt_progress_bar_get_show_progress (GntProgressBar *pbar);
--- a/gntslider.h Tue May 14 05:01:28 2019 -0400
+++ b/gntslider.h Sun May 19 02:37:51 2019 -0400
@@ -42,7 +42,7 @@
*
* Returns: The GType for GntSlider
*
- * Since: 2.0.0
+ * Since: 2.1.0
*/
G_DECLARE_DERIVABLE_TYPE(GntSlider, gnt_slider, GNT, SLIDER, GntWidget)
--- a/gnttextview.h Tue May 14 05:01:28 2019 -0400
+++ b/gnttextview.h Sun May 19 02:37:51 2019 -0400
@@ -36,11 +36,16 @@
#define GNT_TYPE_TEXT_VIEW gnt_text_view_get_type()
+/**
+ * GntTextViewFlag:
+ *
+ * Since: 2.1.0
+ */
typedef enum
{
GNT_TEXT_VIEW_NO_SCROLL = 1 << 0,
GNT_TEXT_VIEW_WRAP_CHAR = 1 << 1,
- GNT_TEXT_VIEW_TOP_ALIGN = 1 << 2,
+ GNT_TEXT_VIEW_TOP_ALIGN = 1 << 2, /* Since: 2.1.1 */
} GntTextViewFlag;
typedef enum
--- a/gnttree.h Tue May 14 05:01:28 2019 -0400
+++ b/gnttree.h Sun May 19 02:37:51 2019 -0400
@@ -43,6 +43,7 @@
typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer a, gconstpointer b);
typedef struct _GntTreeRow GntTreeRow;
+
G_BEGIN_DECLS
/**
@@ -208,7 +209,7 @@
*
* Returns: (transfer none): The key of the row.
*
- * Since: 2.7.2
+ * Since: 2.7.3
*/
gpointer gnt_tree_row_get_key(GntTree *tree, GntTreeRow *row);
@@ -221,7 +222,7 @@
*
* Returns: The next row.
*
- * Since: 2.7.2
+ * Since: 2.7.3
*/
GntTreeRow * gnt_tree_row_get_next(GntTree *tree, GntTreeRow *row);
@@ -234,7 +235,7 @@
*
* Returns: The previous row.
*
- * Since: 2.7.2
+ * Since: 2.7.3
*/
GntTreeRow * gnt_tree_row_get_prev(GntTree *tree, GntTreeRow *row);
@@ -247,7 +248,7 @@
*
* Returns: The child row.
*
- * Since: 2.7.2
+ * Since: 2.7.3
*/
GntTreeRow * gnt_tree_row_get_child(GntTree *tree, GntTreeRow *row);
@@ -260,7 +261,7 @@
*
* Returns: The parent row.
*
- * Since: 2.7.2
+ * Since: 2.7.3
*/
GntTreeRow * gnt_tree_row_get_parent(GntTree *tree, GntTreeRow *row);
--- a/gntwidget.h Tue May 14 05:01:28 2019 -0400
+++ b/gntwidget.h Sun May 19 02:37:51 2019 -0400
@@ -349,7 +349,7 @@
gboolean gnt_widget_has_shadow(GntWidget *widget);
/**
- * gnt_widget_in_destruction
+ * gnt_widget_in_destruction:
* @widget: The widget
*
* Returns whether the widget is currently being destroyed.
@@ -363,7 +363,7 @@
gboolean gnt_widget_in_destruction(GntWidget *widget);
/**
- * gnt_widget_set_drawing
+ * gnt_widget_set_drawing:
* @widget: The widget
* @drawing: Whether or not the widget is being drawn
*
@@ -374,7 +374,7 @@
void gnt_widget_set_drawing(GntWidget *widget, gboolean drawing);
/**
- * gnt_widget_get_drawing
+ * gnt_widget_get_drawing:
* @widget: The widget
*
* Returns whether the widget is currently being drawn.
@@ -388,7 +388,7 @@
gboolean gnt_widget_get_drawing(GntWidget *widget);
/**
- * gnt_widget_set_mapped
+ * gnt_widget_set_mapped:
* @widget: The widget
* @mapped: Whether or not the widget is mapped
*
@@ -402,7 +402,7 @@
void gnt_widget_set_mapped(GntWidget *widget, gboolean mapped);
/**
- * gnt_widget_get_mapped
+ * gnt_widget_get_mapped:
* @widget: The widget
*
* Whether widget is mapped or not.
@@ -414,7 +414,7 @@
gboolean gnt_widget_get_mapped(GntWidget *widget);
/**
- * gnt_widget_set_has_border
+ * gnt_widget_set_has_border:
* @widget: The widget
* @has_border: Whether or not the widget has a border
*
@@ -425,7 +425,7 @@
void gnt_widget_set_has_border(GntWidget *widget, gboolean has_border);
/**
- * gnt_widget_get_has_border
+ * gnt_widget_get_has_border:
* @widget: The widget
*
* Returns the has-border property on widget.
@@ -437,7 +437,7 @@
gboolean gnt_widget_get_has_border(GntWidget *widget);
/**
- * gnt_widget_set_has_shadow
+ * gnt_widget_set_has_shadow:
* @widget: The widget
* @has_shadow: Whether or not the widget has a shadow
*
@@ -450,7 +450,7 @@
void gnt_widget_set_has_shadow(GntWidget *widget, gboolean has_shadow);
/**
- * gnt_widget_get_has_shadow
+ * gnt_widget_get_has_shadow:
* @widget: The widget
*
* Returns the has-shadow property on widget. Note, this is a property of the
@@ -465,7 +465,7 @@
gboolean gnt_widget_get_has_shadow(GntWidget *widget);
/**
- * gnt_widget_set_has_focus
+ * gnt_widget_set_has_focus:
* @widget: The widget
* @has_focus: Whether or not the widget has focus
*
@@ -504,7 +504,7 @@
void gnt_widget_set_is_urgent(GntWidget *widget, gboolean urgent);
/**
- * gnt_widget_get_urgent
+ * gnt_widget_get_urgent:
* @widget: The widget
*
* Returns whether the widget has the URGENT hint set.
@@ -527,7 +527,7 @@
void gnt_widget_set_grow_x(GntWidget *widget, gboolean grow_x);
/**
- * gnt_widget_get_grow_x
+ * gnt_widget_get_grow_x:
* @widget: The widget
*
* Returns whether the widget should grow in the x direction.
@@ -550,7 +550,7 @@
void gnt_widget_set_grow_y(GntWidget *widget, gboolean grow_y);
/**
- * gnt_widget_get_grow_y
+ * gnt_widget_get_grow_y:
* @widget: The widget
*
* Returns whether the widget should grow in the y direction.
@@ -573,7 +573,7 @@
void gnt_widget_set_transient(GntWidget *widget, gboolean transient);
/**
- * gnt_widget_get_transient
+ * gnt_widget_get_transient:
* @widget: The widget
*
* Returns whether the widget is transient.
@@ -597,7 +597,7 @@
gboolean disable_actions);
/**
- * gnt_widget_get_disable_actions
+ * gnt_widget_get_disable_actions:
* @widget: The widget
*
* Returns whether the widget actions are disabled.
--- a/gntwm.c Tue May 14 05:01:28 2019 -0400
+++ b/gntwm.c Sun May 19 02:37:51 2019 -0400
@@ -1609,6 +1609,11 @@
g_signal_accumulator_true_handled, NULL, NULL,
G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_POINTER);
+ /**
+ * GntWM::terminal-refresh:
+ *
+ * Since: 2.1.0
+ */
signals[SIG_TERMINAL_REFRESH] =
g_signal_new("terminal-refresh",
G_TYPE_FROM_CLASS(klass),
--- a/gntwm.h Tue May 14 05:01:28 2019 -0400
+++ b/gntwm.h Sun May 19 02:37:51 2019 -0400
@@ -39,9 +39,7 @@
#define GNT_TYPE_WM gnt_wm_get_type()
-typedef struct _GntNode GntNode;
-
-struct _GntNode
+typedef struct _GntNode
{
GntWidget *me;
@@ -49,13 +47,20 @@
int scroll;
PANEL *panel;
GntWS *ws;
-};
+} GntNode;
+#ifndef GNT_DISABLE_DEPRECATED
+/**
+ * GntPosition:
+ *
+ * Deprecated: 2.14.0: This is an internal implementation detail.
+ */
typedef struct _GntPosition
{
int x;
int y;
} GntPosition;
+#endif
/**
* GntAction:
@@ -124,6 +129,8 @@
/* This is invoked whenever the terminal window is resized, or the
* screen session is attached to a new terminal. (ie, from the
* SIGWINCH callback)
+ *
+ * Since: 2.1.0
*/
void (*terminal_refresh)(GntWM *wm);