DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Avoid warnings with Gtk+ 3

Browse Source
This commit is contained in:
Pierre Pronchery 2015-10-27 00:02:44 +01:00
parent 06e7fa1e0c
commit 2d98b287f3
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/common.c
View File

@ -223,8 +223,12 @@ static CommonTask * _common_task_new(BrowserPluginHelper * helper,
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(task->view), gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(task->view),
GTK_WRAP_WORD_CHAR); GTK_WRAP_WORD_CHAR);
gtk_widget_modify_font(task->view, font); gtk_widget_modify_font(task->view, font);
#if GTK_CHECK_VERSION(3, 0, 0)
gtk_container_add(GTK_CONTAINER(widget), task->view);
#else
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(widget), gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(widget),
task->view); task->view);
#endif
gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0);
task->statusbar = gtk_statusbar_new(); task->statusbar = gtk_statusbar_new();
task->statusbar_id = 0; task->statusbar_id = 0;

4
src/plugins/dirtree.c
View File

@ -153,8 +153,12 @@ static Dirtree * _dirtree_init(BrowserPluginHelper * helper)
_dirtree_on_row_activated), dirtree); _dirtree_on_row_activated), dirtree);
g_signal_connect(dirtree->view, "row-expanded", G_CALLBACK( g_signal_connect(dirtree->view, "row-expanded", G_CALLBACK(
_dirtree_on_row_expanded), dirtree); _dirtree_on_row_expanded), dirtree);
#if GTK_CHECK_VERSION(3, 0, 0)
gtk_container_add(GTK_CONTAINER(dirtree->widget), dirtree->view);
#else
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW( gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(
dirtree->widget), dirtree->view); dirtree->widget), dirtree->view);
#endif
gtk_widget_show_all(dirtree->widget); gtk_widget_show_all(dirtree->widget);
/* populate the root folder */ /* populate the root folder */
dirtree->source = g_idle_add(_dirtree_on_idle, dirtree); dirtree->source = g_idle_add(_dirtree_on_idle, dirtree);

4
src/plugins/favorites.c
View File

@ -147,8 +147,12 @@ static Favorites * _favorites_init(BrowserPluginHelper * helper)
/* signals */ /* signals */
g_signal_connect(favorites->view, "row-activated", G_CALLBACK( g_signal_connect(favorites->view, "row-activated", G_CALLBACK(
_favorites_on_row_activated), favorites); _favorites_on_row_activated), favorites);
#if GTK_CHECK_VERSION(3, 0, 0)
gtk_container_add(GTK_CONTAINER(widget), favorites->view);
#else
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(widget), gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(widget),
favorites->view); favorites->view);
#endif
gtk_box_pack_start(GTK_BOX(favorites->widget), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(favorites->widget), widget, TRUE, TRUE, 0);
/* lower toolbar */ /* lower toolbar */
widget = gtk_toolbar_new(); widget = gtk_toolbar_new();

9
src/plugins/preview.c
View File

@ -184,9 +184,14 @@ static Preview * _preview_init(BrowserPluginHelper * helper)
gtk_widget_set_no_show_all(preview->view_image, TRUE); gtk_widget_set_no_show_all(preview->view_image, TRUE);
preview->view_image_image = gtk_image_new(); preview->view_image_image = gtk_image_new();
gtk_widget_show(preview->view_image_image); gtk_widget_show(preview->view_image_image);
#if GTK_CHECK_VERSION(3, 0, 0)
gtk_container_add(GTK_CONTAINER(preview->view_image),
preview->view_image_image);
#else
gtk_scrolled_window_add_with_viewport( gtk_scrolled_window_add_with_viewport(
GTK_SCROLLED_WINDOW(preview->view_image), GTK_SCROLLED_WINDOW(preview->view_image),
preview->view_image_image); preview->view_image_image);
#endif
gtk_box_pack_start(GTK_BOX(vbox), preview->view_image, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), preview->view_image, TRUE, TRUE, 0);
/* text */ /* text */
preview->view_text = gtk_scrolled_window_new(NULL, NULL); preview->view_text = gtk_scrolled_window_new(NULL, NULL);
@ -204,8 +209,12 @@ static Preview * _preview_init(BrowserPluginHelper * helper)
gtk_widget_modify_font(widget, font); gtk_widget_modify_font(widget, font);
gtk_widget_show(widget); gtk_widget_show(widget);
pango_font_description_free(font); pango_font_description_free(font);
#if GTK_CHECK_VERSION(3, 0, 0)
gtk_container_add(GTK_CONTAINER(preview->view_text), widget);
#else
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW( gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(
preview->view_text), widget); preview->view_text), widget);
#endif
gtk_box_pack_start(GTK_BOX(vbox), preview->view_text, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), preview->view_text, TRUE, TRUE, 0);
gtk_widget_show_all(vbox); gtk_widget_show_all(vbox);
return preview; return preview;