Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

application: More code style cleanup and reorganization

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2018-01-30 01:30:59 -02:00
parent ab259fe57b
commit 503191377f
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-application.c
+13 -22
View File
@@ -583,11 +583,9 @@ on_about_response (GtkAboutDialog *about,
static gchar* static gchar*
build_about_copyright (GcalApplication *self) build_about_copyright (GcalApplication *self)
{ {
GString *builder ; /* owned */
const gchar *attribution; /* unowned */
g_autoptr (GDateTime) dt = NULL; g_autoptr (GDateTime) dt = NULL;
const gchar *attribution;
g_return_val_if_fail (GCAL_IS_APPLICATION (self), NULL); GString *builder;
builder = g_string_new ("<span size=\"small\">"); builder = g_string_new ("<span size=\"small\">");
dt = g_date_time_new_now_local (); dt = g_date_time_new_now_local ();
@@ -598,7 +596,7 @@ build_about_copyright (GcalApplication *self)
g_date_time_get_year (dt)); g_date_time_get_year (dt));
attribution = gcal_weather_service_get_attribution (self->weather_service); attribution = gcal_weather_service_get_attribution (self->weather_service);
if (attribution != NULL) if (attribution)
{ {
g_string_append_c (builder, '\n'); g_string_append_c (builder, '\n');
g_string_append (builder, attribution); g_string_append (builder, attribution);
@@ -613,8 +611,10 @@ gcal_application_show_about (GSimpleAction *simple,
GVariant *parameter, GVariant *parameter,
gpointer user_data) gpointer user_data)
{ {
GcalApplication *self; /* unowned */ GcalApplication *self;
GtkWidget *dialog; /* owned */ GtkWidget *dialog;
GtkLabel *copyright_label;
g_autofree gchar *copyright = NULL;
const gchar *authors[] = { const gchar *authors[] = {
"Erick Pérez Castellanos <erickpc@gnome.org>", "Erick Pérez Castellanos <erickpc@gnome.org>",
@@ -646,19 +646,12 @@ gcal_application_show_about (GSimpleAction *simple,
"translator-credits", _("translator-credits"), "translator-credits", _("translator-credits"),
NULL); NULL);
/* Poke AboutDialog internals to display links in copyright = build_about_copyright (self);
* attributions. This workaround is also used by copyright_label = GTK_LABEL (gtk_widget_get_template_child (GTK_WIDGET (dialog),
* gnome-weather. GTK_TYPE_ABOUT_DIALOG,
*/ "copyright_label"));
{ gtk_label_set_markup (copyright_label, copyright);
g_autofree gchar *copyright; gtk_widget_show (GTK_WIDGET (copyright_label));
GObject *cpyright_lbl; /* unowned */
copyright = build_about_copyright (self);
cpyright_lbl = gtk_widget_get_template_child (GTK_WIDGET (dialog), GTK_TYPE_ABOUT_DIALOG, "copyright_label");
gtk_label_set_markup (GTK_LABEL (cpyright_lbl), copyright);
gtk_widget_show (GTK_WIDGET (cpyright_lbl));
}
g_signal_connect (dialog, "response", G_CALLBACK (on_about_response), NULL); g_signal_connect (dialog, "response", G_CALLBACK (on_about_response), NULL);
gtk_widget_show (dialog); gtk_widget_show (dialog);
@@ -678,8 +671,6 @@ gcal_application_quit (GSimpleAction *simple,
GcalApplication* GcalApplication*
gcal_application_new (void) gcal_application_new (void)
{ {
g_set_application_name ("Calendar");
return g_object_new (gcal_application_get_type (), return g_object_new (gcal_application_get_type (),
"resource-base-path", "/org/gnome/calendar", "resource-base-path", "/org/gnome/calendar",
"application-id", "org.gnome.Calendar", "application-id", "org.gnome.Calendar",
src/main.c
+2
View File
@@ -33,6 +33,8 @@ main (int argc,
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
g_set_application_name ("Calendar");
app = gcal_application_new (); app = gcal_application_new ();
return g_application_run (G_APPLICATION (app), argc, argv); return g_application_run (G_APPLICATION (app), argc, argv);