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

Rely more on libDesktop for compatibility code

Browse Source
This commit is contained in:
Pierre Pronchery 2018-10-26 19:03:12 -03:00
parent b4f6b47428
commit b092cf04c7
10 changed files with 1 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/browser/browser.c
View File

@ -362,11 +362,7 @@ Browser * browser_new(GtkWidget * window, GtkAccelGroup * group,
/* widgets */ /* widgets */
browser->window = window; browser->window = window;
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0);
#endif
browser->widget = vbox; browser->widget = vbox;
/* toolbar */ /* toolbar */
toolbar = desktop_toolbar_create(_browser_toolbar, browser, group); toolbar = desktop_toolbar_create(_browser_toolbar, browser, group);
@ -473,11 +469,7 @@ Browser * browser_new(GtkWidget * window, GtkAccelGroup * group,
#endif #endif
gtk_paned_set_position(GTK_PANED(hpaned), 200); gtk_paned_set_position(GTK_PANED(hpaned), 200);
/* plug-ins */ /* plug-ins */
#if GTK_CHECK_VERSION(3, 0, 0)
browser->pl_view = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); browser->pl_view = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
browser->pl_view = gtk_vbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(browser->pl_view), 4); gtk_container_set_border_width(GTK_CONTAINER(browser->pl_view), 4);
browser->pl_store = gtk_list_store_new(BPC_COUNT, G_TYPE_STRING, browser->pl_store = gtk_list_store_new(BPC_COUNT, G_TYPE_STRING,
G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING,
@ -499,11 +491,7 @@ Browser * browser_new(GtkWidget * window, GtkAccelGroup * group,
renderer, "text", BPC_NAME_DISPLAY, NULL); renderer, "text", BPC_NAME_DISPLAY, NULL);
gtk_box_pack_start(GTK_BOX(browser->pl_view), browser->pl_combo, FALSE, gtk_box_pack_start(GTK_BOX(browser->pl_view), browser->pl_combo, FALSE,
TRUE, 0); TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
browser->pl_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); browser->pl_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
browser->pl_box = gtk_vbox_new(FALSE, 4);
#endif
gtk_box_pack_start(GTK_BOX(browser->pl_view), browser->pl_box, TRUE, gtk_box_pack_start(GTK_BOX(browser->pl_view), browser->pl_box, TRUE,
TRUE, 0); TRUE, 0);
gtk_paned_add1(GTK_PANED(hpaned), browser->pl_view); gtk_paned_add1(GTK_PANED(hpaned), browser->pl_view);
@ -1986,18 +1974,10 @@ void browser_show_preferences(Browser * browser, gboolean show)
/* notebook */ /* notebook */
notebook = gtk_notebook_new(); notebook = gtk_notebook_new();
/* appearance tab */ /* appearance tab */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(vbox), 4); gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
#if GTK_CHECK_VERSION(2, 6, 0) #if GTK_CHECK_VERSION(2, 6, 0)
# if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
# else
hbox = gtk_hbox_new(FALSE, 4);
# endif
widget = gtk_label_new(_("Default view:")); widget = gtk_label_new(_("Default view:"));
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
# if GTK_CHECK_VERSION(2, 24, 0) # if GTK_CHECK_VERSION(2, 24, 0)
@ -2037,11 +2017,7 @@ void browser_show_preferences(Browser * browser, gboolean show)
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
gtk_label_new_with_mnemonic(_("_Appearance"))); gtk_label_new_with_mnemonic(_("_Appearance")));
/* file associations tab */ /* file associations tab */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
browser->pr_mime_store = gtk_list_store_new(BMC_COUNT, GDK_TYPE_PIXBUF, browser->pr_mime_store = gtk_list_store_new(BMC_COUNT, GDK_TYPE_PIXBUF,
G_TYPE_STRING); G_TYPE_STRING);
browser->pr_mime_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL( browser->pr_mime_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(
@ -2066,11 +2042,7 @@ void browser_show_preferences(Browser * browser, gboolean show)
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(widget), browser->pr_mime_view); gtk_container_add(GTK_CONTAINER(widget), browser->pr_mime_view);
gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4);
#endif
widget = gtk_button_new_from_stock(GTK_STOCK_EDIT); widget = gtk_button_new_from_stock(GTK_STOCK_EDIT);
g_signal_connect_swapped(widget, "clicked", g_signal_connect_swapped(widget, "clicked",
G_CALLBACK(_preferences_on_mime_edit), browser); G_CALLBACK(_preferences_on_mime_edit), browser);
@ -2242,11 +2214,7 @@ static void _preferences_on_mime_edit(gpointer data)
gtk_box_set_spacing(GTK_BOX(vbox), 4); gtk_box_set_spacing(GTK_BOX(vbox), 4);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* type */ /* type */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("Type:")); widget = gtk_label_new(_("Type:"));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(widget, "halign", GTK_ALIGN_START, NULL); g_object_set(widget, "halign", GTK_ALIGN_START, NULL);
@ -2264,11 +2232,7 @@ static void _preferences_on_mime_edit(gpointer data)
gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* open */ /* open */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("Open with:")); widget = gtk_label_new(_("Open with:"));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(widget, "halign", GTK_ALIGN_START, NULL); g_object_set(widget, "halign", GTK_ALIGN_START, NULL);
@ -2285,11 +2249,7 @@ static void _preferences_on_mime_edit(gpointer data)
gtk_box_pack_start(GTK_BOX(hbox), open, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), open, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* view */ /* view */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("View with:")); widget = gtk_label_new(_("View with:"));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(widget, "halign", GTK_ALIGN_START, NULL); g_object_set(widget, "halign", GTK_ALIGN_START, NULL);
@ -2306,11 +2266,7 @@ static void _preferences_on_mime_edit(gpointer data)
gtk_box_pack_start(GTK_BOX(hbox), view, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), view, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* edit */ /* edit */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("Edit with:")); widget = gtk_label_new(_("Edit with:"));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(widget, "halign", GTK_ALIGN_START, NULL); g_object_set(widget, "halign", GTK_ALIGN_START, NULL);

4
src/browser/window.c
View File

@ -277,11 +277,7 @@ BrowserWindow * browserwindow_new(String const * directory)
} }
/* widgets */ /* widgets */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0);
#endif
/* menubar */ /* menubar */
#ifndef EMBEDDED #ifndef EMBEDDED
tb_menubar = desktop_menubar_create(_browserwindow_menubar, browser, tb_menubar = desktop_menubar_create(_browserwindow_menubar, browser,

4
src/common.c
View File

@ -293,11 +293,7 @@ static int _common_symlink(GtkWidget * window, char const * cur)
GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
if(window == NULL) if(window == NULL)
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
widget = gtk_label_new(_("Destination:")); widget = gtk_label_new(_("Destination:"));
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 4); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
widget = gtk_entry_new(); widget = gtk_entry_new();

16
src/delete.c
View File

@ -148,17 +148,9 @@ static int _delete(Prefs * prefs, unsigned int filec, char * filev[])
gtk_window_set_title(GTK_WINDOW(delete.window), _("Delete file(s)")); gtk_window_set_title(GTK_WINDOW(delete.window), _("Delete file(s)"));
g_signal_connect_swapped(delete.window, "delete-event", G_CALLBACK( g_signal_connect_swapped(delete.window, "delete-event", G_CALLBACK(
_delete_on_closex), &delete); _delete_on_closex), &delete);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4);
#endif
/* counter */ /* counter */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_image_new_from_icon_name("stock_delete", widget = gtk_image_new_from_icon_name("stock_delete",
GTK_ICON_SIZE_DIALOG); GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
@ -171,11 +163,7 @@ static int _delete(Prefs * prefs, unsigned int filec, char * filev[])
gtk_box_pack_start(GTK_BOX(hbox), delete.label, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), delete.label, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* current argument */ /* current argument */
#if GTK_CHECK_VERSION(3, 0, 0)
delete.hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); delete.hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
delete.hbox = gtk_hbox_new(FALSE, 4);
#endif
hbox = delete.hbox; hbox = delete.hbox;
gtk_widget_set_no_show_all(hbox, TRUE); gtk_widget_set_no_show_all(hbox, TRUE);
widget = gtk_label_new(_("File: ")); widget = gtk_label_new(_("File: "));
@ -201,11 +189,7 @@ static int _delete(Prefs * prefs, unsigned int filec, char * filev[])
#endif #endif
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(delete.progress), ""); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(delete.progress), "");
gtk_box_pack_start(GTK_BOX(vbox), delete.progress, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), delete.progress, TRUE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
g_signal_connect_swapped(widget, "clicked", G_CALLBACK( g_signal_connect_swapped(widget, "clicked", G_CALLBACK(
_delete_on_cancel), &delete); _delete_on_cancel), &delete);

60
src/desktop/desktop.c
View File

@ -1938,18 +1938,10 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook)
GtkWidget * label; GtkWidget * label;
GtkFileFilter * filter; GtkFileFilter * filter;
#if GTK_CHECK_VERSION(3, 0, 0)
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox2 = gtk_vbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Default color: ")); label = gtk_label_new(_("Default color: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -1961,11 +1953,7 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook)
desktop->pr_color = gtk_color_button_new(); desktop->pr_color = gtk_color_button_new();
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_color, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_color, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Wallpaper: ")); label = gtk_label_new(_("Wallpaper: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -1999,11 +1987,7 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_background, TRUE, TRUE, gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_background, TRUE, TRUE,
0); 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Position: ")); label = gtk_label_new(_("Position: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -2057,19 +2041,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
GtkWidget * label; GtkWidget * label;
size_t i; size_t i;
#if GTK_CHECK_VERSION(3, 0, 0)
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox2 = gtk_vbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* icons */ /* icons */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Layout: ")); label = gtk_label_new(_("Layout: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -2096,11 +2072,7 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ilayout, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ilayout, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* monitor */ /* monitor */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Monitor: ")); label = gtk_label_new(_("Monitor: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -2117,11 +2089,7 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_imonitor, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_imonitor, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* background color */ /* background color */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Background color: ")); label = gtk_label_new(_("Background color: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -2134,11 +2102,7 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ibcolor, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ibcolor, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* foreground color */ /* foreground color */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Foreground color: ")); label = gtk_label_new(_("Foreground color: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -2151,11 +2115,7 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ifcolor, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ifcolor, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* font */ /* font */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Font: ")); label = gtk_label_new(_("Font: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -2181,18 +2141,10 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook)
GtkWidget * widget; GtkWidget * widget;
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox2 = gtk_vbox_new(FALSE, 4);
#endif
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4);
/* selector */ /* selector */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Monitor: ")); label = gtk_label_new(_("Monitor: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -2209,11 +2161,7 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_monitors, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_monitors, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* geometry */ /* geometry */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Resolution: ")); label = gtk_label_new(_("Resolution: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -2232,11 +2180,7 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook)
0); 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* size */ /* size */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Size: ")); label = gtk_label_new(_("Size: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(label, "halign", GTK_ALIGN_START, NULL); g_object_set(label, "halign", GTK_ALIGN_START, NULL);
@ -2256,11 +2200,7 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook)
0); 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* refresh */ /* refresh */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(NULL); label = gtk_label_new(NULL);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);

12
src/desktop/desktopicon.c
View File

@ -618,11 +618,7 @@ static DesktopIcon * _desktopicon_new_do(Desktop * desktop, GdkPixbuf * image,
desktopicon->updated = TRUE; desktopicon->updated = TRUE;
/* widget */ /* widget */
desktopicon->window = NULL; desktopicon->window = NULL;
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4);
#endif
/* event */ /* event */
desktopicon->event = gtk_event_box_new(); desktopicon->event = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(desktopicon->event), gtk_event_box_set_visible_window(GTK_EVENT_BOX(desktopicon->event),
@ -1192,11 +1188,7 @@ static void _on_icon_rename(gpointer data)
vbox = GTK_DIALOG(dialog)->vbox; vbox = GTK_DIALOG(dialog)->vbox;
#endif #endif
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("Rename: ")); widget = gtk_label_new(_("Rename: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(widget, "halign", GTK_ALIGN_START, NULL); g_object_set(widget, "halign", GTK_ALIGN_START, NULL);
@ -1211,11 +1203,7 @@ static void _on_icon_rename(gpointer data)
gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* entry */ /* entry */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("To: ")); widget = gtk_label_new(_("To: "));
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
g_object_set(widget, "halign", GTK_ALIGN_START, NULL); g_object_set(widget, "halign", GTK_ALIGN_START, NULL);

12
src/move.c
View File

@ -115,19 +115,11 @@ static int _move(Prefs * prefs, unsigned int filec, char * filev[])
gtk_window_set_title(GTK_WINDOW(move.window), _("Move file(s)")); gtk_window_set_title(GTK_WINDOW(move.window), _("Move file(s)"));
g_signal_connect(G_OBJECT(move.window), "delete-event", G_CALLBACK( g_signal_connect(G_OBJECT(move.window), "delete-event", G_CALLBACK(
_move_on_closex), NULL); _move_on_closex), NULL);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4);
#endif
left = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); left = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
right = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); right = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* current argument */ /* current argument */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("Moving: ")); widget = gtk_label_new(_("Moving: "));
bold = pango_font_description_new(); bold = pango_font_description_new();
pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD); pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD);
@ -160,11 +152,7 @@ static int _move(Prefs * prefs, unsigned int filec, char * filev[])
#endif #endif
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(move.progress), ""); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(move.progress), "");
gtk_box_pack_start(GTK_BOX(vbox), move.progress, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), move.progress, TRUE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK( g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK(
_move_on_cancel), NULL); _move_on_cancel), NULL);

4
src/properties.c
View File

@ -439,11 +439,7 @@ static int _properties_load(Properties * properties, char const * name)
if(icon == NULL) if(icon == NULL)
icon = gtk_icon_theme_load_icon(properties->theme, icon = gtk_icon_theme_load_icon(properties->theme,
"gnome-settings", 24, 0, NULL); "gnome-settings", 24, 0, NULL);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
gtk_box_pack_start(GTK_BOX(hbox), gtk_image_new_from_pixbuf(icon), gtk_box_pack_start(GTK_BOX(hbox), gtk_image_new_from_pixbuf(icon),
FALSE, TRUE, 0); FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_(bpd->name)), TRUE, gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_(bpd->name)), TRUE,

4
src/view.c
View File

@ -261,11 +261,7 @@ static View * _view_new(Mime * mime, char const * filename)
gtk_window_set_title(GTK_WINDOW(view->window), buf); gtk_window_set_title(GTK_WINDOW(view->window), buf);
g_signal_connect_swapped(view->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(view->window, "delete-event", G_CALLBACK(
_view_on_closex), view); _view_on_closex), view);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0);
#endif
#ifndef EMBEDDED #ifndef EMBEDDED
widget = desktop_menubar_create( widget = desktop_menubar_create(
(mime_get_handler(mime, type, "edit") != NULL) (mime_get_handler(mime, type, "edit") != NULL)

6
tools/iconlist.c
View File

@ -28,7 +28,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h> #include <Desktop.h>
#ifndef PROGNAME #ifndef PROGNAME
# define PROGNAME "iconlist" # define PROGNAME "iconlist"
@ -118,11 +118,7 @@ static int _iconlist_do(GtkIconTheme * icontheme)
gtk_window_set_default_size(GTK_WINDOW(window), 640, 480); gtk_window_set_default_size(GTK_WINDOW(window), 640, 480);
g_signal_connect(window, "delete-event", G_CALLBACK(_on_closex), NULL); g_signal_connect(window, "delete-event", G_CALLBACK(_on_closex), NULL);
/* vbox */ /* vbox */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
vbox = gtk_vbox_new(FALSE, 0);
#endif
/* toolbar */ /* toolbar */
toolbar = gtk_toolbar_new(); toolbar = gtk_toolbar_new();
toolitem = gtk_tool_item_new(); toolitem = gtk_tool_item_new();