diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-28 21:13:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:29 -0500 |
| commit | a4e7bf3a89a986f0055bb8b6c6890449ca405f39 (patch) | |
| tree | 7749f209fd32079a26abb237a2908dd4c6c51baf /source4/gtk | |
| parent | 5a67b508d8f8761f0a73c2f7a116be1693d73395 (diff) | |
| download | samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.tar.gz samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.tar.bz2 samba-a4e7bf3a89a986f0055bb8b6c6890449ca405f39.zip | |
r11382: Require number of required M4 macros
Make MODULE handling a bit more like BINARY, LIBRARY and SUBSYSTEM
Add some more PUBLIC_HEADERS
(This used to be commit 875eb8f4cc658e6aebab070029fd499a726ad520)
Diffstat (limited to 'source4/gtk')
| -rw-r--r-- | source4/gtk/config.m4 | 20 | ||||
| -rw-r--r-- | source4/gtk/config.mk | 1 | ||||
| -rw-r--r-- | source4/gtk/tools/gregedit.c | 14 |
3 files changed, 19 insertions, 16 deletions
diff --git a/source4/gtk/config.m4 b/source4/gtk/config.m4 index 8338470bf9..c15d93ddef 100644 --- a/source4/gtk/config.m4 +++ b/source4/gtk/config.m4 @@ -1,17 +1,17 @@ dnl # LIB GTK SMB subsystem SMB_EXT_LIB_FROM_PKGCONFIG(gtk, [glib-2.0 gtk+-2.0 >= 2.4]) -SMB_SUBSYSTEM_ENABLE(GTKSMB, NO) -SMB_BINARY_ENABLE(gregedit, NO) -SMB_BINARY_ENABLE(gwcrontab, NO) -SMB_BINARY_ENABLE(gwsam, NO) -SMB_BINARY_ENABLE(gepdump, NO) +SMB_ENABLE(GTKSMB, NO) +SMB_ENABLE(gregedit, NO) +SMB_ENABLE(gwcrontab, NO) +SMB_ENABLE(gwsam, NO) +SMB_ENABLE(gepdump, NO) if test t$SMB_EXT_LIB_ENABLE_gtk = tYES; then - SMB_SUBSYSTEM_ENABLE(GTKSMB, YES) - SMB_BINARY_ENABLE(gregedit, YES) - SMB_BINARY_ENABLE(gwcrontab, YES) - SMB_BINARY_ENABLE(gwsam, YES) - SMB_BINARY_ENABLE(gepdump, YES) + SMB_ENABLE(GTKSMB, YES) + SMB_ENABLE(gregedit, YES) + SMB_ENABLE(gwcrontab, YES) + SMB_ENABLE(gwsam, YES) + SMB_ENABLE(gepdump, YES) AC_DEFINE(HAVE_GTK, 1, [Whether GTK+ is available]) fi diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk index 62697743ba..da3ee1353d 100644 --- a/source4/gtk/config.mk +++ b/source4/gtk/config.mk @@ -7,6 +7,7 @@ MAJOR_VERSION = 0 MINOR_VERSION = 0 RELEASE_VERSION = 1 NOPROTO = YES +PUBLIC_HEADERS = common/gtk-smb.h common/select.h INIT_OBJ_FILES = common/gtk-smb.o ADD_OBJ_FILES = common/select.o \ common/gtk_events.o \ diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c index ae34bf2745..57a30c091e 100644 --- a/source4/gtk/tools/gregedit.c +++ b/source4/gtk/tools/gregedit.c @@ -545,11 +545,12 @@ static void on_value_activate(GtkTreeView *treeview, GtkTreePath *arg1, if (result == GTK_RESPONSE_OK) { WERROR error; - struct registry_value *val; + DATA_BLOB data; + uint32_t data_type; - reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &val->data_type, &val->data); + reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &data_type, &data); - error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), val->data_type, val->data); + error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), data_type, data); if (!W_ERROR_IS_OK(error)) { gtk_show_werror(NULL, "Error while setting value", error); @@ -566,11 +567,12 @@ static void on_set_value_activate(GtkMenuItem *menuitem, gpointer user_data) if (result == GTK_RESPONSE_OK) { WERROR error; - struct registry_value *val; + uint32_t data_type; + DATA_BLOB data; - reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &val->data_type, &val->data); + reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &data_type, &data); - error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), val->data_type, val->data); + error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), data_type, data); if (!W_ERROR_IS_OK(error)) { gtk_show_werror(NULL, "Error while setting value", error); |