AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'gtk-init-doc-update' into 'master'

Browse Source 
Documentation fix and whitespace cleanup

See merge request GNOME/gtk!4176
This commit is contained in:
Emmanuele Bassi 2021-11-19 13:40:07 +00:00
commit 0996113d14
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkmain.c
View File

@ -19,7 +19,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog * file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with * files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/. * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/ */
#include "config.h" #include "config.h"
@ -362,7 +362,7 @@ enum_locale_proc (LPTSTR locale)
return TRUE; return TRUE;
} }
#endif #endif
void void
@ -379,7 +379,7 @@ setlocale_initialization (void)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
/* If some of the POSIXish environment variables are set, set /* If some of the POSIXish environment variables are set, set
* the Win32 thread locale correspondingly. * the Win32 thread locale correspondingly.
*/ */
char *p = getenv ("LC_ALL"); char *p = getenv ("LC_ALL");
if (p == NULL) if (p == NULL)
p = getenv ("LANG"); p = getenv ("LANG");
@ -622,7 +622,7 @@ gtk_init_check (void)
* *
* Call this function before using any other GTK functions in your GUI * Call this function before using any other GTK functions in your GUI
* applications. It will initialize everything needed to operate the * applications. It will initialize everything needed to operate the
* toolkit and parses some standard command line options. * toolkit.
* *
* If you are using `GtkApplication`, you don't have to call gtk_init() * If you are using `GtkApplication`, you don't have to call gtk_init()
* or gtk_init_check(); the `GApplication::startup` handler * or gtk_init_check(); the `GApplication::startup` handler
@ -847,7 +847,7 @@ gtk_main_sync (void)
ClipboardStore store = { NULL, }; ClipboardStore store = { NULL, };
GSList *displays, *l; GSList *displays, *l;
GCancellable *cancel; GCancellable *cancel;
/* Try storing all clipboard data we have */ /* Try storing all clipboard data we have */
displays = gdk_display_manager_list_displays (gdk_display_manager_get ()); displays = gdk_display_manager_list_displays (gdk_display_manager_get ());
if (displays == NULL) if (displays == NULL)
@ -875,12 +875,12 @@ gtk_main_sync (void)
if (g_main_loop_is_running (store.store_loop)) if (g_main_loop_is_running (store.store_loop))
g_main_loop_run (store.store_loop); g_main_loop_run (store.store_loop);
g_cancellable_cancel (cancel); g_cancellable_cancel (cancel);
g_object_unref (cancel); g_object_unref (cancel);
g_clear_handle_id (&store.timeout_id, g_source_remove); g_clear_handle_id (&store.timeout_id, g_source_remove);
g_clear_pointer (&store.store_loop, g_main_loop_unref); g_clear_pointer (&store.store_loop, g_main_loop_unref);
/* Synchronize the recent manager singleton */ /* Synchronize the recent manager singleton */
_gtk_recent_manager_sync (); _gtk_recent_manager_sync ();
} }