aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-account-chooser.h2
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.h2
-rw-r--r--libempathy-gtk/empathy-account-widget-sip.h2
-rw-r--r--libempathy-gtk/empathy-avatar-chooser.h2
-rw-r--r--libempathy-gtk/empathy-avatar-image.h2
-rw-r--r--libempathy-gtk/empathy-cell-renderer-activatable.c2
-rw-r--r--libempathy-gtk/empathy-cell-renderer-activatable.h2
-rw-r--r--libempathy-gtk/empathy-cell-renderer-expander.c2
-rw-r--r--libempathy-gtk/empathy-cell-renderer-expander.h2
-rw-r--r--libempathy-gtk/empathy-cell-renderer-text.h2
-rw-r--r--libempathy-gtk/empathy-chat-text-view.h2
-rw-r--r--libempathy-gtk/empathy-chat-view.h2
-rw-r--r--libempathy-gtk/empathy-chat.h2
-rw-r--r--libempathy-gtk/empathy-contact-list-store.h2
-rw-r--r--libempathy-gtk/empathy-contact-list-view.h2
-rw-r--r--libempathy-gtk/empathy-contact-menu.h2
-rw-r--r--libempathy-gtk/empathy-irc-network-dialog.h2
-rw-r--r--libempathy-gtk/empathy-location-manager.c2
-rw-r--r--libempathy-gtk/empathy-new-message-dialog.h2
-rw-r--r--libempathy-gtk/empathy-smiley-manager.c2
-rw-r--r--libempathy-gtk/empathy-theme-adium.c4
21 files changed, 22 insertions, 22 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index 004a3e87f..c2105406a 100644
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -25,7 +25,7 @@
#ifndef __EMPATHY_ACCOUNT_CHOOSER_H__
#define __EMPATHY_ACCOUNT_CHOOSER_H__
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
#include <libmissioncontrol/mc-account.h>
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index 6ead048eb..a89081fc0 100644
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -21,7 +21,7 @@
#ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__
#define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libmissioncontrol/mc-account.h>
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 7e8e5a216..9187c1e0c 100644
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -21,7 +21,7 @@
#ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__
#define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libmissioncontrol/mc-account.h>
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h
index f4e40a8b0..1a5023047 100644
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ b/libempathy-gtk/empathy-avatar-chooser.h
@@ -24,7 +24,7 @@
#ifndef __EMPATHY_AVATAR_CHOOSER_H__
#define __EMPATHY_AVATAR_CHOOSER_H__
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-contact.h>
diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h
index ddb446a60..2271ecc72 100644
--- a/libempathy-gtk/empathy-avatar-image.h
+++ b/libempathy-gtk/empathy-avatar-image.h
@@ -24,7 +24,7 @@
#ifndef __EMPATHY_AVATAR_IMAGE_H__
#define __EMPATHY_AVATAR_IMAGE_H__
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-contact.h>
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 2883c4ded..6c7982682 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -20,7 +20,7 @@
* Authors: Raphael Slinckx <raphael@slinckx.net>
*/
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include "empathy-cell-renderer-activatable.h"
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.h b/libempathy-gtk/empathy-cell-renderer-activatable.h
index 5962c200f..d58a082da 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.h
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.h
@@ -23,7 +23,7 @@
#ifndef __EMPATHY_CELL_RENDERER_ACTIVATABLE_H__
#define __EMPATHY_CELL_RENDERER_ACTIVATABLE_H__
-#include <gtk/gtkcellrendererpixbuf.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index 09fe8bd4f..6fb7cfded 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -29,7 +29,7 @@
* start the new one).
*/
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-utils.h>
#include "empathy-cell-renderer-expander.h"
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.h b/libempathy-gtk/empathy-cell-renderer-expander.h
index fc569ded2..00e36f545 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.h
+++ b/libempathy-gtk/empathy-cell-renderer-expander.h
@@ -23,7 +23,7 @@
#ifndef __EMPATHY_CELL_RENDERER_EXPANDER_H__
#define __EMPATHY_CELL_RENDERER_EXPANDER_H__
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-cell-renderer-text.h b/libempathy-gtk/empathy-cell-renderer-text.h
index 540c2ebb9..48ded9626 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.h
+++ b/libempathy-gtk/empathy-cell-renderer-text.h
@@ -23,7 +23,7 @@
#ifndef __EMPATHY_CELL_RENDERER_TEXT_H__
#define __EMPATHY_CELL_RENDERER_TEXT_H__
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-chat-text-view.h b/libempathy-gtk/empathy-chat-text-view.h
index 7c4ff3430..0180f21d1 100644
--- a/libempathy-gtk/empathy-chat-text-view.h
+++ b/libempathy-gtk/empathy-chat-text-view.h
@@ -27,7 +27,7 @@
#ifndef __EMPATHY_CHAT_TEXT_VIEW_H__
#define __EMPATHY_CHAT_TEXT_VIEW_H__
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-contact.h>
#include <libempathy/empathy-message.h>
diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h
index 893cf83e4..f3478be6d 100644
--- a/libempathy-gtk/empathy-chat-view.h
+++ b/libempathy-gtk/empathy-chat-view.h
@@ -23,7 +23,7 @@
#ifndef __EMPATHY_CHAT_VIEW_H__
#define __EMPATHY_CHAT_VIEW_H__
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-contact.h>
#include <libempathy/empathy-message.h>
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index 74d7e0681..12fac9617 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -28,7 +28,7 @@
#ifndef __EMPATHY_CHAT_H__
#define __EMPATHY_CHAT_H__
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-contact.h>
#include <libempathy/empathy-message.h>
diff --git a/libempathy-gtk/empathy-contact-list-store.h b/libempathy-gtk/empathy-contact-list-store.h
index 13ea099b3..007a6b069 100644
--- a/libempathy-gtk/empathy-contact-list-store.h
+++ b/libempathy-gtk/empathy-contact-list-store.h
@@ -26,7 +26,7 @@
#ifndef __EMPATHY_CONTACT_LIST_STORE_H__
#define __EMPATHY_CONTACT_LIST_STORE_H__
-#include <gtk/gtktreestore.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-contact-list.h>
#include <libempathy/empathy-contact.h>
diff --git a/libempathy-gtk/empathy-contact-list-view.h b/libempathy-gtk/empathy-contact-list-view.h
index 0c48764c4..e9c3457d8 100644
--- a/libempathy-gtk/empathy-contact-list-view.h
+++ b/libempathy-gtk/empathy-contact-list-view.h
@@ -26,7 +26,7 @@
#ifndef __EMPATHY_CONTACT_LIST_VIEW_H__
#define __EMPATHY_CONTACT_LIST_VIEW_H__
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-contact.h>
diff --git a/libempathy-gtk/empathy-contact-menu.h b/libempathy-gtk/empathy-contact-menu.h
index 8126a8e59..262ec9650 100644
--- a/libempathy-gtk/empathy-contact-menu.h
+++ b/libempathy-gtk/empathy-contact-menu.h
@@ -22,7 +22,7 @@
#ifndef __EMPATHY_CONTACT_MENU_H__
#define __EMPATHY_CONTACT_MENU_H__
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-contact.h>
diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h
index 985849696..df4a8b152 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.h
+++ b/libempathy-gtk/empathy-irc-network-dialog.h
@@ -21,7 +21,7 @@
#ifndef __EMPATHY_IRC_NETWORK_DIALOG_H__
#define __EMPATHY_IRC_NETWORK_DIALOG_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libempathy/empathy-irc-network.h>
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 1b76e2e1d..2e45ab688 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -453,7 +453,7 @@ update_resources (EmpathyLocationManager *location_manager)
DEBUG ("Updating resources %d", priv->resources);
/* As per Geoclue bug #15126, using NONE results in no address
- * being found as geoclue-manual report an empty address with
+ * being found as geoclue-manual report an empty address with
* accuracy = NONE */
if (!geoclue_master_client_set_requirements (priv->gc_client,
GEOCLUE_ACCURACY_LEVEL_COUNTRY, 0, TRUE, priv->resources,
diff --git a/libempathy-gtk/empathy-new-message-dialog.h b/libempathy-gtk/empathy-new-message-dialog.h
index c1781d0cf..08887c5e8 100644
--- a/libempathy-gtk/empathy-new-message-dialog.h
+++ b/libempathy-gtk/empathy-new-message-dialog.h
@@ -22,7 +22,7 @@
#ifndef __EMPATHY_NEW_MESSAGE_DIALOG_H__
#define __EMPATHY_NEW_MESSAGE_DIALOG_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index c504d4cdb..e8f623424 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -122,7 +122,7 @@ smiley_manager_finalize (GObject *object)
EmpathySmiley *smiley = l->data;
/* The smiley got the ownership of the path */
- g_free ((gchar*) smiley->path);
+ g_free ((gchar *) smiley->path);
empathy_smiley_free (smiley);
}
g_slist_free (priv->smileys);
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 1f0c043aa..82384acd1 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -475,7 +475,7 @@ theme_adium_append_message (EmpathyChatView *view,
name = empathy_contact_get_name (sender);
/* If this is a /me, append an event */
- if (empathy_message_get_tptype(msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
+ if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
gchar *str;
str = g_strdup_printf ("%s %s", name, body);
@@ -560,7 +560,7 @@ static void
theme_adium_scroll (EmpathyChatView *view,
gboolean allow_scrolling)
{
- /* FIXME: Is it possible? I guess we need a js function, but I don't
+ /* FIXME: Is it possible? I guess we need a js function, but I don't
* see any... */
}