| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [enable feature] |
| 2 | |
| 3 | --- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100 |
| 4 | +++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100 |
| 5 | @@ -152,7 +152,7 @@ |
| 6 | } |
| 7 | |
| 8 | accel_group = gtk_accel_group_new(); |
| 9 | - ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group); |
| 10 | + ifactory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", accel_group); |
| 11 | gtk_item_factory_set_translate_func(ifactory, menu_translate, NULL, NULL); |
| 12 | gtk_item_factory_create_items(ifactory, nmenu_items, menu_items, NULL); |
| 13 | gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); |
| 14 | |
| 15 | --- tmp/src/window.c.orig 2007-04-23 12:14:07.000000000 +0100 |
| 16 | +++ tmp/src/window.c 2007-04-23 12:14:07.000000000 +0100 |
| 17 | @@ -18,6 +18,8 @@ |
| 18 | */ |
| 19 | |
| 20 | #include "leafpad.h" |
| 21 | +#include <libowl/owlwindowmenu.h> |
| 22 | + |
| 23 | /* |
| 24 | static void cb_scroll_event(GtkAdjustment *adj, GtkWidget *view) |
| 25 | { |
| 26 | @@ -52,7 +54,6 @@ |
| 27 | gtk_container_add(GTK_CONTAINER(window), vbox); |
| 28 | |
| 29 | menubar = create_menu_bar(window); |
| 30 | - gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); |
| 31 | |
| 32 | sw = gtk_scrolled_window_new(NULL, NULL); |
| 33 | gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), |
| 34 | |
| 35 | --- tmp/src/main.c.orig 2007-04-23 12:15:03.000000000 +0100 |
| 36 | +++ tmp/src/main.c 2007-04-23 12:15:03.000000000 +0100 |
| 37 | @@ -244,6 +244,7 @@ |
| 38 | Conf *conf; |
| 39 | GtkItemFactory *ifactory; |
| 40 | gchar *stdin_data = NULL; |
| 41 | + GtkWidget *menu; |
| 42 | |
| 43 | bindtextdomain(PACKAGE, LOCALEDIR); |
| 44 | bind_textdomain_codeset(PACKAGE, "UTF-8"); |
| 45 | @@ -293,7 +294,10 @@ |
| 46 | conf->autoindent); |
| 47 | |
| 48 | gtk_widget_show_all(pub->mw->window); |
| 49 | + owl_set_window_menu (GTK_WINDOW(pub->mw->window), |
| 50 | + GTK_MENU(pub->mw->menubar)); |
| 51 | + |
| 52 | g_free(conf->fontname); |
| 53 | g_free(conf); |
| 54 | |
| 55 | |
| 56 | --- tmp/src/Makefile.am.orig 2007-04-23 12:17:54.000000000 +0100 |
| 57 | +++ tmp/src/Makefile.am 2007-04-23 12:17:54.000000000 +0100 |
| 58 | @@ -27,4 +27,4 @@ |
| 59 | i18n.h |
| 60 | |
| 61 | leafpad_CFLAGS = $(GTK_CFLAGS) $(GNOMEPRINT_CFLAGS) |
| 62 | -leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) |
| 63 | +leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) -lowl |