Rely more on libDesktop's compatibility layer
This commit is contained in:
parent
9b9f7439ed
commit
71711a0a63
|
@ -311,11 +311,7 @@ Compose * compose_new(Config * config)
|
|||
#endif
|
||||
g_signal_connect_swapped(G_OBJECT(compose->window), "delete-event",
|
||||
G_CALLBACK(_compose_on_closex), compose);
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
|
||||
#else
|
||||
vbox = gtk_vbox_new(FALSE, 0);
|
||||
#endif
|
||||
/* menubar */
|
||||
#ifndef EMBEDDED
|
||||
widget = desktop_menubar_create(_compose_menubar, compose, group);
|
||||
|
@ -349,13 +345,9 @@ Compose * compose_new(Config * config)
|
|||
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
|
||||
gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
|
||||
/* paned */
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
|
||||
# if GTK_CHECK_VERSION(3, 16, 0)
|
||||
#if GTK_CHECK_VERSION(3, 16, 0)
|
||||
gtk_paned_set_wide_handle(GTK_PANED(vpaned), TRUE);
|
||||
# endif
|
||||
#else
|
||||
vpaned = gtk_vpaned_new();
|
||||
#endif
|
||||
if(gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &size, &size) != TRUE)
|
||||
size = 24;
|
||||
|
@ -412,11 +404,7 @@ Compose * compose_new(Config * config)
|
|||
gtk_container_add(GTK_CONTAINER(widget), compose->h_view);
|
||||
gtk_paned_add1(GTK_PANED(vpaned), widget);
|
||||
/* paned */
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
|
||||
#else
|
||||
vbox2 = gtk_vbox_new(FALSE, 0);
|
||||
#endif
|
||||
/* subject */
|
||||
toolbar = gtk_toolbar_new();
|
||||
widget = gtk_label_new(_("Subject: "));
|
||||
|
@ -1131,11 +1119,7 @@ static int _send_mail(Compose * compose, char * msg, size_t msg_len)
|
|||
GTK_WINDOW(compose->window));
|
||||
g_signal_connect_swapped(G_OBJECT(compose->snd_window), "delete-event",
|
||||
G_CALLBACK(_on_send_closex), compose);
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
|
||||
#else
|
||||
hbox = gtk_hbox_new(FALSE, 0);
|
||||
#endif
|
||||
gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("Progress: ")),
|
||||
FALSE, FALSE, 0);
|
||||
compose->snd_progress = gtk_progress_bar_new();
|
||||
|
|
Loading…
Reference in New Issue
Block a user