]>
Commit | Line | Data |
---|---|---|
a0c5f34e JR |
1 | --- uim-1.8.6/configure.ac~ 2013-06-30 06:26:20.000000000 +0200 |
2 | +++ uim-1.8.6/configure.ac 2015-04-12 14:21:41.827256716 +0200 | |
3 | @@ -898,12 +898,12 @@ | |
4 | use_applet_gnome3="no" | |
5 | ;; | |
6 | yes|*) | |
7 | - PKG_CHECK_MODULES(APPLET_GNOME3, libpanelapplet-4.0, use_applet_gnome3="yes",use_applet_gnome3="no") | |
8 | + PKG_CHECK_MODULES(APPLET_GNOME3, libpanel-applet, use_applet_gnome3="yes",use_applet_gnome3="no") | |
9 | ;; | |
10 | esac | |
11 | ], | |
12 | [ | |
13 | - PKG_CHECK_MODULES(APPLET_GNOME3, libpanelapplet-4.0, use_applet_gnome3="yes",use_applet_gnome3="no") | |
14 | + PKG_CHECK_MODULES(APPLET_GNOME3, libpanel-applet, use_applet_gnome3="yes",use_applet_gnome3="no") | |
15 | ]) | |
16 | ||
17 | dnl **************************** | |
18 | --- uim-1.8.6/gtk3/toolbar/applet-gnome3.c~ 2013-06-30 06:26:09.000000000 +0200 | |
19 | +++ uim-1.8.6/gtk3/toolbar/applet-gnome3.c 2015-04-12 14:36:02.283917154 +0200 | |
20 | @@ -168,7 +168,7 @@ | |
21 | gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE); | |
22 | gtk_action_group_add_actions(action_group, uim_menu_actions, | |
23 | G_N_ELEMENTS(uim_menu_actions), toolbar); | |
24 | - panel_applet_setup_menu(applet, uim_menu_xml, action_group); | |
25 | + panel_applet_setup_menu(applet, uim_menu_xml, action_group, "uim"); | |
26 | #if LIBPANEL_APPLET_HAVE_SET_BACKGROUND_WIDGET | |
27 | panel_applet_set_background_widget(applet, GTK_WIDGET(applet)); | |
28 | #endif | |
29 | --- uim-1.8.6/gtk3/toolbar/Makefile.am~ 2013-06-30 06:26:09.000000000 +0200 | |
30 | +++ uim-1.8.6/gtk3/toolbar/Makefile.am 2015-04-12 14:50:19.527244281 +0200 | |
31 | @@ -18,7 +18,7 @@ | |
32 | uim_toolbar_applet_gnome3_SOURCES = applet-gnome3.c \ | |
33 | ../../gtk2/toolbar/common-gtk.c | |
34 | ||
35 | -appletdir = $(datadir)/gnome-panel/4.0/applets | |
36 | +appletdir = $(datadir)/gnome-panel/5.0/applets | |
37 | applet_DATA = UimApplet.panel-applet | |
38 | applet_in_files = $(applet_DATA:=.in) | |
39 | applet_in_in_files = $(applet_in_files:=.in) |