1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
From cd2b658e83d47e8f49d1bbaf54be6433a21d3758 Mon Sep 17 00:00:00 2001
From: Luis Menina <liberforce@freeside.fr>
Date: Mon, 04 Mar 2013 17:10:26 +0000
Subject: Remove deprecated GnomeEntry.
It is replaced by GtkEntry. This means we lose the history
functionality, but that could be reimplemented using GtkComboBoxText
with an entry.
https://bugzilla.gnome.org/show_bug.cgi?id=589045
---
diff --git a/data/glade/sql.glade b/data/glade/sql.glade
index 2b12b85..f673ae0 100644
--- a/data/glade/sql.glade
+++ b/data/glade/sql.glade
@@ -165,24 +165,16 @@
</child>
<child>
- <widget class="GnomeEntry" id="server_entry">
+ <widget class="GtkEntry" id="server_entry">
<property name="visible">True</property>
- <property name="history_id">database_server</property>
- <property name="max_saved">10</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="combo-entry1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -194,24 +186,16 @@
</child>
<child>
- <widget class="GnomeEntry" id="user_entry">
+ <widget class="GtkEntry" id="user_entry">
<property name="visible">True</property>
- <property name="history_id">database_user</property>
- <property name="max_saved">10</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="combo-entry2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -248,24 +232,16 @@
</child>
<child>
- <widget class="GnomeEntry" id="db_entry">
+ <widget class="GtkEntry" id="db_entry">
<property name="visible">True</property>
- <property name="history_id">database_name</property>
- <property name="max_saved">10</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="combo-entry3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">True</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
diff --git a/src/planner-sql-plugin.c b/src/planner-sql-plugin.c
index 14a088c..ea2f46a 100644
--- a/src/planner-sql-plugin.c
+++ b/src/planner-sql-plugin.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <glib.h>
#include <glib/gi18n.h>
-#include <libgnomeui/gnome-entry.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <libgda/libgda.h>
@@ -950,12 +949,9 @@ sql_plugin_retrieve_db_values (PlannerPlugin *plugin,
gtk_window_set_title (GTK_WINDOW (dialog), title);
- server_entry = gnome_entry_gtk_entry (
- GNOME_ENTRY (glade_xml_get_widget (gui, "server_entry")));
- db_entry = gnome_entry_gtk_entry (
- GNOME_ENTRY (glade_xml_get_widget (gui, "db_entry")));
- user_entry = gnome_entry_gtk_entry (
- GNOME_ENTRY (glade_xml_get_widget (gui, "user_entry")));
+ server_entry = glade_xml_get_widget (gui, "server_entry");
+ db_entry = glade_xml_get_widget (gui, "db_entry");
+ user_entry = glade_xml_get_widget (gui, "user_entry");
password_entry = glade_xml_get_widget (gui, "password_entry");
str = planner_conf_get_string (CONF_SERVER, NULL);
--
cgit v0.9.2
|
