aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore12
-rw-r--r--src/gamma-drm.c3
-rw-r--r--src/location-geoclue.c4
-rw-r--r--src/redshift.c4
4 files changed, 17 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index dc6de47..d2776ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+# Hidden files
+.*
+!.git*
+
# Backup files
*~
\#*\#
@@ -38,6 +42,8 @@ stamp-h1
/compile
*.deps/
/m4/
+libtool
+ltmain.sh
# generated files
src/redshift-gtk/defs.py
@@ -47,10 +53,16 @@ src/redshift
src/redshift-gtk/__pycache__/
/data/systemd/redshift.service
/data/systemd/redshift-gtk.service
+/data/appdata/redshift-gtk.appdata.xml
+/data/applications/redshift-gtk.desktop
+
+*.su
+*.gch
# gettext
/po/POTFILES
/po/stamp-po
+/po/stamp-it
/po/*.gmo
/po/Makefile.in.in
/po/Rules-quot
diff --git a/src/gamma-drm.c b/src/gamma-drm.c
index d431395..d15f3f6 100644
--- a/src/gamma-drm.c
+++ b/src/gamma-drm.c
@@ -190,8 +190,7 @@ drm_free(drm_state_t *state)
if (state->crtcs != NULL) {
drm_crtc_state_t *crtcs = state->crtcs;
while (crtcs->crtc_num >= 0) {
- if (crtcs->r_gamma != NULL)
- free(crtcs->r_gamma);
+ free(crtcs->r_gamma);
crtcs->crtc_num = -1;
crtcs++;
}
diff --git a/src/location-geoclue.c b/src/location-geoclue.c
index b2616bf..851a75b 100644
--- a/src/location-geoclue.c
+++ b/src/location-geoclue.c
@@ -123,8 +123,8 @@ void
location_geoclue_free(location_geoclue_state_t *state)
{
if (state->position != NULL) g_object_unref(state->position);
- if (state->provider != NULL) free(state->provider);
- if (state->provider_path != NULL) free(state->provider_path);
+ free(state->provider);
+ free(state->provider_path);
}
void
diff --git a/src/redshift.c b/src/redshift.c
index 8a83c4f..defd0a1 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -1092,7 +1092,7 @@ main(int argc, char *argv[])
&scheme.night.brightness);
break;
case 'c':
- if (config_filepath != NULL) free(config_filepath);
+ free(config_filepath);
config_filepath = strdup(optarg);
break;
case 'g':
@@ -1241,7 +1241,7 @@ main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- if (config_filepath != NULL) free(config_filepath);
+ free(config_filepath);
/* Read global config settings. */
config_ini_section_t *section = config_ini_get_section(&config_state,