diff --git a/docs/reference/gdk/gdk4-wayland.toml.in b/docs/reference/gdk/gdk4-wayland.toml.in index e83984a0b7..2edf3c1a88 100644 --- a/docs/reference/gdk/gdk4-wayland.toml.in +++ b/docs/reference/gdk/gdk4-wayland.toml.in @@ -20,7 +20,7 @@ name = "basic" show_index_summary = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/" [extra] content_images = [ diff --git a/docs/reference/gdk/gdk4-x11.toml.in b/docs/reference/gdk/gdk4-x11.toml.in index e83984a0b7..2edf3c1a88 100644 --- a/docs/reference/gdk/gdk4-x11.toml.in +++ b/docs/reference/gdk/gdk4-x11.toml.in @@ -20,7 +20,7 @@ name = "basic" show_index_summary = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/" [extra] content_images = [ diff --git a/docs/reference/gdk/gdk4.toml.in b/docs/reference/gdk/gdk4.toml.in index 69d38568ca..bf3b0d8f95 100644 --- a/docs/reference/gdk/gdk4.toml.in +++ b/docs/reference/gdk/gdk4.toml.in @@ -43,7 +43,7 @@ show_index_summary = true show_class_hierarchy = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/" [extra] content_files = [ diff --git a/docs/reference/gsk/gsk4.toml.in b/docs/reference/gsk/gsk4.toml.in index 5befeaa61d..f165f7fd79 100644 --- a/docs/reference/gsk/gsk4.toml.in +++ b/docs/reference/gsk/gsk4.toml.in @@ -38,7 +38,7 @@ show_index_summary = true show_class_hierarchy = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/" [extra] content_images = [ diff --git a/docs/reference/gtk/getting_started.md b/docs/reference/gtk/getting_started.md index 761367a952..661b8b466f 100644 --- a/docs/reference/gtk/getting_started.md +++ b/docs/reference/gtk/getting_started.md @@ -170,7 +170,7 @@ activate (GtkApplication *app, box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_set_halign (box, GTK_ALIGN_CENTER); gtk_widget_set_valign (box, GTK_ALIGN_CENTER); - + gtk_window_set_child (GTK_WINDOW (window), box); button = gtk_button_new_with_label ("Hello World"); @@ -752,7 +752,7 @@ templates, resources, application menus, settings, [class@Gtk.HeaderBar], [class The full, buildable sources for these examples can be found in the `examples` directory of the GTK source distribution, or -[online](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples) in the GTK +[online](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples) in the GTK source code repository. You can build each example separately by using make with the `Makefile.example` file. For more information, see the `README` included in the examples directory. @@ -972,7 +972,7 @@ example_app_window_class_init (ExampleAppWindowClass *class) ... ``` -([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application2/exampleappwin.c)) +([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application2/exampleappwin.c)) You may have noticed that we used the `_from_resource()` variant of the function that sets a template. Now we need to use @@ -1043,7 +1043,7 @@ example_app_window_class_init (ExampleAppWindowClass *class) ... ``` -([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application3/exampleappwin.c)) +([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application3/exampleappwin.c)) Now we revisit the `example_app_window_open()` function that is called for each commandline argument, and construct a GtkTextView that we then add as a page @@ -1087,7 +1087,7 @@ example_app_window_open (ExampleAppWindow *win, ... ``` -([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application3/exampleappwin.c)) +([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application3/exampleappwin.c)) Lastly, we add a [class@Gtk.StackSwitcher] to the titlebar area in the UI file, and we tell it to display information about our stack. @@ -1188,7 +1188,7 @@ example_app_class_init (ExampleAppClass *class) ... ``` -([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application4/exampleapp.c)) +([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application4/exampleapp.c)) Our preferences menu item does not do anything yet, but the Quit menu item is fully functional. Note that it can also be activated by the usual Ctrl-Q @@ -1258,7 +1258,7 @@ example_app_window_init (ExampleAppWindow *win) ... ``` -([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application5/exampleappwin.c)) +([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application5/exampleappwin.c)) The code to connect the font setting is a little more involved, since there is no simple object property that it corresponds to, so we are not going to @@ -1429,7 +1429,7 @@ preferences_activated (GSimpleAction *action, ... ``` -([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application6/exampleapp.c)) +([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application6/exampleapp.c)) After all this work, our application can now show a preference dialog like this: @@ -1549,7 +1549,7 @@ example_app_window_init (ExampleAppWindow *win) ... ``` -([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application7/exampleappwin.c)) +([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application7/exampleappwin.c)) With the search bar, our application now looks like this: @@ -1682,7 +1682,7 @@ example_app_window_init (ExampleAppWindow *win) ... ``` -([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application8/exampleappwin.c)) +([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application8/exampleappwin.c)) What our application looks like now: @@ -1760,10 +1760,10 @@ example_app_window_init (ExampleAppWindow *win) ... ``` -([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application9/exampleappwin.c)) +([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application9/exampleappwin.c)) We also need a function that counts the lines of the currently active tab, -and updates the `lines` label. See the [full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application9/exampleappwin.c) +and updates the `lines` label. See the [full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application9/exampleappwin.c) if you are interested in the details. This brings our example application to this appearance: diff --git a/docs/reference/gtk/gtk4.toml.in b/docs/reference/gtk/gtk4.toml.in index 5ead702e4e..8ea8a58002 100644 --- a/docs/reference/gtk/gtk4.toml.in +++ b/docs/reference/gtk/gtk4.toml.in @@ -43,7 +43,7 @@ show_index_summary = true show_class_hierarchy = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/" [extra] # The same order will be used when generating the index diff --git a/docs/reference/gtk/resources.md b/docs/reference/gtk/resources.md index 93a295059c..a63a760a3b 100644 --- a/docs/reference/gtk/resources.md +++ b/docs/reference/gtk/resources.md @@ -26,7 +26,7 @@ GTK with your code applied, and run the test suite, on multiple platforms and architectures, and verify that nothing breaks. They also allow us to do proper code reviews, so we can iterate over the changes. -You should follow the [contribution guide](https://gitlab.gnome.org/GNOME/gtk/blob/master/CONTRIBUTING.md) +You should follow the [contribution guide](https://gitlab.gnome.org/GNOME/gtk/blob/main/CONTRIBUTING.md) for GTK, available on GitLab. If you want to discuss your approach before or after working on it, diff --git a/gdk/gdkkeysyms-update.pl b/gdk/gdkkeysyms-update.pl index 25d527e6cf..1c0b8e96f8 100755 --- a/gdk/gdkkeysyms-update.pl +++ b/gdk/gdkkeysyms-update.pl @@ -1,16 +1,16 @@ #!/usr/bin/env perl -# Updates https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms.h from upstream (X.org 7.x), +# Updates https://gitlab.gnome.org/GNOME/gtk/tree/main/gdk/gdkkeysyms.h from upstream (X.org 7.x), # from https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h -# +# # Author : Simos Xenitellis . # Author : Bastien Nocera # Version : 1.2 # # Input : https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h # Input : https://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h -# Output : https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms.h -# +# Output : https://gitlab.gnome.org/GNOME/gtk/tree/main/gdk/gdkkeysyms.h +# # Notes : It downloads keysymdef.h from the Internet, if not found locally, # Notes : and creates an updated gdkkeysyms.h # Notes : This version updates the source of gdkkeysyms.h from CVS to the GIT server. @@ -24,7 +24,7 @@ if ( ! -f "keysymdef.h" ) { print "Trying to download keysymdef.h from\n"; print "http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h\n"; - die "Unable to download keysymdef.h from http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h\n" + die "Unable to download keysymdef.h from http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h\n" unless system("wget -c -O keysymdef.h \"http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h\"") == 0; print " done.\n\n"; } @@ -39,7 +39,7 @@ if ( ! -f "XF86keysym.h" ) { print "Trying to download XF86keysym.h from\n"; print "http://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h\n"; - die "Unable to download keysymdef.h from http://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h\n" + die "Unable to download keysymdef.h from http://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h\n" unless system("wget -c -O XF86keysym.h \"http://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h\"") == 0; print " done.\n\n"; } @@ -82,7 +82,7 @@ print OUT_GDKKEYSYMS $LICENSE_HEADER; print OUT_GDKKEYSYMS<) $_ = $keysymelements[1]; die "Internal error, was expecting \"XC_*\", found: $_\n" if ( ! /^XK_/ ); - + $_ = $keysymelements[2]; die "Internal error, was expecting \"0x*\", found: $_\n" if ( ! /^0x/ ); diff --git a/gdk/gdkkeysyms.h b/gdk/gdkkeysyms.h index 2449fdaa34..3482d635d1 100644 --- a/gdk/gdkkeysyms.h +++ b/gdk/gdkkeysyms.h @@ -18,7 +18,7 @@ /* - * File auto-generated from script https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms-update.pl + * File auto-generated from script https://gitlab.gnome.org/GNOME/gtk/tree/main/gdk/gdkkeysyms-update.pl * using the input file * http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h * and