[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18835 - gnunet-gtk/src/lib
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18835 - gnunet-gtk/src/lib |
Date: |
Mon, 26 Dec 2011 21:03:46 +0100 |
Author: grothoff
Date: 2011-12-26 21:03:46 +0100 (Mon, 26 Dec 2011)
New Revision: 18835
Modified:
gnunet-gtk/src/lib/about.c
Log:
-remove unnecessary bad early NULLing
Modified: gnunet-gtk/src/lib/about.c
===================================================================
--- gnunet-gtk/src/lib/about.c 2011-12-26 20:02:34 UTC (rev 18834)
+++ gnunet-gtk/src/lib/about.c 2011-12-26 20:03:46 UTC (rev 18835)
@@ -26,20 +26,24 @@
*/
#include "gnunet_gtk.h"
+
static void
destroy_about_dialog (GtkBuilder *builder)
{
GtkWidget *ad;
+
ad = GTK_WIDGET (gtk_builder_get_object (builder, "about_window"));
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
}
+
static void
about_window_show_exclusively (GtkBuilder *builder, gchar *name)
{
GtkWidget *about_credits_notebook;
GtkWidget *about_license_scroller;
+
about_credits_notebook = GTK_WIDGET (gtk_builder_get_object (builder,
"about_credits_notebook"));
about_license_scroller = GTK_WIDGET (gtk_builder_get_object (builder,
"about_license_scroller"));
if (name == NULL)
@@ -59,6 +63,7 @@
}
}
+
G_MODULE_EXPORT void
GNUNET_GTK_about_window_realized (GtkWidget *widget, gpointer user_data)
{
@@ -66,14 +71,15 @@
GtkTextBuffer *license_contents;
gchar *license = NULL;
const char *path;
- char *license_path = NULL;
+ char *license_path;
+
license_contents = GTK_TEXT_BUFFER (gtk_builder_get_object (builder,
"license_contents"));
path = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DOCDIR);
if (path != NULL)
GNUNET_asprintf (&license_path, "%s%s", path, "COPYING");
else
license_path = GNUNET_strdup ("COPYING");
- if (g_file_get_contents (license_path, &license, NULL, NULL) && license !=
NULL)
+ if (g_file_get_contents (license_path, &license, NULL, NULL) && (license !=
NULL))
{
gtk_text_buffer_set_text (license_contents, license, -1);
g_free (license);
@@ -81,6 +87,7 @@
GNUNET_free_non_null (license_path);
}
+
G_MODULE_EXPORT void
GNUNET_GTK_about_close_button_clicked (GtkButton *widget, gpointer user_data)
{
@@ -88,6 +95,7 @@
destroy_about_dialog (builder);
}
+
G_MODULE_EXPORT gboolean
GNUNET_GTK_about_window_got_delete_event (GtkWidget *widget, GdkEvent *event,
gpointer user_data)
@@ -97,6 +105,7 @@
return FALSE;
}
+
G_MODULE_EXPORT void
GNUNET_GTK_about_credits_button_clicked (GtkButton *widget, gpointer user_data)
{
@@ -111,6 +120,7 @@
about_window_show_exclusively (builder, "about_license_scroller");
}
+
/**
* This displays an about dialog.
*
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18835 - gnunet-gtk/src/lib,
gnunet <=