OSDN > Find Software > eb123 > SCM > git > eb123 > Commit

eb123
Fork

eb123: Commit

eb123 source

fixed various gtk3 deprecation warnings

--- a/src/audio.c

+++ b/src/audio.c

		@@ -80,7 +80,7 @@ gboolean audio_context_menu(GtkWidget w, GdkEventButton event, gpointer user_d
80	80	{
81	81	if(event->button != 3) return FALSE;
82	82	GtkWidget menu = gtk_menu_new(), item;
83		- item = gtk_image_menu_item_new_from_stock("Save_As", NULL);
	83	+ item = gtk_menu_item_new_with_label("Save As");
84	84	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(audio_save_as), user_data);
85	85	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
86	86	gtk_widget_show_all(menu);

		@@ -189,7 +189,7 @@ static void audio_init(Audio *self)
189	189	gtk_container_add(GTK_CONTAINER(self), hbox);
190	190	#ifdef ENABLE_GSTREAMER
191	191	self->play_btn = gtk_button_new();
192		- img = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_SMALL_TOOLBAR);
	192	+ img = gtk_image_new_from_icon_name(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_SMALL_TOOLBAR);
193	193	gtk_button_set_image(GTK_BUTTON(self->play_btn), img);
194	194	gtk_box_pack_start(GTK_BOX(hbox), self->play_btn, FALSE, TRUE, 0);
195	195	#else

		@@ -197,7 +197,7 @@ static void audio_init(Audio *self)
197	197	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
198	198	#endif
199	199	self->save_btn = gtk_button_new();
200		- img = gtk_image_new_from_stock("Save_As", GTK_ICON_SIZE_SMALL_TOOLBAR);
	200	+ img = gtk_image_new_from_icon_name("Save_As", GTK_ICON_SIZE_SMALL_TOOLBAR);
201	201	gtk_container_add(GTK_CONTAINER(self->save_btn), img);
202	202	gtk_box_pack_start(GTK_BOX(hbox), self->save_btn, FALSE, TRUE, 0);
203	203	}

--- a/src/builder.c

+++ b/src/builder.c

		@@ -30,7 +30,7 @@ void builder_load(Builder *self)
30	30	{
31	31	char buf[128];
32	32	memset(buf, 0, sizeof(buf));
33		- ssize_t sz = readlink("/proc/self/exe", buf, sizeof(buf));
	33	+ //ssize_t sz = readlink("/proc/self/exe", buf, sizeof(buf));
34	34	char *dir = dirname(buf);
35	35	int res = builder_load_glade_xml(self, dir);
36	36	if(!res)

--- a/src/mainwnd.c

+++ b/src/mainwnd.c

		@@ -392,7 +392,7 @@ void mainwnd_status_icon_menu_cb(GtkStatusIcon *status_icon, guint button, guint
392	392	g_signal_connect(G_OBJECT(item), "toggled", G_CALLBACK(mainwnd_scan_toggled2_cb), data);
393	393	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), scan);
394	394
395		- item = gtk_image_menu_item_new_from_stock("_Quit", NULL);
	395	+ item = gtk_menu_item_new_with_label(_("Quit"));
396	396	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
397	397	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(mainwnd_exit_btn_clicked_cb), NULL);
398	398	gtk_widget_show_all(menu);

--- a/src/render.c

+++ b/src/render.c

		@@ -106,7 +106,8 @@ gint render_get_font_size(GtkWidget *w)
106	106	if(!w)
107	107	w = GTK_WIDGET(mainwnd_get_wnd());
108	108	GtkStyleContext *context = gtk_widget_get_style_context(w);
109		- const PangoFontDescription *font_desc = gtk_style_context_get_font(context, GTK_STATE_FLAG_NORMAL);
	109	+ PangoFontDescription *font_desc;
	110	+ gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL);
110	111	gint sz = pango_font_description_get_size(font_desc)/PANGO_SCALE;
111	112	if(sz < 12) sz = 12;
112	113	return sz;

--- a/src/textview.c

+++ b/src/textview.c

		@@ -105,7 +105,7 @@ static void textview_populate_popup_cb(GtkTextView text, GtkMenu menu, gpointe
105	105	gtk_widget_show(item);
106	106	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), item);
107	107
108		- item = gtk_image_menu_item_new_from_stock("edit-find", NULL);
	108	+ item = gtk_menu_item_new_with_label(_("Find"));
109	109	gtk_widget_show(item);
110	110	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), item);
111	111	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(textview_search_selection_cb), (gpointer)text);

--- a/src/video.c

+++ b/src/video.c

		@@ -99,7 +99,7 @@ static void video_play_pause_set_icon(Video *self, gboolean play)
99	99	{
100	100	GtkWidget *image = gtk_bin_get_child(GTK_BIN(self->play_btn));
101	101	gtk_widget_destroy(image);
102		- image = gtk_image_new_from_stock(play ? GTK_STOCK_MEDIA_PAUSE : GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_SMALL_TOOLBAR);
	102	+ image = gtk_image_new_from_icon_name(play ? GTK_STOCK_MEDIA_PAUSE : GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_SMALL_TOOLBAR);
103	103	gtk_button_set_image(GTK_BUTTON(self->play_btn), image);
104	104	}
105	105

		@@ -319,7 +319,7 @@ static void video_init(Video *self)
319	319	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
320	320
321	321	self->play_btn = gtk_button_new();
322		- GtkWidget *image = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_SMALL_TOOLBAR);
	322	+ GtkWidget *image = gtk_image_new_from_icon_name(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_SMALL_TOOLBAR);
323	323	gtk_button_set_image(GTK_BUTTON(self->play_btn), image);
324	324	g_signal_connect(G_OBJECT(self->play_btn), "clicked", G_CALLBACK(video_play_pause_cb), self);
325	325	gtk_box_pack_start(GTK_BOX(hbox), self->play_btn, FALSE, TRUE, 0);

		@@ -335,7 +335,7 @@ static void video_init(Video *self)
335	335	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
336	336	#endif
337	337	self->save_btn = gtk_button_new();
338		- GtkWidget *img = gtk_image_new_from_stock("Save_As", GTK_ICON_SIZE_SMALL_TOOLBAR);
	338	+ GtkWidget *img = gtk_image_new_from_icon_name("Save_As", GTK_ICON_SIZE_SMALL_TOOLBAR);
339	339	gtk_container_add(GTK_CONTAINER(self->save_btn), img);
340	340	gtk_box_pack_start(GTK_BOX(hbox), self->save_btn, FALSE, TRUE, 0);
341	341	g_signal_connect(G_OBJECT(self->save_btn), "clicked", G_CALLBACK(video_save_as), self);