diff options
| author | Davyd Madeley <davyd@madeley.id.au> | 2004-08-16 08:44:41 +0000 |
|---|---|---|
| committer | Davyd Madeley <davyd@src.gnome.org> | 2004-08-16 08:44:41 +0000 |
| commit | 4db87da83b639d9e4a49e2099958749d0592306a (patch) | |
| tree | b921afe2591e28489772a436d7a2ff28735b7eee /gkb-new | |
| parent | de79155688bf4bab3026ad03c65c8e3adac44336 (diff) | |
Remove from CVS.
2004-08-16 Davyd Madeley <davyd@madeley.id.au>
* screen-exec/*: Remove from CVS.
2004-08-16 Davyd Madeley <davyd@madeley.id.au>
* src/exec.c: Removed dependancy on egg-screen-exec.h
* src/mini-commander_applet.h: Increased max command size to 505 to
compensate for added (?) that can appear before strings. Closes
#150058.
2004-08-15 Kjartan Maraas <kmaraas@gnome.org>
* configure.in: Removed reference to screen-exec
* Makefile.am: Here too.
* screen-exec/*: Remove cruft.
* configure.in: Added nb to ALL_LINGUAS.
Diffstat (limited to 'gkb-new')
| -rw-r--r-- | gkb-new/ChangeLog | 8 | ||||
| -rw-r--r-- | gkb-new/Makefile.am | 2 | ||||
| -rw-r--r-- | gkb-new/gkb-applet.c | 4 | ||||
| -rw-r--r-- | gkb-new/prop-add.c | 4 | ||||
| -rw-r--r-- | gkb-new/prop-map.c | 4 | ||||
| -rw-r--r-- | gkb-new/prop.c | 4 |
6 files changed, 16 insertions, 10 deletions
diff --git a/gkb-new/ChangeLog b/gkb-new/ChangeLog index 27d5e0ab9..551eaa7e8 100644 --- a/gkb-new/ChangeLog +++ b/gkb-new/ChangeLog @@ -1,5 +1,13 @@ 2004-08-15 Kjartan Maraas <kmaraas@gnome.org> + * Makefile.am: Remove reference to screen-exec. + * gkb-applet.c: (cb_help): Use gnome_help_*. + * prop-add.c: (response_cb): Same. + * prop-map.c: (gkb_prop_map_help_clicked): Same + * prop.c: (prophelp_cb): Same. + +2004-08-15 Kjartan Maraas <kmaraas@gnome.org> + * keygrab.c: (init_xmaps): ANSIfication. * preset.c: (find_presets): ANSIfication. diff --git a/gkb-new/Makefile.am b/gkb-new/Makefile.am index 0e1efa466..d097e2bc1 100644 --- a/gkb-new/Makefile.am +++ b/gkb-new/Makefile.am @@ -1,5 +1,4 @@ INCLUDES = \ - -I$(top_srcdir)/screen-exec \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ $(GNOME_APPLETS_CFLAGS) @@ -23,7 +22,6 @@ gkb_COMMON = \ gnome_keyboard_layout_SOURCES = $(gkb_COMMON) gnome-keyboard-layout.c gnome_keyboard_layout_LDADD = \ - $(top_builddir)/screen-exec/libscreen-exec.la \ $(GNOME_APPLETS_LIBS) $(X_LIBS) $(INTLLIBS) libgkb_a_SOURCES = $(gkb_COMMON) gkb-applet.c diff --git a/gkb-new/gkb-applet.c b/gkb-new/gkb-applet.c index c26233542..48cc0feb6 100644 --- a/gkb-new/gkb-applet.c +++ b/gkb-new/gkb-applet.c @@ -41,8 +41,8 @@ #include <libbonobo.h> #include <libgnomeui/libgnomeui.h> #include <libgnome/libgnome.h> +#include <libgnomeui/gnome-help.h> #include <panel-applet-gconf.h> -#include <egg-screen-help.h> #include "gkb.h" static void @@ -52,7 +52,7 @@ cb_help (BonoboUIComponent *uic, { GError *error = NULL; - egg_help_display_on_screen ( "gkb", NULL, + gnome_help_display_on_screen ( "gkb", NULL, gtk_widget_get_screen (gkb->applet), &error); /* FIXME: display error to the user */ } diff --git a/gkb-new/prop-add.c b/gkb-new/prop-add.c index 1a847178a..d238ad75a 100644 --- a/gkb-new/prop-add.c +++ b/gkb-new/prop-add.c @@ -34,7 +34,7 @@ #include <config.h> #endif #include "gkb.h" -#include <egg-screen-help.h> +#include <libgnomeui/gnome-help.h> typedef struct { GtkTreeIter iter; @@ -291,7 +291,7 @@ response_cb (GtkDialog *dialog, gint id, gpointer data) break; case GTK_RESPONSE_HELP: - egg_help_display_on_screen ( + gnome_help_display_on_screen ( "gkb", "gkb-modify-list", gtk_window_get_screen (GTK_WINDOW (dialog)), &error); diff --git a/gkb-new/prop-map.c b/gkb-new/prop-map.c index d12ce2436..6054d84f2 100644 --- a/gkb-new/prop-map.c +++ b/gkb-new/prop-map.c @@ -32,7 +32,7 @@ #include "gkb.h" -#include <egg-screen-help.h> +#include <libgnomeui/gnome-help.h> extern gboolean gail_loaded; static GtkWidget *label_prop_map = NULL; @@ -131,7 +131,7 @@ gkb_prop_map_help_clicked (GkbMapDialogInfo * mdi) { GError *error = NULL; - egg_help_display_on_screen ( + gnome_help_display_on_screen ( "gkb", "gkb-edit-layout", gtk_window_get_screen (GTK_WINDOW (mdi->dialog)), &error); diff --git a/gkb-new/prop.c b/gkb-new/prop.c index ec309ee26..a584ec7a5 100644 --- a/gkb-new/prop.c +++ b/gkb-new/prop.c @@ -38,7 +38,7 @@ #include <sys/stat.h> #include <X11/Xlib.h> #include <panel-applet-gconf.h> -#include <egg-screen-help.h> +#include <libgnomeui/gnome-help.h> #include "gkb.h" @@ -354,7 +354,7 @@ prophelp_cb (GtkWidget *widget, gpointer data) { GError *error = NULL; - egg_help_display_on_screen ( + gnome_help_display_on_screen ( "gkb", "gkb-prefs", gtk_widget_get_screen (widget), &error); |