Merge branch 'modernize' into 'master'

Avoid some deprecated Gdk/Gtk codepaths

See merge request GNOME/libgnomekbd!10

6 files changed, 29 insertions, 42 deletions

diff --git a/libgnomekbd/gkbd-indicator-config.c b/libgnomekbd/gkbd-indicator-config.c
index 80de663..7c6b573 100644
--- a/libgnomekbd/gkbd-indicator-config.c
+++ b/libgnomekbd/gkbd-indicator-config.c
@@ -174,7 +174,7 @@ gkbd_indicator_config_get_images_file (GkbdIndicatorConfig *
 				if (icon_info != NULL &&
 				    gtk_icon_info_get_filename (icon_info)
 				    == NULL) {
-					gtk_icon_info_free (icon_info);
+					g_object_unref (icon_info);
 					icon_info = NULL;
 				}
 			}
@@ -188,7 +188,7 @@ gkbd_indicator_config_get_images_file (GkbdIndicatorConfig *
 	if (icon_info != NULL) {
 		image_file =
 		    g_strdup (gtk_icon_info_get_filename (icon_info));
-		gtk_icon_info_free (icon_info);
+		g_object_unref (icon_info);
 	}
 
 	return image_file;
diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
index a3afdf3..b33b1da 100644
--- a/libgnomekbd/gkbd-indicator.c
+++ b/libgnomekbd/gkbd-indicator.c
@@ -208,7 +208,7 @@ gkbd_indicator_prepare_drawing (GkbdIndicator * gki, int group)
 	} else {
 		char *lbl_title = NULL;
 		char *layout_name = NULL;
-		GtkWidget *align, *label;
+		GtkWidget *label;
 		static GHashTable *ln2cnt_map = NULL;
 
 		layout_name =
@@ -220,8 +220,12 @@ gkbd_indicator_prepare_drawing (GkbdIndicator * gki, int group)
 							   &ln2cnt_map,
 							   layout_name);
 
-		align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
 		label = gtk_label_new (lbl_title);
+                gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+                gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+                gtk_widget_set_hexpand (label, TRUE);
+                gtk_widget_set_vexpand (label, TRUE);
+                
 		g_free (lbl_title);
 		gtk_label_set_angle (GTK_LABEL (label), gki->priv->angle);
 
@@ -232,10 +236,9 @@ gkbd_indicator_prepare_drawing (GkbdIndicator * gki, int group)
 			ln2cnt_map = NULL;
 		}
 
-		gtk_container_add (GTK_CONTAINER (align), label);
-		gtk_container_add (GTK_CONTAINER (ebox), align);
+		gtk_container_add (GTK_CONTAINER (ebox), label);
 
-		gtk_container_set_border_width (GTK_CONTAINER (align), 2);
+		gtk_container_set_border_width (GTK_CONTAINER (label), 2);
 	}
 
 	g_signal_connect (G_OBJECT (ebox),
@@ -410,7 +413,7 @@ gkbd_indicator_init (GkbdIndicator * gki)
 	gtk_notebook_set_show_border (notebook, FALSE);
 
 	def_drawing =
-	    gtk_image_new_from_stock (GTK_STOCK_STOP,
+	    gtk_image_new_from_icon_name ("process-stop",
 				      GTK_ICON_SIZE_BUTTON);
 
 	gtk_notebook_append_page (notebook, def_drawing,
diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
index c9eef82..594d3a3 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.c
+++ b/libgnomekbd/gkbd-keyboard-drawing.c
@@ -2017,15 +2017,6 @@ gkbd_keyboard_drawing_init (GkbdKeyboardDrawing * drawing)
 		g_critical
 		    ("XkbQueryExtension failed! Stuff probably won't work.");
 
-	/* XXX: this stuff probably doesn't matter.. also, gdk_screen_get_default can fail */
-	if (gtk_widget_has_screen (GTK_WIDGET (drawing)))
-		drawing->screen_num =
-		    gdk_screen_get_number (gtk_widget_get_screen
-					   (GTK_WIDGET (drawing)));
-	else
-		drawing->screen_num =
-		    gdk_screen_get_number (gdk_screen_get_default ());
-
 	alloc_render_context (drawing);
 
 	drawing->keyboard_items = NULL;
@@ -2124,13 +2115,9 @@ get_preferred_width (GtkWidget * widget,
 		     gint * minimum_width, gint * natural_width)
 {
 	GdkRectangle rect;
-	gint w, monitor;
-	GdkScreen *scr = NULL;
-
-	scr = gdk_screen_get_default ();
-	monitor = gdk_screen_get_primary_monitor (scr);
+	gint w;
 
-	gdk_screen_get_monitor_geometry (scr, monitor, &rect);
+	gdk_monitor_get_geometry (gdk_display_get_primary_monitor (gdk_display_get_default ()), &rect);
 	w = rect.width;
 	*minimum_width = *natural_width = w - (w >> 2);
 }
@@ -2315,7 +2302,7 @@ gkbd_keyboard_drawing_set_keyboard (GkbdKeyboardDrawing * drawing,
 	return TRUE;
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_keycodes (GkbdKeyboardDrawing * drawing)
 {
 	if (!drawing->xkb || drawing->xkb->names->keycodes <= 0)
@@ -2325,7 +2312,7 @@ gkbd_keyboard_drawing_get_keycodes (GkbdKeyboardDrawing * drawing)
 				     drawing->xkb->names->keycodes);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_geometry (GkbdKeyboardDrawing * drawing)
 {
 	if (!drawing->xkb || drawing->xkb->names->geometry <= 0)
@@ -2335,7 +2322,7 @@ gkbd_keyboard_drawing_get_geometry (GkbdKeyboardDrawing * drawing)
 				     drawing->xkb->names->geometry);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_symbols (GkbdKeyboardDrawing * drawing)
 {
 	if (!drawing->xkb || drawing->xkb->names->symbols <= 0)
@@ -2345,7 +2332,7 @@ gkbd_keyboard_drawing_get_symbols (GkbdKeyboardDrawing * drawing)
 				     drawing->xkb->names->symbols);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_types (GkbdKeyboardDrawing * drawing)
 {
 	if (!drawing->xkb || drawing->xkb->names->types <= 0)
@@ -2355,7 +2342,7 @@ gkbd_keyboard_drawing_get_types (GkbdKeyboardDrawing * drawing)
 				     drawing->xkb->names->types);
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 gkbd_keyboard_drawing_get_compat (GkbdKeyboardDrawing * drawing)
 {
 	if (!drawing->xkb || drawing->xkb->names->compat <= 0)
diff --git a/libgnomekbd/gkbd-keyboard-drawing.h b/libgnomekbd/gkbd-keyboard-drawing.h
index 9c87643..056157d 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.h
+++ b/libgnomekbd/gkbd-keyboard-drawing.h
@@ -145,7 +145,6 @@ struct _GkbdKeyboardDrawing {
 	guint mods;
 
 	Display *display;
-	gint screen_num;
 
 	gint xkb_event_type;
 
@@ -181,15 +180,15 @@ gboolean gkbd_keyboard_drawing_set_keyboard (GkbdKeyboardDrawing *
 void gkbd_keyboard_drawing_set_layout (GkbdKeyboardDrawing * kbdrawing,
 				       const gchar * id);
 
-G_CONST_RETURN gchar
+const gchar
     * gkbd_keyboard_drawing_get_keycodes (GkbdKeyboardDrawing * kbdrawing);
-G_CONST_RETURN gchar
+const gchar
     * gkbd_keyboard_drawing_get_geometry (GkbdKeyboardDrawing * kbdrawing);
-G_CONST_RETURN gchar
+const gchar
     * gkbd_keyboard_drawing_get_symbols (GkbdKeyboardDrawing * kbdrawing);
-G_CONST_RETURN gchar *gkbd_keyboard_drawing_get_types (GkbdKeyboardDrawing
+const gchar *gkbd_keyboard_drawing_get_types (GkbdKeyboardDrawing
 						       * kbdrawing);
-G_CONST_RETURN gchar *gkbd_keyboard_drawing_get_compat (GkbdKeyboardDrawing
+const gchar *gkbd_keyboard_drawing_get_compat (GkbdKeyboardDrawing
 							* kbdrawing);
 
 void gkbd_keyboard_drawing_set_track_modifiers (GkbdKeyboardDrawing *
diff --git a/libgnomekbd/gkbd-util.c b/libgnomekbd/gkbd-util.c
index e7fd10c..b814ddc 100644
--- a/libgnomekbd/gkbd-util.c
+++ b/libgnomekbd/gkbd-util.c
@@ -80,9 +80,9 @@ gkbd_preview_load_position (void)
 		/* default values should be treated as 
 		 * "0.75 of the screen size" */
 		GdkRectangle rect;
-		GdkScreen *scr = gdk_screen_get_default ();
-		gint w, h, monitor = gdk_screen_get_primary_monitor (scr);
-		gdk_screen_get_monitor_geometry (scr, monitor, &rect);
+		gint w, h;
+		gdk_monitor_get_geometry (gdk_display_get_primary_monitor
+                                          (gdk_display_get_default ()), &rect);
 		w = rect.width; h = rect.height;
 		rv->x = w >> 3;
 		rv->y = h >> 3;
diff --git a/test/gkbd-keyboard-drawing-test.c b/test/gkbd-keyboard-drawing-test.c
index 3a2f7f2..46f1c35 100644
--- a/test/gkbd-keyboard-drawing-test.c
+++ b/test/gkbd-keyboard-drawing-test.c
@@ -160,8 +160,6 @@ main (gint argc, gchar ** argv)
 {
 	GtkWidget *window;
 	GtkWidget *gkbd_keyboard_drawing;
-	GdkScreen *screen;
-	gint monitor;
 	GdkRectangle rect;
 	GOptionContext *context;
 	GError *error = NULL;
@@ -203,9 +201,9 @@ main (gint argc, gchar ** argv)
 	g_signal_connect (G_OBJECT (window), "destroy",
 			  G_CALLBACK (gtk_main_quit), NULL);
 
-	screen = gtk_window_get_screen (GTK_WINDOW (window));
-	monitor = gdk_screen_get_monitor_at_point (screen, 0, 0);
-	gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+	gdk_monitor_get_geometry (gdk_display_get_monitor_at_window
+                                  (gdk_window_get_display (GDK_WINDOW (window)),
+                                   (GDK_WINDOW (window))), &rect);
 	gtk_window_set_default_size (GTK_WINDOW (window),
 				     rect.width * 4 / 5,
 				     rect.height * 1 / 2);