[libshumate/main] Remove g_intern_static_string in use with gtk_widget_class_set_css_name




commit 6404253a6298e1271e564f9fd8e521a2fd30e0f5
Author: Corentin Noël <corentin noel collabora com>
Date:   Wed Jan 26 10:59:41 2022 +0100

    Remove g_intern_static_string in use with gtk_widget_class_set_css_name
    
    It is not really required these days.

 shumate/shumate-compass.c | 2 +-
 shumate/shumate-layer.c   | 2 +-
 shumate/shumate-license.c | 2 +-
 shumate/shumate-map.c     | 6 +++++-
 shumate/shumate-marker.c  | 2 +-
 shumate/shumate-scale.c   | 2 +-
 shumate/shumate-tile.c    | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/shumate/shumate-compass.c b/shumate/shumate-compass.c
index 32f7793..7cd8ff9 100644
--- a/shumate/shumate-compass.c
+++ b/shumate/shumate-compass.c
@@ -173,7 +173,7 @@ shumate_compass_class_init (ShumateCompassClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPERTIES, obj_properties);
 
-  gtk_widget_class_set_css_name (widget_class, g_intern_static_string ("map-compass"));
+  gtk_widget_class_set_css_name (widget_class, "map-compass");
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
 
   display = gdk_display_get_default ();
diff --git a/shumate/shumate-layer.c b/shumate/shumate-layer.c
index c2122c0..6b92f97 100644
--- a/shumate/shumate-layer.c
+++ b/shumate/shumate-layer.c
@@ -129,7 +129,7 @@ shumate_layer_class_init (ShumateLayerClass *klass)
                                      N_PROPERTIES,
                                      obj_properties);
 
-  gtk_widget_class_set_css_name (widget_class, g_intern_static_string ("map-layer"));
+  gtk_widget_class_set_css_name (widget_class, "map-layer");
 }
 
 static void
diff --git a/shumate/shumate-license.c b/shumate/shumate-license.c
index 4db7b8c..e84b1b9 100644
--- a/shumate/shumate-license.c
+++ b/shumate/shumate-license.c
@@ -169,7 +169,7 @@ shumate_license_class_init (ShumateLicenseClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPERTIES, obj_properties);
 
-  gtk_widget_class_set_css_name (widget_class, g_intern_static_string ("map-license"));
+  gtk_widget_class_set_css_name (widget_class, "map-license");
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
 
   display = gdk_display_get_default ();
diff --git a/shumate/shumate-map.c b/shumate/shumate-map.c
index deb57c2..7f314ff 100644
--- a/shumate/shumate-map.c
+++ b/shumate/shumate-map.c
@@ -814,7 +814,7 @@ shumate_map_class_init (ShumateMapClass *klass)
                   0);
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-  gtk_widget_class_set_css_name (widget_class, g_intern_static_string ("map-view"));
+  gtk_widget_class_set_css_name (widget_class, "map-view");
 
   go_to_quark = g_quark_from_static_string ("go-to");
 }
@@ -826,6 +826,7 @@ shumate_map_init (ShumateMap *self)
   GtkGesture *drag_gesture;
   GtkEventController *scroll_controller;
   GtkEventController *motion_controller;
+  GtkEventController *key_controller;
   GtkGesture *swipe_gesture;
   GtkGesture *zoom_gesture;
   GtkGesture *rotate_gesture;
@@ -875,6 +876,9 @@ shumate_map_init (ShumateMap *self)
 
   gtk_gesture_group (zoom_gesture, rotate_gesture);
 
+  key_controller = gtk_event_controller_key_new ();
+  gtk_widget_add_controller (GTK_WIDGET (self), key_controller);
+
   gtk_widget_set_overflow (GTK_WIDGET (self), GTK_OVERFLOW_HIDDEN);
 }
 
diff --git a/shumate/shumate-marker.c b/shumate/shumate-marker.c
index 59cce32..9a27287 100644
--- a/shumate/shumate-marker.c
+++ b/shumate/shumate-marker.c
@@ -280,7 +280,7 @@ shumate_marker_class_init (ShumateMarkerClass *klass)
       "latitude");
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-  gtk_widget_class_set_css_name (widget_class, g_intern_static_string ("map-marker"));
+  gtk_widget_class_set_css_name (widget_class, "map-marker");
 }
 
 static void
diff --git a/shumate/shumate-scale.c b/shumate/shumate-scale.c
index 665c9bf..4e54d7c 100644
--- a/shumate/shumate-scale.c
+++ b/shumate/shumate-scale.c
@@ -334,7 +334,7 @@ shumate_scale_class_init (ShumateScaleClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPERTIES, obj_properties);
 
-  gtk_widget_class_set_css_name (widget_class, g_intern_static_string ("map-scale"));
+  gtk_widget_class_set_css_name (widget_class, "map-scale");
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
 
   display = gdk_display_get_default ();
diff --git a/shumate/shumate-tile.c b/shumate/shumate-tile.c
index ab173e6..8c3fb3b 100644
--- a/shumate/shumate-tile.c
+++ b/shumate/shumate-tile.c
@@ -320,7 +320,7 @@ shumate_tile_class_init (ShumateTileClass *klass)
                                      N_PROPERTIES,
                                      obj_properties);
 
-  gtk_widget_class_set_css_name (widget_class, g_intern_static_string ("map-tile"));
+  gtk_widget_class_set_css_name (widget_class, "map-tile");
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]