Skip to content

Commit 6b7875b

Browse files
yetistraveit65
yetist
authored and
raveit65
committed
Avoid compile warning for g_type_class_add_private
- capplet/gsm-app-dialog.c - capplet/gsm-app-dialog.h - capplet/gsm-properties-dialog.c - capplet/gsm-properties-dialog.h - capplet/gsp-app-manager.c - capplet/gsp-app-manager.h - capplet/gsp-app.c - capplet/gsp-app.h - mate-session/gsm-app.c - mate-session/gsm-app.h - mate-session/gsm-autostart-app.c - mate-session/gsm-autostart-app.h - mate-session/gsm-client.c - mate-session/gsm-client.h - mate-session/gsm-consolekit.c - mate-session/gsm-consolekit.h - mate-session/gsm-dbus-client.c - mate-session/gsm-dbus-client.h - mate-session/gsm-inhibit-dialog.c - mate-session/gsm-inhibit-dialog.h - mate-session/gsm-inhibitor.c - mate-session/gsm-inhibitor.h - mate-session/gsm-logout-dialog.c - mate-session/gsm-logout-dialog.h - mate-session/gsm-store.c - mate-session/gsm-store.h - mate-session/gsm-systemd.c - mate-session/gsm-systemd.h - mate-session/gsm-xsmp-client.c - mate-session/gsm-xsmp-client.h - mate-session/gsm-xsmp-server.c - mate-session/gsm-xsmp-server.h
1 parent bdec713 commit 6b7875b

32 files changed

Lines changed: 1486 additions & 1513 deletions

‎capplet/gsm-app-dialog.c‎

Lines changed: 40 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,15 @@
3535
#define CAPPLET_COMMENT_ENTRY_WIDGET_NAME "session_properties_comment_entry"
3636
#define CAPPLET_BROWSE_WIDGET_NAME "session_properties_browse_button"
3737

38-
#define GSM_APP_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_APP_DIALOG, GsmAppDialogPrivate))
39-
4038
#ifdef __GNUC__
4139
#define UNUSED_VARIABLE __attribute__ ((unused))
4240
#else
4341
#define UNUSED_VARIABLE
4442
#endif
4543

46-
struct GsmAppDialogPrivate
44+
struct _GsmAppDialog
4745
{
46+
GtkDialog parent;
4847
GtkWidget *name_entry;
4948
GtkWidget *command_entry;
5049
GtkWidget *comment_entry;
@@ -56,7 +55,6 @@ struct GsmAppDialogPrivate
5655

5756
static void gsm_app_dialog_class_init (GsmAppDialogClass *klass);
5857
static void gsm_app_dialog_init (GsmAppDialog *app_dialog);
59-
static void gsm_app_dialog_finalize (GObject *object);
6058

6159
enum {
6260
PROP_0,
@@ -138,7 +136,7 @@ on_browse_button_clicked (GtkWidget *widget,
138136

139137
g_free (text);
140138

141-
gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), uri);
139+
gtk_entry_set_text (GTK_ENTRY (dialog->command_entry), uri);
142140

143141
g_free (uri);
144142
}
@@ -191,9 +189,9 @@ setup_dialog (GsmAppDialog *dialog)
191189
gtk_dialog_add_button (GTK_DIALOG (dialog),
192190
"gtk-cancel", GTK_RESPONSE_CANCEL);
193191

194-
if (dialog->priv->name == NULL
195-
&& dialog->priv->command == NULL
196-
&& dialog->priv->comment == NULL) {
192+
if (dialog->name == NULL
193+
&& dialog->command == NULL
194+
&& dialog->comment == NULL) {
197195
gtk_window_set_title (GTK_WINDOW (dialog), _("Add Startup Program"));
198196
gtk_dialog_add_button (GTK_DIALOG (dialog),
199197
"gtk-add", GTK_RESPONSE_OK);
@@ -203,37 +201,37 @@ setup_dialog (GsmAppDialog *dialog)
203201
"gtk-save", GTK_RESPONSE_OK);
204202
}
205203

206-
dialog->priv->name_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_NAME_ENTRY_WIDGET_NAME));
207-
g_signal_connect (dialog->priv->name_entry,
204+
dialog->name_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_NAME_ENTRY_WIDGET_NAME));
205+
g_signal_connect (dialog->name_entry,
208206
"activate",
209207
G_CALLBACK (on_entry_activate),
210208
dialog);
211-
if (dialog->priv->name != NULL) {
212-
gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), dialog->priv->name);
209+
if (dialog->name != NULL) {
210+
gtk_entry_set_text (GTK_ENTRY (dialog->name_entry), dialog->name);
213211
}
214212

215-
dialog->priv->browse_button = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_BROWSE_WIDGET_NAME));
216-
g_signal_connect (dialog->priv->browse_button,
213+
dialog->browse_button = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_BROWSE_WIDGET_NAME));
214+
g_signal_connect (dialog->browse_button,
217215
"clicked",
218216
G_CALLBACK (on_browse_button_clicked),
219217
dialog);
220218

221-
dialog->priv->command_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMAND_ENTRY_WIDGET_NAME));
222-
g_signal_connect (dialog->priv->command_entry,
219+
dialog->command_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMAND_ENTRY_WIDGET_NAME));
220+
g_signal_connect (dialog->command_entry,
223221
"activate",
224222
G_CALLBACK (on_entry_activate),
225223
dialog);
226-
if (dialog->priv->command != NULL) {
227-
gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), dialog->priv->command);
224+
if (dialog->command != NULL) {
225+
gtk_entry_set_text (GTK_ENTRY (dialog->command_entry), dialog->command);
228226
}
229227

230-
dialog->priv->comment_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMENT_ENTRY_WIDGET_NAME));
231-
g_signal_connect (dialog->priv->comment_entry,
228+
dialog->comment_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMENT_ENTRY_WIDGET_NAME));
229+
g_signal_connect (dialog->comment_entry,
232230
"activate",
233231
G_CALLBACK (on_entry_activate),
234232
dialog);
235-
if (dialog->priv->comment != NULL) {
236-
gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), dialog->priv->comment);
233+
if (dialog->comment != NULL) {
234+
gtk_entry_set_text (GTK_ENTRY (dialog->comment_entry), dialog->comment);
237235
}
238236

239237
if (xml != NULL) {
@@ -249,8 +247,8 @@ gsm_app_dialog_constructor (GType type,
249247
GsmAppDialog *dialog;
250248

251249
dialog = GSM_APP_DIALOG (G_OBJECT_CLASS (gsm_app_dialog_parent_class)->constructor (type,
252-
n_construct_app,
253-
construct_app));
250+
n_construct_app,
251+
construct_app));
254252

255253
setup_dialog (dialog);
256254

@@ -267,12 +265,12 @@ gsm_app_dialog_dispose (GObject *object)
267265

268266
dialog = GSM_APP_DIALOG (object);
269267

270-
g_free (dialog->priv->name);
271-
dialog->priv->name = NULL;
272-
g_free (dialog->priv->command);
273-
dialog->priv->command = NULL;
274-
g_free (dialog->priv->comment);
275-
dialog->priv->comment = NULL;
268+
g_free (dialog->name);
269+
dialog->name = NULL;
270+
g_free (dialog->command);
271+
dialog->command = NULL;
272+
g_free (dialog->comment);
273+
dialog->comment = NULL;
276274

277275
G_OBJECT_CLASS (gsm_app_dialog_parent_class)->dispose (object);
278276
}
@@ -283,9 +281,9 @@ gsm_app_dialog_set_name (GsmAppDialog *dialog,
283281
{
284282
g_return_if_fail (GSM_IS_APP_DIALOG (dialog));
285283

286-
g_free (dialog->priv->name);
284+
g_free (dialog->name);
287285

288-
dialog->priv->name = g_strdup (name);
286+
dialog->name = g_strdup (name);
289287
g_object_notify (G_OBJECT (dialog), "name");
290288
}
291289

@@ -295,9 +293,9 @@ gsm_app_dialog_set_command (GsmAppDialog *dialog,
295293
{
296294
g_return_if_fail (GSM_IS_APP_DIALOG (dialog));
297295

298-
g_free (dialog->priv->command);
296+
g_free (dialog->command);
299297

300-
dialog->priv->command = g_strdup (name);
298+
dialog->command = g_strdup (name);
301299
g_object_notify (G_OBJECT (dialog), "command");
302300
}
303301

@@ -307,31 +305,31 @@ gsm_app_dialog_set_comment (GsmAppDialog *dialog,
307305
{
308306
g_return_if_fail (GSM_IS_APP_DIALOG (dialog));
309307

310-
g_free (dialog->priv->comment);
308+
g_free (dialog->comment);
311309

312-
dialog->priv->comment = g_strdup (name);
310+
dialog->comment = g_strdup (name);
313311
g_object_notify (G_OBJECT (dialog), "comment");
314312
}
315313

316314
const char *
317315
gsm_app_dialog_get_name (GsmAppDialog *dialog)
318316
{
319317
g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL);
320-
return gtk_entry_get_text (GTK_ENTRY (dialog->priv->name_entry));
318+
return gtk_entry_get_text (GTK_ENTRY (dialog->name_entry));
321319
}
322320

323321
const char *
324322
gsm_app_dialog_get_command (GsmAppDialog *dialog)
325323
{
326324
g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL);
327-
return gtk_entry_get_text (GTK_ENTRY (dialog->priv->command_entry));
325+
return gtk_entry_get_text (GTK_ENTRY (dialog->command_entry));
328326
}
329327

330328
const char *
331329
gsm_app_dialog_get_comment (GsmAppDialog *dialog)
332330
{
333331
g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL);
334-
return gtk_entry_get_text (GTK_ENTRY (dialog->priv->comment_entry));
332+
return gtk_entry_get_text (GTK_ENTRY (dialog->comment_entry));
335333
}
336334

337335
static void
@@ -368,13 +366,13 @@ gsm_app_dialog_get_property (GObject *object,
368366

369367
switch (prop_id) {
370368
case PROP_NAME:
371-
g_value_set_string (value, dialog->priv->name);
369+
g_value_set_string (value, dialog->name);
372370
break;
373371
case PROP_COMMAND:
374-
g_value_set_string (value, dialog->priv->command);
372+
g_value_set_string (value, dialog->command);
375373
break;
376374
case PROP_COMMENT:
377-
g_value_set_string (value, dialog->priv->comment);
375+
g_value_set_string (value, dialog->comment);
378376
break;
379377
default:
380378
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -391,7 +389,6 @@ gsm_app_dialog_class_init (GsmAppDialogClass *klass)
391389
object_class->set_property = gsm_app_dialog_set_property;
392390
object_class->constructor = gsm_app_dialog_constructor;
393391
object_class->dispose = gsm_app_dialog_dispose;
394-
object_class->finalize = gsm_app_dialog_finalize;
395392

396393
g_object_class_install_property (object_class,
397394
PROP_NAME,
@@ -414,30 +411,12 @@ gsm_app_dialog_class_init (GsmAppDialogClass *klass)
414411
"comment",
415412
NULL,
416413
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
417-
418-
g_type_class_add_private (klass, sizeof (GsmAppDialogPrivate));
419414
}
420415

421416
static void
422417
gsm_app_dialog_init (GsmAppDialog *dialog)
423418
{
424419

425-
dialog->priv = GSM_APP_DIALOG_GET_PRIVATE (dialog);
426-
}
427-
428-
static void
429-
gsm_app_dialog_finalize (GObject *object)
430-
{
431-
GsmAppDialog *dialog;
432-
433-
g_return_if_fail (object != NULL);
434-
g_return_if_fail (GSM_IS_APP_DIALOG (object));
435-
436-
dialog = GSM_APP_DIALOG (object);
437-
438-
g_return_if_fail (dialog->priv != NULL);
439-
440-
G_OBJECT_CLASS (gsm_app_dialog_parent_class)->finalize (object);
441420
}
442421

443422
GtkWidget *

‎capplet/gsm-app-dialog.h‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,10 @@
2424
#include <glib-object.h>
2525
#include <gtk/gtk.h>
2626

27-
#ifdef __cplusplus
28-
extern "C" {
29-
#endif
27+
G_BEGIN_DECLS
3028

31-
#define GSM_TYPE_APP_DIALOG (gsm_app_dialog_get_type ())
32-
#define GSM_APP_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_APP_DIALOG, GsmAppDialog))
33-
#define GSM_APP_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_APP_DIALOG, GsmAppDialogClass))
34-
#define GSM_IS_APP_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_APP_DIALOG))
35-
#define GSM_IS_APP_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_APP_DIALOG))
36-
#define GSM_APP_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_APP_DIALOG, GsmAppDialogClass))
37-
38-
typedef struct GsmAppDialogPrivate GsmAppDialogPrivate;
39-
40-
typedef struct
41-
{
42-
GtkDialog parent;
43-
GsmAppDialogPrivate *priv;
44-
} GsmAppDialog;
45-
46-
typedef struct
47-
{
48-
GtkDialogClass parent_class;
49-
} GsmAppDialogClass;
50-
51-
GType gsm_app_dialog_get_type (void);
29+
#define GSM_TYPE_APP_DIALOG (gsm_app_dialog_get_type ())
30+
G_DECLARE_FINAL_TYPE (GsmAppDialog, gsm_app_dialog, GSM, APP_DIALOG, GtkDialog)
5231

5332
GtkWidget * gsm_app_dialog_new (const char *name,
5433
const char *command,
@@ -63,8 +42,6 @@ const char * gsm_app_dialog_get_name (GsmAppDialog *dialog);
6342
const char * gsm_app_dialog_get_command (GsmAppDialog *dialog);
6443
const char * gsm_app_dialog_get_comment (GsmAppDialog *dialog);
6544

66-
#ifdef __cplusplus
67-
}
68-
#endif
45+
G_END_DECLS
6946

7047
#endif /* __GSM_APP_DIALOG_H */

0 commit comments

Comments
 (0)