summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmate-desktop/mate-rr.c6
-rw-r--r--mate-about/mate-about.c32
-rw-r--r--mate-about/mate-about.h8
3 files changed, 21 insertions, 25 deletions
diff --git a/libmate-desktop/mate-rr.c b/libmate-desktop/mate-rr.c
index a4f9afa..e7147bc 100644
--- a/libmate-desktop/mate-rr.c
+++ b/libmate-desktop/mate-rr.c
@@ -500,10 +500,10 @@ fill_out_screen_info (Display *xdisplay,
gdk_error_trap_push ();
info->primary = XRRGetOutputPrimary (xdisplay, xroot);
#if GTK_CHECK_VERSION (3, 0, 0)
- gdk_error_trap_pop_ignored ();
+ gdk_error_trap_pop_ignored ();
#else
- gdk_flush ();
- gdk_error_trap_pop (); /* ignore error */
+ gdk_flush ();
+ gdk_error_trap_pop (); /* ignore error */
#endif
return TRUE;
diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c
index 50506e5..224f341 100644
--- a/mate-about/mate-about.c
+++ b/mate-about/mate-about.c
@@ -95,9 +95,9 @@ void mate_about_run(void)
* displayed in the about box to give credit to the translator(s). */
mate_about_dialog_set_translator_credits(mate_about_dialog, _("translator-credits"));
- #if GTK_CHECK_VERSION(3, 0, 0)
- gtk_window_set_application(GTK_WINDOW(mate_about_dialog), mate_about_application);
- #endif
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gtk_window_set_application(GTK_WINDOW(mate_about_dialog), mate_about_application);
+#endif
// start and destroy
gtk_dialog_run((GtkDialog*) mate_about_dialog);
@@ -128,25 +128,21 @@ int main(int argc, char** argv)
{
gtk_init(&argc, &argv);
- #if GTK_CHECK_VERSION(3, 0, 0)
-
- mate_about_application = gtk_application_new("org.mate.about", 0);
- g_signal_connect(mate_about_application, "activate", G_CALLBACK(mate_about_on_activate), NULL);
-
- status = g_application_run(G_APPLICATION(mate_about_application), argc, argv);
-
- g_object_unref(mate_about_application);
-
- #else
+#if GTK_CHECK_VERSION(3, 0, 0)
+ mate_about_application = gtk_application_new("org.mate.about", 0);
+ g_signal_connect(mate_about_application, "activate", G_CALLBACK(mate_about_on_activate), NULL);
- mate_about_application = g_application_new("org.mate.about", G_APPLICATION_FLAGS_NONE);
- g_signal_connect(mate_about_application, "activate", G_CALLBACK(mate_about_on_activate), NULL);
+ status = g_application_run(G_APPLICATION(mate_about_application), argc, argv);
- status = g_application_run(G_APPLICATION(mate_about_application), argc, argv);
+ g_object_unref(mate_about_application);
+#else
+ mate_about_application = g_application_new("org.mate.about", G_APPLICATION_FLAGS_NONE);
+ g_signal_connect(mate_about_application, "activate", G_CALLBACK(mate_about_on_activate), NULL);
- g_object_unref(mate_about_application);
+ status = g_application_run(G_APPLICATION(mate_about_application), argc, argv);
- #endif
+ g_object_unref(mate_about_application);
+#endif
}
return status;
diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h
index 9edf8a4..7fb903d 100644
--- a/mate-about/mate-about.h
+++ b/mate-about/mate-about.h
@@ -652,9 +652,9 @@ const char* artists[] = {
MateAboutDialog* mate_about_dialog = FALSE;
#if GTK_CHECK_VERSION(3, 0, 0)
- GtkApplication* mate_about_application;
+GtkApplication* mate_about_application;
#else
- GApplication* mate_about_application;
+GApplication* mate_about_application;
#endif
/**
@@ -667,9 +667,9 @@ void mate_about_run(void);
void mate_about_release_version(void);
#if GTK_CHECK_VERSION(3, 0, 0)
- static void mate_about_on_activate(GtkApplication* app);
+static void mate_about_on_activate(GtkApplication* app);
#else
- static void mate_about_on_activate(GApplication* app);
+static void mate_about_on_activate(GApplication* app);
#endif
// arguments definitions