[gnome-robots] Fix a bunch of build warnings
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-robots] Fix a bunch of build warnings
- Date: Sat, 4 Jan 2020 03:18:10 +0000 (UTC)
commit 2bbe7f8272cc8bea7f5fc4ab60cc4cec77b7b133
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Fri Jan 3 21:11:48 2020 -0600
Fix a bunch of build warnings
Hopefully this doesn't change anything.
src/cursors.c | 5 +++-
src/find-file.c | 3 +-
src/find-file.h | 3 +-
src/game.c | 2 --
src/games-controls.c | 76 +++++++++++++++++++++++++++------------------------
src/games-controls.h | 2 --
src/games-file-list.c | 52 +++++++++++++++++++++--------------
src/games-file-list.h | 2 --
src/gnome-robots.c | 2 +-
src/properties.c | 9 +++---
src/sound.c | 2 +-
11 files changed, 87 insertions(+), 71 deletions(-)
---
diff --git a/src/cursors.c b/src/cursors.c
index ffc5fc8..6a85f17 100644
--- a/src/cursors.c
+++ b/src/cursors.c
@@ -68,11 +68,14 @@ make_cursors (void)
int i;
cursor_props *c;
- default_cursor = gdk_cursor_new (GDK_LEFT_PTR);
+ default_cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
+ GDK_LEFT_PTR);
c = cursor_list;
for (i = 0; i < G_N_ELEMENTS (cursor_list); ++i) {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
pixbuf = gdk_pixbuf_new_from_inline (c->data_len, c->data, FALSE, NULL);
+G_GNUC_END_IGNORE_DEPRECATIONS
c->cursor = gdk_cursor_new_from_pixbuf (gdk_display_get_default (),
pixbuf,
c->hsx, c->hsy);
diff --git a/src/find-file.c b/src/find-file.c
index bbad18d..259e6b3 100644
--- a/src/find-file.c
+++ b/src/find-file.c
@@ -15,7 +15,8 @@
You should have received a copy of the GNU Library General Public License
along with this library; if not, see <http://www.gnu.org/licenses/>.
-/* Authors: Callum McKenzie <callum spooky-possum org> */
+ Authors: Callum McKenzie <callum spooky-possum org>
+*/
#include <config.h>
diff --git a/src/find-file.h b/src/find-file.h
index 6f10efe..4889c5a 100644
--- a/src/find-file.h
+++ b/src/find-file.h
@@ -15,7 +15,8 @@
You should have received a copy of the GNU Library General Public License
along with this library; if not, see <http://www.gnu.org/licenses/>.
-/* Authors: Callum McKenzie <callum spooky-possum org> */
+ Authors: Callum McKenzie <callum spooky-possum org>
+*/
#ifndef GAMES_FIND_FILE_H
#define GAMES_FIND_FILE_H
diff --git a/src/game.c b/src/game.c
index f34a554..b3ba9d2 100644
--- a/src/game.c
+++ b/src/game.c
@@ -469,8 +469,6 @@ update_arena (void)
static gint
timeout_cb (void *data)
{
- gint sp;
-
animate_game_graphics ();
clear_game_area ();
diff --git a/src/games-controls.c b/src/games-controls.c
index bee938d..1264a77 100644
--- a/src/games-controls.c
+++ b/src/games-controls.c
@@ -37,8 +37,6 @@ enum {
/* Class implementation */
-G_DEFINE_TYPE (GamesControlsList, games_controls_list, GTK_TYPE_SCROLLED_WINDOW)
-
struct GamesControlsListPrivate {
GtkTreeModel *model;
GtkListStore *store;
@@ -48,6 +46,8 @@ struct GamesControlsListPrivate {
gulong notify_handler_id;
};
+G_DEFINE_TYPE_WITH_PRIVATE (GamesControlsList, games_controls_list, GTK_TYPE_SCROLLED_WINDOW)
+
static void
accel_edited_cb (GtkCellRendererAccel *cell,
char *path_string,
@@ -56,6 +56,7 @@ accel_edited_cb (GtkCellRendererAccel *cell,
guint hardware_keycode,
GamesControlsList *list)
{
+ GamesControlsListPrivate *priv = games_controls_list_get_instance_private (list);
GtkTreePath *path;
GtkTreeIter iter;
char *conf_key = NULL;
@@ -64,13 +65,13 @@ accel_edited_cb (GtkCellRendererAccel *cell,
if (!path)
return;
- if (!gtk_tree_model_get_iter (list->priv->model, &iter, path)) {
+ if (!gtk_tree_model_get_iter (priv->model, &iter, path)) {
gtk_tree_path_free (path);
return;
}
gtk_tree_path_free (path);
- gtk_tree_model_get (list->priv->model, &iter,
+ gtk_tree_model_get (priv->model, &iter,
CONFKEY_COLUMN, &conf_key,
-1);
if (!conf_key)
@@ -78,7 +79,7 @@ accel_edited_cb (GtkCellRendererAccel *cell,
/* Note: the model is updated in the conf notification callback */
/* FIXME: what to do with the modifiers? */
- g_settings_set_int (list->priv->settings, conf_key, keyval);
+ g_settings_set_int (priv->settings, conf_key, keyval);
g_free (conf_key);
}
@@ -87,6 +88,7 @@ accel_cleared_cb (GtkCellRendererAccel *cell,
char *path_string,
GamesControlsList *list)
{
+ GamesControlsListPrivate *priv = games_controls_list_get_instance_private (list);
GtkTreePath *path;
GtkTreeIter iter;
char *conf_key = NULL;
@@ -96,13 +98,13 @@ accel_cleared_cb (GtkCellRendererAccel *cell,
if (!path)
return;
- if (!gtk_tree_model_get_iter (list->priv->model, &iter, path)) {
+ if (!gtk_tree_model_get_iter (priv->model, &iter, path)) {
gtk_tree_path_free (path);
return;
}
gtk_tree_path_free (path);
- gtk_tree_model_get (list->priv->model, &iter,
+ gtk_tree_model_get (priv->model, &iter,
CONFKEY_COLUMN, &conf_key,
DEFAULT_KEYCODE_COLUMN, &default_keyval,
-1);
@@ -111,35 +113,36 @@ accel_cleared_cb (GtkCellRendererAccel *cell,
/* Note: the model is updated in the conf notification callback */
/* FIXME: what to do with the modifiers? */
- g_settings_set_int (list->priv->settings, conf_key, default_keyval);
+ g_settings_set_int (priv->settings, conf_key, default_keyval);
g_free (conf_key);
}
static void
settings_changed_cb (GSettings *settings, const gchar *key, GamesControlsList *list)
{
+ GamesControlsListPrivate *priv = games_controls_list_get_instance_private (list);
GtkTreeIter iter;
gboolean valid;
/* find our gconf key in the list store and update it */
- valid = gtk_tree_model_get_iter_first (list->priv->model, &iter);
+ valid = gtk_tree_model_get_iter_first (priv->model, &iter);
while (valid) {
char *conf_key;
- gtk_tree_model_get (list->priv->model, &iter,
+ gtk_tree_model_get (priv->model, &iter,
CONFKEY_COLUMN, &conf_key,
-1);
if (strcmp (key, conf_key) == 0) {
guint keyval, default_keyval;
- gtk_tree_model_get (list->priv->model, &iter,
+ gtk_tree_model_get (priv->model, &iter,
DEFAULT_KEYCODE_COLUMN, &default_keyval,
-1);
- keyval = g_settings_get_int (list->priv->settings, key);
+ keyval = g_settings_get_int (priv->settings, key);
- gtk_list_store_set (list->priv->store, &iter,
+ gtk_list_store_set (priv->store, &iter,
KEYCODE_COLUMN, keyval,
KEYMODS_COLUMN, 0 /* FIXME? */,
-1);
@@ -149,14 +152,13 @@ settings_changed_cb (GSettings *settings, const gchar *key, GamesControlsList *l
}
g_free (conf_key);
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list->priv->store), &iter);
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->store), &iter);
}
}
static void
games_controls_list_init (GamesControlsList *list)
{
- list->priv = G_TYPE_INSTANCE_GET_PRIVATE (list, GAMES_TYPE_CONTROLS_LIST, GamesControlsListPrivate);
}
static GObject *
@@ -164,6 +166,7 @@ games_controls_list_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params)
{
+ GamesControlsListPrivate *priv;
GObject *object;
GamesControlsList *list;
GtkScrolledWindow *scrolled_window;
@@ -175,6 +178,7 @@ games_controls_list_constructor (GType type,
(type, n_construct_properties, construct_params);
list = GAMES_CONTROLS_LIST (object);
+ priv = games_controls_list_get_instance_private (list);
scrolled_window = GTK_SCROLLED_WINDOW (object);
store = gtk_list_store_new (N_COLUMNS,
@@ -184,14 +188,14 @@ games_controls_list_constructor (GType type,
G_TYPE_UINT,
G_TYPE_UINT,
G_TYPE_UINT);
- list->priv->store = store;
- list->priv->model = GTK_TREE_MODEL (store);
+ priv->store = store;
+ priv->model = GTK_TREE_MODEL (store);
- list->priv->view = gtk_tree_view_new_with_model (list->priv->model);
+ priv->view = gtk_tree_view_new_with_model (priv->model);
g_object_unref (store);
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list->priv->view), FALSE);
- gtk_tree_view_set_enable_search (GTK_TREE_VIEW (list->priv->view), FALSE);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->view), FALSE);
+ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->view), FALSE);
/* label column */
label_renderer = gtk_cell_renderer_text_new ();
@@ -199,7 +203,7 @@ games_controls_list_constructor (GType type,
label_renderer,
"text", LABEL_COLUMN,
NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (list->priv->view), column);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (priv->view), column);
/* key column */
key_renderer = gtk_cell_renderer_accel_new ();
@@ -217,9 +221,9 @@ games_controls_list_constructor (GType type,
"accel-key", KEYCODE_COLUMN,
"accel-mods", KEYMODS_COLUMN,
NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (list->priv->view), column);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (priv->view), column);
- gtk_container_add (GTK_CONTAINER (scrolled_window), list->priv->view);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), priv->view);
return object;
}
@@ -228,11 +232,12 @@ static void
games_controls_list_finalize (GObject *object)
{
GamesControlsList *list = GAMES_CONTROLS_LIST (object);
+ GamesControlsListPrivate *priv = games_controls_list_get_instance_private (list);
- g_signal_handler_disconnect (list->priv->settings, list->priv->notify_handler_id);
+ g_signal_handler_disconnect (priv->settings, priv->notify_handler_id);
- if (list->priv->settings)
- g_object_unref (list->priv->settings);
+ if (priv->settings)
+ g_object_unref (priv->settings);
G_OBJECT_CLASS (games_controls_list_parent_class)->finalize (object);
}
@@ -244,8 +249,6 @@ games_controls_list_class_init (GamesControlsListClass *klass)
gobject_class->constructor = games_controls_list_constructor;
gobject_class->finalize = games_controls_list_finalize;
-
- g_type_class_add_private (gobject_class, sizeof (GamesControlsListPrivate));
}
/* Public API */
@@ -254,18 +257,20 @@ GtkWidget *
games_controls_list_new (GSettings *settings)
{
GamesControlsList *list;
+ GamesControlsListPrivate *priv;
list = g_object_new (GAMES_TYPE_CONTROLS_LIST,
"hscrollbar-policy", GTK_POLICY_NEVER,
"vscrollbar-policy", GTK_POLICY_AUTOMATIC,
"shadow-type", GTK_SHADOW_IN,
NULL);
+ priv = games_controls_list_get_instance_private (list);
- list->priv->settings = g_object_ref (settings);
- list->priv->notify_handler_id = g_signal_connect (list->priv->settings,
- "changed",
- G_CALLBACK (settings_changed_cb),
- list);
+ priv->settings = g_object_ref (settings);
+ priv->notify_handler_id = g_signal_connect (priv->settings,
+ "changed",
+ G_CALLBACK (settings_changed_cb),
+ list);
return GTK_WIDGET (list);
}
@@ -276,6 +281,7 @@ games_controls_list_add_control (GamesControlsList *list,
const char *label,
guint default_keyval)
{
+ GamesControlsListPrivate *priv = games_controls_list_get_instance_private (list);
GtkTreeIter iter;
guint keyval;
@@ -285,9 +291,9 @@ games_controls_list_add_control (GamesControlsList *list,
if (!label)
label = _("Unknown Command");
- keyval = g_settings_get_int (list->priv->settings, conf_key);
+ keyval = g_settings_get_int (priv->settings, conf_key);
- gtk_list_store_insert_with_values (list->priv->store, &iter, -1,
+ gtk_list_store_insert_with_values (priv->store, &iter, -1,
CONFKEY_COLUMN, conf_key,
LABEL_COLUMN, label,
KEYCODE_COLUMN, keyval,
diff --git a/src/games-controls.h b/src/games-controls.h
index d192dfc..8c3893a 100644
--- a/src/games-controls.h
+++ b/src/games-controls.h
@@ -23,8 +23,6 @@ typedef struct GamesControlsListPrivate GamesControlsListPrivate;
typedef struct {
GtkScrolledWindow parent_instance;
- /*< private >*/
- GamesControlsListPrivate *priv;
} GamesControlsList;
typedef struct {
diff --git a/src/games-file-list.c b/src/games-file-list.c
index 0a79130..827b0cc 100644
--- a/src/games-file-list.c
+++ b/src/games-file-list.c
@@ -31,23 +31,24 @@
#include "games-file-list.h"
-G_DEFINE_TYPE (GamesFileList, games_file_list, G_TYPE_OBJECT)
-
struct GamesFileListPrivate
{
GList *list;
};
+G_DEFINE_TYPE_WITH_PRIVATE (GamesFileList, games_file_list, G_TYPE_OBJECT)
+
/* Remove duplicate names form the list */
static void
games_file_list_remove_duplicates (GamesFileList * filelist)
{
+ GamesFileListPrivate *priv = games_file_list_get_instance_private (filelist);
GList *l;
if (filelist == NULL)
return;
- l = filelist->priv->list;
+ l = priv->list;
if ((l == NULL) || (l->next == NULL))
return;
@@ -110,16 +111,17 @@ GamesFileList *
games_file_list_new (const gchar * glob, ...)
{
GamesFileList *filelist;
+ GamesFileListPrivate *priv;
va_list paths;
filelist = g_object_new (GAMES_FILE_LIST_TYPE, NULL);
+ priv = games_file_list_get_instance_private (filelist);
va_start (paths, glob);
- filelist->priv->list = games_file_list_new_internal (glob, paths);
+ priv->list = games_file_list_new_internal (glob, paths);
va_end (paths);
- filelist->priv->list =
- g_list_sort (filelist->priv->list, (GCompareFunc) g_utf8_collate);
+ priv->list = g_list_sort (priv->list, (GCompareFunc) g_utf8_collate);
games_file_list_remove_duplicates (filelist);
return filelist;
@@ -129,7 +131,8 @@ games_file_list_new (const gchar * glob, ...)
void
games_file_list_transform_basename (GamesFileList * filelist)
{
- GList *current = filelist->priv->list;
+ GamesFileListPrivate *priv = games_file_list_get_instance_private (filelist);
+ GList *current = priv->list;
gchar *shortname;
while (current) {
@@ -243,21 +246,22 @@ GamesFileList *
games_file_list_new_images (const gchar * path1, ...)
{
GamesFileList *filelist;
+ GamesFileListPrivate *priv;
gchar *pathentry;
va_list paths;
filelist = g_object_new (GAMES_FILE_LIST_TYPE, NULL);
+ priv = games_file_list_get_instance_private (filelist);
- filelist->priv->list = games_file_list_new_images_single (path1);
+ priv->list = games_file_list_new_images_single (path1);
va_start (paths, path1);
while ((pathentry = va_arg (paths, gchar *)) != NULL) {
- filelist->priv->list = g_list_concat (filelist->priv->list,
+ priv->list = g_list_concat (priv->list,
games_file_list_new_images_single (pathentry));
}
va_end (paths);
- filelist->priv->list =
- g_list_sort (filelist->priv->list, (GCompareFunc) g_utf8_collate);
+ priv->list = g_list_sort (priv->list, (GCompareFunc) g_utf8_collate);
games_file_list_remove_duplicates (filelist);
return filelist;
@@ -282,10 +286,11 @@ GtkWidget *
games_file_list_create_widget (GamesFileList * filelist,
const gchar * selection, guint flags)
{
+ GamesFileListPrivate *priv = games_file_list_get_instance_private (filelist);
gint itemno;
GtkComboBox *widget;
gchar *visible, *string;
- GList *iter = filelist->priv->list;
+ GList *iter = priv->list;
gboolean found = FALSE;
widget = GTK_COMBO_BOX (gtk_combo_box_text_new ());
@@ -340,7 +345,9 @@ games_file_list_create_widget (GamesFileList * filelist,
gsize
games_file_list_length (GamesFileList * filelist)
{
- return g_list_length (filelist->priv->list);
+ GamesFileListPrivate *priv = games_file_list_get_instance_private (filelist);
+
+ return g_list_length (priv->list);
}
/**
@@ -358,7 +365,9 @@ void
games_file_list_for_each (GamesFileList * filelist, GFunc function,
gpointer userdata)
{
- g_list_foreach (filelist->priv->list, function, userdata);
+ GamesFileListPrivate *priv = games_file_list_get_instance_private (filelist);
+
+ g_list_foreach (priv->list, function, userdata);
}
/**
@@ -380,9 +389,10 @@ gchar *
games_file_list_find (GamesFileList * filelist, GCompareFunc function,
gpointer userdata)
{
+ GamesFileListPrivate *priv = games_file_list_get_instance_private (filelist);
GList *element;
- element = g_list_find_custom (filelist->priv->list, userdata, function);
+ element = g_list_find_custom (priv->list, userdata, function);
return element ? g_strdup ((gchar *) element->data) : NULL;
}
@@ -400,19 +410,22 @@ games_file_list_find (GamesFileList * filelist, GCompareFunc function,
const gchar *
games_file_list_get_nth (GamesFileList * filelist, gint n)
{
- return (const gchar *) g_list_nth_data (filelist->priv->list, n);
+ GamesFileListPrivate *priv = games_file_list_get_instance_private (filelist);
+
+ return (const gchar *) g_list_nth_data (priv->list, n);
}
static void
games_file_list_finalize (GObject * object)
{
GamesFileList *filelist = GAMES_FILE_LIST (object);
+ GamesFileListPrivate *priv = games_file_list_get_instance_private (filelist);
/* For simplicity we haven't used the dispose method since we can
* guarantee that everything this references doesn't reference itself. */
- g_list_foreach (filelist->priv->list, (GFunc) g_free, NULL);
- g_list_free (filelist->priv->list);
+ g_list_foreach (priv->list, (GFunc) g_free, NULL);
+ g_list_free (priv->list);
G_OBJECT_CLASS (games_file_list_parent_class)->finalize (object);
}
@@ -423,12 +436,9 @@ games_file_list_class_init (GamesFileListClass * class)
GObjectClass *oclass = G_OBJECT_CLASS (class);
oclass->finalize = games_file_list_finalize;
-
- g_type_class_add_private (oclass, sizeof (GamesFileListPrivate));
}
static void
games_file_list_init (GamesFileList * filelist)
{
- filelist->priv = G_TYPE_INSTANCE_GET_PRIVATE (filelist, GAMES_FILE_LIST_TYPE, GamesFileListPrivate);
}
diff --git a/src/games-file-list.h b/src/games-file-list.h
index c2dbedb..ac51180 100644
--- a/src/games-file-list.h
+++ b/src/games-file-list.h
@@ -27,8 +27,6 @@ typedef struct GamesFileListPrivate GamesFileListPrivate;
typedef struct {
GObject parent;
- /*< private >*/
- GamesFileListPrivate *priv;
} GamesFileList;
typedef struct {
diff --git a/src/gnome-robots.c b/src/gnome-robots.c
index a269eb5..a9b4c36 100644
--- a/src/gnome-robots.c
+++ b/src/gnome-robots.c
@@ -203,7 +203,7 @@ help_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data)
{
GError *error = NULL;
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)), "help:gnome-robots", gtk_get_current_event_time
(), &error);
+ gtk_show_uri_on_window (GTK_WINDOW (window), "help:gnome-robots", gtk_get_current_event_time (), &error);
if (error)
g_warning ("Failed to show help: %s", error->message);
g_clear_error (&error);
diff --git a/src/properties.c b/src/properties.c
index 29e54e1..d3fa1d4 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -72,7 +72,7 @@ struct _GnobotsProperties {
gboolean show_toolbar;
GdkRGBA bgcolour;
gint selected_config;
- gint keys[N_KEYS];
+ guint keys[N_KEYS];
const gchar *themename;
};
/**********************************************************************/
@@ -275,7 +275,7 @@ sound_cb (GtkWidget * widget, gpointer data)
static void
defkey_cb (GtkWidget * widget, gpointer data)
{
- gint i;
+ guint i;
for (i = 0; i < N_KEYS; ++i) {
GVariant *variant;
@@ -284,7 +284,7 @@ defkey_cb (GtkWidget * widget, gpointer data)
g_snprintf (buffer, sizeof (buffer), KEY_CONTROL_KEY, i);
g_settings_reset (settings, buffer);
variant = g_settings_get_default_value (settings, buffer);
- properties.keys[i] = g_variant_get_int32 (variant);
+ properties.keys[i] = g_variant_get_uint32 (variant);
g_variant_unref (variant);
}
@@ -391,7 +391,8 @@ show_properties_dialog (void)
propbox = gtk_dialog_new_with_buttons (_("Preferences"),
GTK_WINDOW (window),
GTK_DIALOG_USE_HEADER_BAR,
- NULL);
+ NULL,
+ NULL);
gtk_container_set_border_width (GTK_CONTAINER (propbox), 5);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (propbox))), 2);
/* Set up notebook and add it to hbox of the gtk_dialog */
diff --git a/src/sound.c b/src/sound.c
index 7001b70..c14c80a 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -80,7 +80,7 @@ play_sound (gint sno)
name = "splat";
break;
case SOUND_BAD:
- gdk_beep ();
+ gdk_display_beep (gdk_display_get_default ());
break;
case SOUND_YAHOO:
name = "yahoo";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]