[Xfce4-commits] [apps/mousepad] 01/02: Cleanup and normalize new files from latest commits
noreply at xfce.org
noreply at xfce.org
Mon Jul 14 21:08:06 CEST 2014
This is an automated email from the git hooks/post-receive script.
mbrush pushed a commit to branch master
in repository apps/mousepad.
commit 0d7dcc44185117ea19e4a4b79d72bbee5bb08cd7
Author: Matthew Brush <mbrush at codebrainz.ca>
Date: Mon Jul 14 11:04:17 2014 -0700
Cleanup and normalize new files from latest commits
* Add license header comment to each new file
* Ensure needed files are listed in `POTFILES.in`
* Normalize the header guards to existing `__MOUSEPAD_FOO_H__` style
* Fix a couple compiler warnings
* Include `config.h` in each source file
---
mousepad/mousepad-action-group.c | 18 +++++++++++++++++-
mousepad/mousepad-action-group.h | 22 +++++++++++++++++++---
mousepad/mousepad-language-action.c | 24 ++++++++++++++++++------
mousepad/mousepad-language-action.h | 22 +++++++++++++++++++---
mousepad/mousepad-prefs-dialog.c | 20 ++++++++++++++++++++
mousepad/mousepad-prefs-dialog.h | 22 +++++++++++++++++++---
mousepad/mousepad-settings-store.c | 22 +++++++++++++++++++++-
mousepad/mousepad-settings-store.h | 22 +++++++++++++++++++---
mousepad/mousepad-settings.c | 20 ++++++++++++++++++++
mousepad/mousepad-settings.h | 22 +++++++++++++++++++---
mousepad/mousepad-style-scheme-action.c | 18 +++++++++++++++++-
mousepad/mousepad-style-scheme-action.h | 22 +++++++++++++++++++---
po/POTFILES.in | 3 +++
13 files changed, 230 insertions(+), 27 deletions(-)
diff --git a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c
index d34fb9c..210f21a 100644
--- a/mousepad/mousepad-action-group.c
+++ b/mousepad/mousepad-action-group.c
@@ -1,5 +1,21 @@
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <mousepad/mousepad-action-group.h>
diff --git a/mousepad/mousepad-action-group.h b/mousepad/mousepad-action-group.h
index dcaba57..a2187ad 100644
--- a/mousepad/mousepad-action-group.h
+++ b/mousepad/mousepad-action-group.h
@@ -1,5 +1,21 @@
-#ifndef MOUSEPADACTIONGROUP_H_
-#define MOUSEPADACTIONGROUP_H_ 1
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __MOUSEPAD_ACTION_GROUP_H__
+#define __MOUSEPAD_ACTION_GROUP_H__ 1
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcelanguage.h>
@@ -37,4 +53,4 @@ GtkWidget *mousepad_action_group_create_style_scheme_menu (MousepadAc
G_END_DECLS
-#endif /* MOUSEPADACTIONGROUP_H_ */
+#endif /* __MOUSEPAD_ACTION_GROUP_H__ */
diff --git a/mousepad/mousepad-language-action.c b/mousepad/mousepad-language-action.c
index 5ab85ff..46bac0e 100644
--- a/mousepad/mousepad-language-action.c
+++ b/mousepad/mousepad-language-action.c
@@ -1,5 +1,21 @@
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <mousepad/mousepad-language-action.h>
@@ -41,10 +57,6 @@ static void mousepad_language_action_get_property (GObject *ob
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void mousepad_language_action_update_language (MousepadLanguageAction *action,
- GtkSourceLanguage *language);
-
-
static void mousepad_language_action_set_language (MousepadLanguageAction *action,
GtkSourceLanguage *language);
@@ -227,8 +239,8 @@ mousepad_language_action_set_language (MousepadLanguageAction *self,
gchar *tooltip;
self->language = g_object_ref (language);
- value_quark = g_quark_from_string (language_id);
language_id = gtk_source_language_get_id (language);
+ value_quark = g_quark_from_string (language_id);
name = gtk_source_language_get_name (language);
section = gtk_source_language_get_section (language);
tooltip = g_strdup_printf ("%s/%s", section, name);
diff --git a/mousepad/mousepad-language-action.h b/mousepad/mousepad-language-action.h
index ebcc618..de9ad4e 100644
--- a/mousepad/mousepad-language-action.h
+++ b/mousepad/mousepad-language-action.h
@@ -1,5 +1,21 @@
-#ifndef MOUSEPAD_LANGUAGE_ACTION_H_
-#define MOUSEPAD_LANGUAGE_ACTION_H_ 1
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __MOUSEPAD_LANGUAGE_ACTION_H__
+#define __MOUSEPAD_LANGUAGE_ACTION_H__ 1
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcelanguage.h>
@@ -24,4 +40,4 @@ GtkSourceLanguage *mousepad_language_action_get_language (MousepadLanguageAction
G_END_DECLS
-#endif /* MOUSEPAD_LANGUAGE_ACTION_H_ */
+#endif /* __MOUSEPAD_LANGUAGE_ACTION_H__ */
diff --git a/mousepad/mousepad-prefs-dialog.c b/mousepad/mousepad-prefs-dialog.c
index ed3a309..a011afb 100644
--- a/mousepad/mousepad-prefs-dialog.c
+++ b/mousepad/mousepad-prefs-dialog.c
@@ -1,3 +1,23 @@
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <mousepad/mousepad-prefs-dialog.h>
#include <mousepad/mousepad-prefs-dialog-ui.h>
#include <mousepad/mousepad-settings.h>
diff --git a/mousepad/mousepad-prefs-dialog.h b/mousepad/mousepad-prefs-dialog.h
index 01e1c60..716521d 100644
--- a/mousepad/mousepad-prefs-dialog.h
+++ b/mousepad/mousepad-prefs-dialog.h
@@ -1,5 +1,21 @@
-#ifndef MOUSEPADPREFSDIALOG_H_
-#define MOUSEPADPREFSDIALOG_H_ 1
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __MOUSEPAD_PREFS_DIALOG_H__
+#define __MOUSEPAD_PREFS_DIALOG_H__ 1
#include <gtk/gtk.h>
@@ -21,4 +37,4 @@ GtkWidget *mousepad_prefs_dialog_new (void);
G_END_DECLS
-#endif /* MOUSEPADPREFSDIALOG_H_ */
+#endif /* __MOUSEPAD_PREFS_DIALOG_H__ */
diff --git a/mousepad/mousepad-settings-store.c b/mousepad/mousepad-settings-store.c
index 16c13ae..35a6fc2 100644
--- a/mousepad/mousepad-settings-store.c
+++ b/mousepad/mousepad-settings-store.c
@@ -1,4 +1,24 @@
-#include "mousepad-settings-store.h"
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <mousepad/mousepad-settings-store.h>
diff --git a/mousepad/mousepad-settings-store.h b/mousepad/mousepad-settings-store.h
index 451ed77..a29ceeb 100644
--- a/mousepad/mousepad-settings-store.h
+++ b/mousepad/mousepad-settings-store.h
@@ -1,5 +1,21 @@
-#ifndef MOUSEPAD_SETTINGS_STORE_H_
-#define MOUSEPAD_SETTINGS_STORE_H_ 1
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __MOUSEPAD_SETTINGS_STORE_H__
+#define __MOUSEPAD_SETTINGS_STORE_H__ 1
#include <gio/gio.h>
@@ -35,4 +51,4 @@ gboolean mousepad_settings_store_lookup (MousepadSettings
G_END_DECLS
-#endif /* MOUSEPAD_SETTINGS_STORE_H_ */
+#endif /* __MOUSEPAD_SETTINGS_STORE_H__ */
diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c
index 6d28b8e..0058318 100644
--- a/mousepad/mousepad-settings.c
+++ b/mousepad/mousepad-settings.c
@@ -1,3 +1,23 @@
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <mousepad/mousepad-private.h>
#include <mousepad/mousepad-settings.h>
#include <mousepad/mousepad-settings-store.h>
diff --git a/mousepad/mousepad-settings.h b/mousepad/mousepad-settings.h
index a30cc69..6b530eb 100644
--- a/mousepad/mousepad-settings.h
+++ b/mousepad/mousepad-settings.h
@@ -1,5 +1,21 @@
-#ifndef MOUSEPAD_SETTINGS_H_
-#define MOUSEPAD_SETTINGS_H_ 1
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __MOUSEPAD_SETTINGS_H__
+#define __MOUSEPAD_SETTINGS_H__ 1
#include <glib-object.h>
#include <gio/gio.h>
@@ -136,4 +152,4 @@ void mousepad_setting_set_enum (const gchar *path,
G_END_DECLS
-#endif /* MOUSEPAD_SETTINGS_H_ */
+#endif /* __MOUSEPAD_SETTINGS_H__ */
diff --git a/mousepad/mousepad-style-scheme-action.c b/mousepad/mousepad-style-scheme-action.c
index 48f08a0..074fdc6 100644
--- a/mousepad/mousepad-style-scheme-action.c
+++ b/mousepad/mousepad-style-scheme-action.c
@@ -1,5 +1,21 @@
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
#include <mousepad/mousepad-style-scheme-action.h>
diff --git a/mousepad/mousepad-style-scheme-action.h b/mousepad/mousepad-style-scheme-action.h
index ca9f10f..c71db9a 100644
--- a/mousepad/mousepad-style-scheme-action.h
+++ b/mousepad/mousepad-style-scheme-action.h
@@ -1,5 +1,21 @@
-#ifndef MOUSEPAD_STYLESCHEME_ACTION_H_
-#define MOUSEPAD_STYLESCHEME_ACTION_H_ 1
+/*
+ * 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 the Free
+ * Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __MOUSEPAD_STYLESCHEME_ACTION_H__
+#define __MOUSEPAD_STYLESCHEME_ACTION_H__ 1
#include <gtk/gtk.h>
#include <gtksourceview/gtksourcestylescheme.h>
@@ -24,4 +40,4 @@ GtkSourceStyleScheme *mousepad_style_scheme_action_get_style_scheme (MousepadSty
G_END_DECLS
-#endif /* MOUSEPAD_STYLESCHEME_ACTION_H_ */
+#endif /* __MOUSEPAD_STYLESCHEME_ACTION_H__ */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4fc42ad..e175eb3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@
# Sources
#
mousepad/main.c
+mousepad/mousepad-action-group.c
mousepad/mousepad-application.c
mousepad/mousepad-dbus.c
mousepad/mousepad-dialogs.c
@@ -9,6 +10,7 @@ mousepad/mousepad-document.c
mousepad/mousepad-encoding-dialog.c
mousepad/mousepad-encoding.c
mousepad/mousepad-file.c
+mousepad/mousepad-language-action.c
mousepad/mousepad-prefs-dialog.c
mousepad/mousepad-prefs-dialog.glade
mousepad/mousepad-print.c
@@ -17,6 +19,7 @@ mousepad/mousepad-search-bar.c
mousepad/mousepad-settings.c
mousepad/mousepad-settings-store.c
mousepad/mousepad-statusbar.c
+mousepad/mousepad-style-scheme-action.c
mousepad/mousepad-util.c
mousepad/mousepad-view.c
mousepad/mousepad-window.c
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list