aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rw-r--r--embed/Makefile.am2
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/ephy-dialog.c66
-rw-r--r--lib/widgets/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/ephy-location-action.c2
7 files changed, 25 insertions, 70 deletions
diff --git a/ChangeLog b/ChangeLog
index d62edf8e7..92d19bae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2003-11-30 Marco Pesenti Gritti <marco@gnome.org>
+
+ * embed/Makefile.am:
+ * lib/Makefile.am:
+ * lib/widgets/Makefile.am:
+ * src/Makefile.am:
+ * src/bookmarks/Makefile.am:
+
+ Readd gtk deprecates (only in maintainer mode).
+
+ * src/ephy-location-action.c: (sync_editable):
+
+ Use not deprecated api.
+
+ * lib/ephy-dialog.c: (set_value_from_info), (set_info_from_value),
+ (connect_signals), (init_props):
+
+ Remove optionmenu deprecated control.
+
2003-11-30 Christian Persch <chpe@cvs.gnome.org>
* data/epiphany-lockdown.schemas.in:
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 6be9296a0..97cb2138a 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = \
-DSHARE_DIR=\"$(pkgdatadir)\"
if MAINTAINER_MODE
-INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
endif
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5f7c74fc5..10e1fa519 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
-DSHARE_DIR=\"$(pkgdatadir)\"
if MAINTAINER_MODE
-INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
endif
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index b82b0faef..e24bca90b 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -52,7 +52,6 @@ typedef enum
PT_TOGGLEBUTTON,
PT_RADIOBUTTON,
PT_SPINBUTTON,
- PT_OPTIONMENU,
PT_COMBOBOX,
PT_EDITABLE,
PT_UNKNOWN
@@ -264,34 +263,6 @@ set_value_from_editable (PropertyInfo *info, GValue *value)
}
static void
-set_value_from_optionmenu (PropertyInfo *info, GValue *value)
-{
- int index;
-
- g_return_if_fail (GTK_IS_OPTION_MENU (info->widget));
-
- index = gtk_option_menu_get_history (GTK_OPTION_MENU (info->widget));
- g_return_if_fail (index >= 0);
-
- g_value_init (value, info->data_type);
-
- if (info->data_type == G_TYPE_STRING)
- {
- g_return_if_fail (info->string_enum != NULL);
-
- g_value_set_string (value, g_list_nth_data (info->string_enum, index));
- }
- else if (info->data_type == G_TYPE_INT)
- {
- g_value_set_int (value, index);
- }
- else
- {
- g_warning ("Unsupported data type for optionmenu %s\n", info->id);
- }
-}
-
-static void
set_value_from_combobox (PropertyInfo *info, GValue *value)
{
int index;
@@ -455,9 +426,6 @@ set_value_from_info (PropertyInfo *info, GValue *value)
case PT_EDITABLE:
set_value_from_editable (info, value);
break;
- case PT_OPTIONMENU:
- set_value_from_optionmenu (info, value);
- break;
case PT_COMBOBOX:
set_value_from_combobox (info, value);
break;
@@ -533,26 +501,6 @@ get_index_from_value (const GValue *value, GList *string_enum)
return index;
}
-static void
-set_optionmenu_from_value (PropertyInfo *info, const GValue *value)
-{
- int index;
-
- g_return_if_fail (GTK_IS_OPTION_MENU (info->widget));
-
- index = get_index_from_value (value, info->string_enum);
- if (index < 0)
- {
- info->sane_state = FALSE;
- g_warning ("Index < 0 when setting optionmenu %s\n", info->id);
- return;
- }
-
- info->sane_state = TRUE;
-
- gtk_option_menu_set_history (GTK_OPTION_MENU (info->widget), index);
-}
-
static gboolean
compare_values (const GValue *a, const GValue *b)
{
@@ -749,9 +697,6 @@ set_info_from_value (PropertyInfo *info, const GValue *value)
case PT_EDITABLE:
set_editable_from_value (info, value);
break;
- case PT_OPTIONMENU:
- set_optionmenu_from_value (info, value);
- break;
case PT_COMBOBOX:
set_combo_box_from_value (info, value);
break;
@@ -924,10 +869,6 @@ connect_signals (gpointer key, PropertyInfo *info, EphyDialog *dialog)
G_CALLBACK (spinbutton_changed_cb),
info);
break;
- case PT_OPTIONMENU:
- g_signal_connect (G_OBJECT (info->widget), "changed",
- G_CALLBACK (changed_cb), info);
- break;
case PT_COMBOBOX:
g_signal_connect (G_OBJECT (info->widget), "changed",
G_CALLBACK (changed_cb), info);
@@ -967,12 +908,7 @@ init_props (EphyDialog *dialog, const EphyDialogProperty *properties, GladeXML *
info->widget = glade_xml_get_widget (gxml, info->id);
- if (GTK_IS_OPTION_MENU (info->widget))
- {
- info->widget_type = PT_OPTIONMENU;
- info->data_type = G_TYPE_INT;
- }
- else if (GTK_IS_COMBO_BOX (info->widget))
+ if (GTK_IS_COMBO_BOX (info->widget))
{
info->widget_type = PT_COMBOBOX;
info->data_type = G_TYPE_INT;
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index eda2cab80..d24b82c48 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
-DSHARE_DIR=\"$(pkgdatadir)\"
if MAINTAINER_MODE
-INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
endif
diff --git a/src/Makefile.am b/src/Makefile.am
index e4c3c48be..92558f383 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
if MAINTAINER_MODE
-INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
endif
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index 25bfb1e5a..efb838d57 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -173,7 +173,7 @@ sync_editable (GtkAction *act, GParamSpec *pspec, GtkWidget *proxy)
GtkWidget *entry;
entry = GTK_BIN (proxy)->child;
- gtk_entry_set_editable (GTK_ENTRY (entry), action->priv->editable);
+ gtk_editable_set_editable (GTK_EDITABLE (entry), action->priv->editable);
}
static void
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 08:53:53 +0800