[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7087 - in gnunet-gtk: po src/include src/plugins/chat src/
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7087 - in gnunet-gtk: po src/include src/plugins/chat src/plugins/fs |
Date: |
Sat, 7 Jun 2008 21:36:13 -0600 (MDT) |
Author: grothoff
Date: 2008-06-07 21:36:13 -0600 (Sat, 07 Jun 2008)
New Revision: 7087
Modified:
gnunet-gtk/po/Makefile.in
gnunet-gtk/src/include/platform.h
gnunet-gtk/src/plugins/chat/chat.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/namespace.c
gnunet-gtk/src/plugins/fs/namespace_search.c
gnunet-gtk/src/plugins/fs/search.c
Log:
fixing gcc 4.3 warnings
Modified: gnunet-gtk/po/Makefile.in
===================================================================
--- gnunet-gtk/po/Makefile.in 2008-06-08 03:28:41 UTC (rev 7086)
+++ gnunet-gtk/po/Makefile.in 2008-06-08 03:36:13 UTC (rev 7087)
@@ -20,7 +20,7 @@
top_srcdir = ..
-prefix = /home/grothoff
+prefix = /home/grothoff/
exec_prefix = ${prefix}
datadir = ${prefix}/share
localedir = $(datadir)/locale
Modified: gnunet-gtk/src/include/platform.h
===================================================================
--- gnunet-gtk/src/include/platform.h 2008-06-08 03:28:41 UTC (rev 7086)
+++ gnunet-gtk/src/include/platform.h 2008-06-08 03:36:13 UTC (rev 7087)
@@ -166,10 +166,6 @@
#define socklen_t unsigned int
#endif
-#if !HAVE_ATOLL
-long long atoll (const char *nptr);
-#endif
-
#if ENABLE_NLS
#include "langinfo.h"
#endif
Modified: gnunet-gtk/src/plugins/chat/chat.c
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.c 2008-06-08 03:28:41 UTC (rev 7086)
+++ gnunet-gtk/src/plugins/chat/chat.c 2008-06-08 03:36:13 UTC (rev 7087)
@@ -170,7 +170,7 @@
*/
void
on_closeChatButton_clicked_chat (GtkWidget * chatPage,
- GtkWidget * closeButton)
+ GtkWidget * closeButton)
{
struct GNUNET_CHAT_gui_chat_client *pos;
struct GNUNET_CHAT_gui_chat_client *prev;
@@ -192,12 +192,13 @@
else
prev->next = pos;
GNUNET_GE_ASSERT (NULL, pos != NULL);
- GNUNET_GTK_run_with_save_calls
- ((GNUNET_ThreadMainFunction)&GNUNET_CHAT_leave_room, pos->room);
+ GNUNET_GTK_run_with_save_calls
+ ((GNUNET_ThreadMainFunction) & GNUNET_CHAT_leave_room, pos->room);
chatnotebook =
- GTK_NOTEBOOK(glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"chatnotebook"));
- /* remove page from notebook */
+ GTK_NOTEBOOK (glade_xml_get_widget
+ (GNUNET_GTK_get_main_glade_XML (), "chatnotebook"));
+ /* remove page from notebook */
index = -1;
for (i = gtk_notebook_get_n_pages (chatnotebook) - 1; i >= 0; i--)
if (pos->chatFrame == gtk_notebook_get_nth_page (chatnotebook, i))
@@ -206,7 +207,7 @@
gtk_notebook_remove_page (chatnotebook, index);
UNREF (pos->chatXML);
UNREF (pos->labelXML);
- GNUNET_free(pos);
+ GNUNET_free (pos);
}
@@ -264,21 +265,17 @@
nick = GNUNET_pseudonym_id_to_name (chat_ectx, chat_cfg, &writearg.pid);
writearg.model = client->nick_model;
writearg.icon = NULL;
- if (0 == memcmp(&writearg.pid,
- &client->mypid,
- sizeof(GNUNET_HashCode)))
+ if (0 == memcmp (&writearg.pid, &client->mypid, sizeof (GNUNET_HashCode)))
{
path = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
filename =
- GNUNET_malloc (strlen (path) +
- strlen ("/../gnunet-gtk/self.png") + 2);
+ GNUNET_malloc (strlen (path) +
+ strlen ("/../gnunet-gtk/self.png") + 2);
strcpy (filename, path);
GNUNET_free (path);
strcat (filename, "/../gnunet-gtk/self.png");
- writearg.icon
- = gdk_pixbuf_new_from_file(filename,
- NULL);
- GNUNET_free(filename);
+ writearg.icon = gdk_pixbuf_new_from_file (filename, NULL);
+ GNUNET_free (filename);
}
writearg.meta = member_info;
writearg.nick = nick;
@@ -288,7 +285,7 @@
GNUNET_GTK_save_call (&remove_nick_save_call, &writearg);
GNUNET_free (nick);
if (writearg.icon != NULL)
- g_object_unref(writearg.icon);
+ g_object_unref (writearg.icon);
return GNUNET_OK;
}
@@ -302,15 +299,16 @@
GNUNET_mutex_lock (lock);
pos = list;
while ((pos != NULL) && (pos->send_button != widget) &&
- (pos->chat_entry != widget) )
+ (pos->chat_entry != widget))
pos = pos->next;
GNUNET_GE_ASSERT (NULL, pos != NULL);
message = (const char *) gtk_entry_get_text (GTK_ENTRY (pos->chat_entry));
- if (strlen(message) > 0)
- {
+ if (strlen (message) > 0)
+ {
GNUNET_CHAT_send_message (pos->room,
- message, GNUNET_CHAT_MSG_OPTION_NONE, NULL,
&seq);
+ message, GNUNET_CHAT_MSG_OPTION_NONE, NULL,
+ &seq);
gtk_entry_set_text (GTK_ENTRY (pos->chat_entry), "");
}
GNUNET_mutex_unlock (lock);
@@ -340,17 +338,15 @@
GNUNET_GTK_extract_main_widget_from_window (client->chatXML, "chatFrame");
client->labelXML =
glade_xml_new (GNUNET_GTK_get_glade_filename (),
- "chatTabLabelWindow", PACKAGE_NAME);
+ "chatTabLabelWindow", PACKAGE_NAME);
GNUNET_GTK_connect_glade_with_plugins (client->labelXML);
client->tab_label
= GNUNET_GTK_extract_main_widget_from_window (client->labelXML,
- "chatTabLabelWindow");
- label = GTK_LABEL (glade_xml_get_widget (client->labelXML,
- "chatTabLabel"));
+ "chatTabLabelWindow");
+ label = GTK_LABEL (glade_xml_get_widget (client->labelXML, "chatTabLabel"));
gtk_label_set (label, room_name);
gtk_notebook_append_page (GTK_NOTEBOOK (chatnotebook),
- client->chatFrame,
- client->tab_label);
+ client->chatFrame, client->tab_label);
gtk_widget_show (chatnotebook);
client->nick_model = gtk_list_store_new (CHAT_NUM, G_TYPE_STRING, /*
nickname */
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2008-06-08 03:28:41 UTC (rev 7086)
+++ gnunet-gtk/src/plugins/fs/fs.c 2008-06-08 03:36:13 UTC (rev 7087)
@@ -402,8 +402,7 @@
GtkWidget *entry;
GdkEventButton *event_button;
- g_return_val_if_fail (event != NULL, FALSE);
- if (event->type != GDK_BUTTON_PRESS)
+ if ((event == NULL) || (event->type != GDK_BUTTON_PRESS))
return FALSE;
event_button = (GdkEventButton *) event;
if (event_button->button != 3)
Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c 2008-06-08 03:28:41 UTC (rev
7086)
+++ gnunet-gtk/src/plugins/fs/namespace.c 2008-06-08 03:36:13 UTC (rev
7087)
@@ -217,8 +217,8 @@
renderer = gtk_cell_renderer_text_new ();
col =
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
- -1, _("Identifier"), renderer,
- "text",
+ -1, _("Identifier"),
+ renderer, "text",
IN_NAMESPACE_LAST_STRING,
NULL);
column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
@@ -230,8 +230,8 @@
renderer = gtk_cell_renderer_text_new ();
col =
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
- -1, _("Next Identifier"),
renderer,
- "text",
+ -1, _("Next Identifier"),
+ renderer, "text",
IN_NAMESPACE_NEXT_STRING,
NULL);
column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
Modified: gnunet-gtk/src/plugins/fs/namespace_search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_search.c 2008-06-08 03:28:41 UTC
(rev 7086)
+++ gnunet-gtk/src/plugins/fs/namespace_search.c 2008-06-08 03:36:13 UTC
(rev 7087)
@@ -273,7 +273,7 @@
}
else
{
- GNUNET_meta_data_destroy(dmd);
+ GNUNET_meta_data_destroy (dmd);
}
GNUNET_free (desc);
GNUNET_GTK_DEBUG_END ();
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-06-08 03:28:41 UTC (rev 7086)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-08 03:36:13 UTC (rev 7087)
@@ -597,9 +597,7 @@
GtkWidget *entry;
GdkEventButton *event_button;
- g_return_val_if_fail (event != NULL, FALSE);
-
- if (event->type != GDK_BUTTON_PRESS)
+ if ((event == NULL) || (event->type != GDK_BUTTON_PRESS))
return FALSE;
event_button = (GdkEventButton *) event;
if (event_button->button != 3)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7087 - in gnunet-gtk: po src/include src/plugins/chat src/plugins/fs,
gnunet <=