summaryrefslogtreecommitdiff
path: root/savers
diff options
context:
space:
mode:
Diffstat (limited to 'savers')
-rw-r--r--savers/floaters.c28
-rw-r--r--savers/gs-theme-engine.c1
-rw-r--r--savers/gs-theme-engine.h1
-rw-r--r--savers/gs-theme-window.c1
-rw-r--r--savers/gs-theme-window.h1
-rw-r--r--savers/gste-popsquares.c1
-rw-r--r--savers/gste-popsquares.h1
-rw-r--r--savers/gste-slideshow.c3
-rw-r--r--savers/gste-slideshow.h1
-rw-r--r--savers/popsquares.c6
-rw-r--r--savers/slideshow.c8
-rw-r--r--savers/xdg-user-dir-lookup.c6
-rw-r--r--savers/xdg-user-dir-lookup.h1
13 files changed, 32 insertions, 27 deletions
diff --git a/savers/floaters.c b/savers/floaters.c
index d1e7cc9..9e75f7b 100644
--- a/savers/floaters.c
+++ b/savers/floaters.c
@@ -2,6 +2,7 @@
* Copyright (C) 2005 Ray Strode <[email protected]>,
* Matthias Clasen <[email protected]>,
* Søren Sandmann <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License as
@@ -806,11 +807,11 @@ screen_saver_new (GtkWidget *drawing_area,
g_hash_table_new_full (NULL, NULL, NULL,
(GDestroyNotify) cached_source_free);
- g_signal_connect_swapped (G_OBJECT (drawing_area), "size-allocate",
+ g_signal_connect_swapped (drawing_area, "size-allocate",
G_CALLBACK (screen_saver_on_size_allocate),
screen_saver);
- g_signal_connect_swapped (G_OBJECT (drawing_area), "draw",
+ g_signal_connect_swapped (drawing_area, "draw",
G_CALLBACK (screen_saver_on_draw),
screen_saver);
@@ -824,8 +825,8 @@ screen_saver_new (GtkWidget *drawing_area,
screen_saver->floaters = NULL;
screen_saver->max_floater_count = max_floater_count;
- screen_saver->should_show_paths = should_show_paths;
- screen_saver->should_do_rotations = should_do_rotations;
+ screen_saver->should_show_paths = (should_show_paths != FALSE);
+ screen_saver->should_do_rotations = (should_do_rotations != FALSE);
screen_saver_get_initial_state (screen_saver);
@@ -868,15 +869,8 @@ screen_saver_free (ScreenSaver *screen_saver)
static gdouble
screen_saver_get_timestamp (ScreenSaver *screen_saver)
{
- const gdouble microseconds_per_second = (gdouble ) G_USEC_PER_SEC;
- gdouble timestamp;
- GTimeVal now = { 0L, /* zero-filled */ };
-
- g_get_current_time (&now);
- timestamp = ((microseconds_per_second * now.tv_sec) + now.tv_usec) /
- microseconds_per_second;
-
- return timestamp;
+ gint64 now = g_get_real_time ();
+ return (gdouble) now / (gdouble) G_USEC_PER_SEC;
}
static void
@@ -1148,7 +1142,7 @@ main (int argc,
N_("The initial size and position of window"), N_("WIDTHxHEIGHT+X+Y") },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames,
N_("The source image to use"), NULL },
- {NULL}
+ { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
};
bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
@@ -1162,7 +1156,6 @@ main (int argc,
_("image - floats images around the screen"),
options, GETTEXT_PACKAGE, &error);
-
if (error != NULL)
{
g_printerr (_("%s. See --help for usage information.\n"),
@@ -1181,8 +1174,9 @@ main (int argc,
window = gs_theme_window_new ();
- g_signal_connect (G_OBJECT (window), "delete-event",
- G_CALLBACK (gtk_main_quit), NULL);
+ g_signal_connect (window, "delete-event",
+ G_CALLBACK (gtk_main_quit),
+ NULL);
drawing_area = GTK_WIDGET (gtk_drawing_area_new ());
diff --git a/savers/gs-theme-engine.c b/savers/gs-theme-engine.c
index ec071c6..3a6ec4f 100644
--- a/savers/gs-theme-engine.c
+++ b/savers/gs-theme-engine.c
@@ -1,6 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
*
* Copyright (C) 2005 William Jon McCann <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/savers/gs-theme-engine.h b/savers/gs-theme-engine.h
index f3492ab..131235d 100644
--- a/savers/gs-theme-engine.h
+++ b/savers/gs-theme-engine.h
@@ -1,6 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2005 William Jon McCann <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/savers/gs-theme-window.c b/savers/gs-theme-window.c
index 1000af2..1ae78f6 100644
--- a/savers/gs-theme-window.c
+++ b/savers/gs-theme-window.c
@@ -3,6 +3,7 @@
* gs-theme-window.c - special toplevel for screensavers
*
* Copyright (C) 2005 Ray Strode <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/savers/gs-theme-window.h b/savers/gs-theme-window.h
index 798e33c..0167ee1 100644
--- a/savers/gs-theme-window.h
+++ b/savers/gs-theme-window.h
@@ -3,6 +3,7 @@
* gs-theme-window.h - special toplevel for screensavers
*
* Copyright (C) 2005 Ray Strode <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/savers/gste-popsquares.c b/savers/gste-popsquares.c
index 4b78f72..4f642e1 100644
--- a/savers/gste-popsquares.c
+++ b/savers/gste-popsquares.c
@@ -1,6 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
*
* Copyright (C) 2005 William Jon McCann <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/savers/gste-popsquares.h b/savers/gste-popsquares.h
index a4130c2..81b95e1 100644
--- a/savers/gste-popsquares.h
+++ b/savers/gste-popsquares.h
@@ -1,6 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2005 William Jon McCann <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/savers/gste-slideshow.c b/savers/gste-slideshow.c
index 47027d7..acd3e85 100644
--- a/savers/gste-slideshow.c
+++ b/savers/gste-slideshow.c
@@ -1,6 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
*
* Copyright (C) 2005-2006 William Jon McCann <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -554,7 +555,6 @@ gste_strcmp_compare_func (gconstpointer string_a, gconstpointer string_b)
string_b == NULL ? "" : string_b);
}
-
static GdkPixbuf *
get_pixbuf_from_local_dir (GSTESlideshow *show,
const char *location)
@@ -724,7 +724,6 @@ gste_slideshow_set_images_location (GSTESlideshow *show,
show->priv->images_location = g_strdup (location);
}
-
void
gste_slideshow_set_sort_images (GSTESlideshow *show,
gboolean sort_images)
diff --git a/savers/gste-slideshow.h b/savers/gste-slideshow.h
index e3e1042..d512e05 100644
--- a/savers/gste-slideshow.h
+++ b/savers/gste-slideshow.h
@@ -1,6 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2005 William Jon McCann <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/savers/popsquares.c b/savers/popsquares.c
index 6b9b8f7..8337b6d 100644
--- a/savers/popsquares.c
+++ b/savers/popsquares.c
@@ -1,6 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
*
* Copyright (C) 2005 William Jon McCann <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -53,8 +54,9 @@ main (int argc, char **argv)
}
window = gs_theme_window_new ();
- g_signal_connect (G_OBJECT (window), "delete-event",
- G_CALLBACK (gtk_main_quit), NULL);
+ g_signal_connect (window, "delete-event",
+ G_CALLBACK (gtk_main_quit),
+ NULL);
g_set_prgname ("popsquares");
diff --git a/savers/slideshow.c b/savers/slideshow.c
index 24dc394..c479bc7 100644
--- a/savers/slideshow.c
+++ b/savers/slideshow.c
@@ -1,6 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
*
* Copyright (C) 2005 William Jon McCann <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -66,7 +67,7 @@ main (int argc, char **argv)
"no-stretch", 0, 0, G_OPTION_ARG_NONE, &no_stretch,
N_("Do not try to stretch images on screen"), NULL
},
- { NULL }
+ { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
};
bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
@@ -92,8 +93,9 @@ main (int argc, char **argv)
g_set_prgname ("slideshow");
window = gs_theme_window_new ();
- g_signal_connect (G_OBJECT (window), "delete-event",
- G_CALLBACK (gtk_main_quit), NULL);
+ g_signal_connect (window, "delete-event",
+ G_CALLBACK (gtk_main_quit),
+ NULL);
engine = g_object_new (GSTE_TYPE_SLIDESHOW, NULL);
diff --git a/savers/xdg-user-dir-lookup.c b/savers/xdg-user-dir-lookup.c
index c9e8fe2..3a563c7 100644
--- a/savers/xdg-user-dir-lookup.c
+++ b/savers/xdg-user-dir-lookup.c
@@ -3,6 +3,7 @@
Its is under the MIT license, to encourage reuse by cut-and-paste.
Copyright (c) 2007 Red Hat, inc
+ Copyright (C) 2012-2021 MATE Developers
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
@@ -39,7 +40,6 @@ xdg_user_dir_lookup (const char *type)
char buffer[512];
char *user_dir;
char *p, *d;
- int len;
int relative;
home_dir = getenv ("HOME");
@@ -70,8 +70,8 @@ xdg_user_dir_lookup (const char *type)
while (fgets (buffer, sizeof (buffer), file))
{
/* Remove newline at end */
- len = strlen (buffer);
- if (len > 0 && buffer[len-1] == '\n')
+ size_t len = strlen (buffer);
+ if (len != 0 && buffer[len-1] == '\n')
buffer[len-1] = 0;
p = buffer;
diff --git a/savers/xdg-user-dir-lookup.h b/savers/xdg-user-dir-lookup.h
index 5078c7d..85eabda 100644
--- a/savers/xdg-user-dir-lookup.h
+++ b/savers/xdg-user-dir-lookup.h
@@ -3,6 +3,7 @@
Its is under the MIT license, to encourage reuse by cut-and-paste.
Copyright (c) 2007 Red Hat, inc
+ Copyright (C) 2012-2021 MATE Developers
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
generated by cgit v1.2.1 (git 2.18.0) at 2025-07-04 04:30:57 +0000