[gnome-applets] General: Clean up GTK+ includes
- From: Callum McKenzie <callum src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-applets] General: Clean up GTK+ includes
- Date: Thu, 25 Jun 2009 09:22:30 +0000 (UTC)
commit 664d9317256c30a116a4b1fd29a819b6cf9399e6
Author: Callum McKenzie <callum spooky-possum org>
Date: Thu Jun 25 20:56:53 2009 +1200
General: Clean up GTK+ includes
Remove #includes of specific gtk/gdk/glib header files in favour of the
generic <glib.h>, <gdk/gdk.h>, <gtk/gtk.h>. Most of this is a patch
from Luis Menina (see bug 560678) with mini-commander fixes by myself.
The gswitchit applet does pass yet because of libgnomekbd.
gweather/gweather-dialog.h | 2 +-
gweather/gweather-pref.h | 2 +-
mini-commander/src/about.c | 2 +-
mini-commander/src/cmd_completion.h | 2 +-
mini-commander/src/command_line.c | 130 +++++++++++++---------------
mini-commander/src/command_line.h | 4 +-
mini-commander/src/exec.c | 8 +-
mini-commander/src/exec.h | 2 +-
mini-commander/src/macro.h | 2 +-
mini-commander/src/mc-default-macros.h | 4 +-
mini-commander/src/mini-commander_applet.c | 53 +++++-------
mini-commander/src/mini-commander_applet.h | 4 +-
mini-commander/src/preferences.h | 2 +-
multiload/global.h | 2 +-
multiload/netspeed.h | 2 +-
15 files changed, 102 insertions(+), 119 deletions(-)
---
diff --git a/gweather/gweather-dialog.h b/gweather/gweather-dialog.h
index 88ea2b4..4527b17 100644
--- a/gweather/gweather-dialog.h
+++ b/gweather/gweather-dialog.h
@@ -13,7 +13,7 @@
*
*/
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
diff --git a/gweather/gweather-pref.h b/gweather/gweather-pref.h
index 003b717..597b0a0 100644
--- a/gweather/gweather-pref.h
+++ b/gweather/gweather-pref.h
@@ -13,7 +13,7 @@
#ifndef __GWEATHER_PREF_H_
#define __GWEATHER_PREF_H_
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
diff --git a/mini-commander/src/about.c b/mini-commander/src/about.c
index eb187ae..9908394 100644
--- a/mini-commander/src/about.c
+++ b/mini-commander/src/about.c
@@ -22,7 +22,7 @@
#include <config.h>
#include <glib.h>
-#include <gtk/gtkaboutdialog.h>
+#include <gtk/gtk.h>
#include "about.h"
diff --git a/mini-commander/src/cmd_completion.h b/mini-commander/src/cmd_completion.h
index d3649c3..042092f 100644
--- a/mini-commander/src/cmd_completion.h
+++ b/mini-commander/src/cmd_completion.h
@@ -21,7 +21,7 @@
#ifndef __CMD_COMPLETION_H__
#define __CMD_COMPLETION_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git a/mini-commander/src/command_line.c b/mini-commander/src/command_line.c
index 258b254..ba1b714 100644
--- a/mini-commander/src/command_line.c
+++ b/mini-commander/src/command_line.c
@@ -24,16 +24,7 @@
#include <stdlib.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include <panel-applet.h>
@@ -62,8 +53,8 @@ button_press_cb (GtkEntry *entry,
panel_applet_request_focus (mc->applet, event->time);
- if (mc->error) {
- mc->error = FALSE;
+ if (mc->error) {
+ mc->error = FALSE;
str = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
gtk_entry_set_text (entry, (gchar *) str + 3);
}
@@ -82,8 +73,8 @@ command_key_event (GtkEntry *entry,
gboolean propagate_event = TRUE;
const gchar *str;
- if (mc->error) {
- mc->error = FALSE;
+ if (mc->error) {
+ mc->error = FALSE;
str = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
gtk_entry_set_text (entry, (gchar *) str + 3);
gtk_editable_set_position (GTK_EDITABLE (entry), strlen (str));
@@ -101,7 +92,7 @@ command_key_event (GtkEntry *entry,
propagate_event = FALSE;
}
else if(event->state != GDK_SHIFT_MASK)
- {
+ {
/* tab key pressed */
strcpy(buffer, (char *) gtk_entry_get_text(GTK_ENTRY(entry)));
mc_cmd_completion (mc, buffer);
@@ -117,7 +108,7 @@ command_key_event (GtkEntry *entry,
{
/* up key pressed */
if(history_position == MC_HISTORY_LIST_LENGTH)
- {
+ {
/* store current command line */
strcpy(current_command, (char *) gtk_entry_get_text(entry));
}
@@ -139,7 +130,7 @@ command_key_event (GtkEntry *entry,
gtk_entry_set_text(entry, (gchar *) get_history_entry(++history_position));
}
else if(history_position == MC_HISTORY_LIST_LENGTH - 1)
- {
+ {
gtk_entry_set_text(entry, (gchar *) current_command);
++history_position;
}
@@ -156,7 +147,7 @@ command_key_event (GtkEntry *entry,
strcpy(command, (char *) gtk_entry_get_text(entry));
mc_exec_command(mc, command);
- history_position = MC_HISTORY_LIST_LENGTH;
+ history_position = MC_HISTORY_LIST_LENGTH;
free(command);
strcpy(current_command, "");
@@ -166,21 +157,21 @@ command_key_event (GtkEntry *entry,
{
char *completed_command;
gint current_position = gtk_editable_get_position(GTK_EDITABLE(entry));
-
+
if(current_position != 0)
{
gtk_editable_delete_text( GTK_EDITABLE(entry), current_position, -1 );
completed_command = history_auto_complete(GTK_WIDGET (entry), event);
-
+
if(completed_command != NULL)
{
gtk_entry_set_text(entry, completed_command);
gtk_editable_set_position(GTK_EDITABLE(entry), current_position + 1);
propagate_event = FALSE;
}
- }
+ }
}
-
+
return !propagate_event;
}
@@ -192,7 +183,7 @@ history_popup_clicked_cb(GtkWidget *widget, gpointer data)
gtk_grab_remove(GTK_WIDGET(widget));
gtk_widget_destroy(GTK_WIDGET(widget));
widget = NULL;
-
+
/* go on */
return (FALSE);
}
@@ -216,7 +207,7 @@ history_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
}
return FALSE;
-
+
}
static gboolean
@@ -228,7 +219,7 @@ history_list_key_press_cb (GtkWidget *widget,
GtkTreeIter iter;
GtkTreeModel *model;
gchar *command;
-
+
switch (event->keyval) {
case GDK_KP_Enter:
case GDK_ISO_Enter:
@@ -242,7 +233,7 @@ history_list_key_press_cb (GtkWidget *widget,
if (!gtk_tree_selection_get_selected (gtk_tree_view_get_selection (tree),
&model,
- &iter))
+ &iter))
return FALSE;
gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
0, &command, -1);
@@ -255,11 +246,11 @@ history_list_key_press_cb (GtkWidget *widget,
default:
break;
}
-
+
return FALSE;
}
-static gboolean
+static gboolean
history_list_button_press_cb (GtkWidget *widget,
GdkEventButton *event,
MCData *mc)
@@ -268,11 +259,11 @@ history_list_button_press_cb (GtkWidget *widget,
GtkTreeIter iter;
GtkTreeModel *model;
gchar *command;
-
+
if (event->type == GDK_2BUTTON_PRESS) {
if (!gtk_tree_selection_get_selected (gtk_tree_view_get_selection (tree),
&model,
- &iter))
+ &iter))
return FALSE;
gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
0, &command, -1);
@@ -286,7 +277,7 @@ history_list_button_press_cb (GtkWidget *widget,
return FALSE;
}
-int
+int
mc_show_history (GtkWidget *widget,
MCData *mc)
{
@@ -309,7 +300,7 @@ mc_show_history (GtkWidget *widget,
if(exists_history_entry(i))
j++;
- window = gtk_window_new(GTK_WINDOW_POPUP);
+ window = gtk_window_new(GTK_WINDOW_POPUP);
gtk_window_set_screen (GTK_WINDOW (window),
gtk_widget_get_screen (GTK_WIDGET (mc->applet)));
gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
@@ -321,17 +312,17 @@ mc_show_history (GtkWidget *widget,
NULL);
g_signal_connect_after (G_OBJECT (window), "key_press_event",
G_CALLBACK (history_key_press_cb), NULL);
-
+
/* size */
gtk_widget_set_size_request(GTK_WIDGET(window), 200, 350);
-
-
+
+
/* frame */
frame = gtk_frame_new(NULL);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
gtk_widget_show(frame);
gtk_container_add(GTK_CONTAINER(window), frame);
-
+
/* scrollbars */
/* create scrolled window to put the Gtk_list widget inside */
scrolled_window=gtk_scrolled_window_new(NULL, NULL);
@@ -345,7 +336,7 @@ mc_show_history (GtkWidget *widget,
gtk_container_add(GTK_CONTAINER(frame), scrolled_window);
gtk_container_set_border_width (GTK_CONTAINER(scrolled_window), 2);
gtk_widget_show(scrolled_window);
-
+
store = gtk_list_store_new (1, G_TYPE_STRING);
/* add history entries to list */
@@ -353,7 +344,7 @@ mc_show_history (GtkWidget *widget,
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,0, _("No items in history"), -1);
}
- else {
+ else {
for(i = 0; i < MC_HISTORY_LIST_LENGTH; i++)
{
if(exists_history_entry(i))
@@ -363,7 +354,7 @@ mc_show_history (GtkWidget *widget,
gtk_list_store_set (store, &iter,0,command_list[0],-1);
}
}
- }
+ }
model = GTK_TREE_MODEL(store);
treeview = gtk_tree_view_new_with_model (model);
g_object_set_data (G_OBJECT (mc->applet), "tree", treeview);
@@ -386,16 +377,16 @@ mc_show_history (GtkWidget *widget,
g_signal_connect (G_OBJECT (treeview), "key_press_event",
G_CALLBACK (history_list_key_press_cb), mc);
}
-
+
g_object_unref (G_OBJECT (model));
gtk_container_add(GTK_CONTAINER(scrolled_window),treeview);
- gtk_widget_show (treeview);
-
+ gtk_widget_show (treeview);
+
gtk_widget_size_request (window, &req);
gdk_window_get_origin (GTK_WIDGET (mc->applet)->window, &x, &y);
gdk_window_get_geometry (GTK_WIDGET (mc->applet)->window, NULL, NULL,
&width, &height, NULL);
-
+
switch (panel_applet_get_orient (mc->applet)) {
case PANEL_APPLET_ORIENT_DOWN:
y += height;
@@ -424,34 +415,34 @@ mc_show_history (GtkWidget *widget,
GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK
| GDK_ENTER_NOTIFY_MASK
- | GDK_LEAVE_NOTIFY_MASK
+ | GDK_LEAVE_NOTIFY_MASK
| GDK_POINTER_MOTION_MASK,
NULL,
NULL,
- GDK_CURRENT_TIME);
+ GDK_CURRENT_TIME);
gdk_keyboard_grab (window->window, TRUE, GDK_CURRENT_TIME);
gtk_grab_add(window);
gtk_widget_grab_focus (treeview);
-
+
return FALSE;
}
-static gint
+static gint
file_browser_response_signal(GtkWidget *widget, gint response, gpointer mc_data)
{
MCData *mc = mc_data;
gchar *filename;
if (response == GTK_RESPONSE_OK) {
-
+
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(mc->file_select));
-
+
if (filename != NULL) {
if (browsed_folder)
g_free (browsed_folder);
-
+
browsed_folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER(mc->file_select));
-
+
mc_exec_command(mc, filename);
g_free(filename);
}
@@ -462,10 +453,10 @@ file_browser_response_signal(GtkWidget *widget, gint response, gpointer mc_data)
mc->file_select = NULL;
/* go on */
- return FALSE;
+ return FALSE;
}
-int
+int
mc_show_file_browser (GtkWidget *widget,
MCData *mc)
{
@@ -495,10 +486,10 @@ mc_show_file_browser (GtkWidget *widget,
/* Set as modal */
gtk_window_set_modal(GTK_WINDOW(mc->file_select),TRUE);
- gtk_window_set_screen (GTK_WINDOW (mc->file_select),
+ gtk_window_set_screen (GTK_WINDOW (mc->file_select),
gtk_widget_get_screen (GTK_WIDGET (mc->applet)));
gtk_window_set_position (GTK_WINDOW (mc->file_select), GTK_WIN_POS_CENTER);
-
+
gtk_widget_show(mc->file_select);
return FALSE;
@@ -508,18 +499,18 @@ void
mc_create_command_entry (MCData *mc)
{
mc->entry = gtk_entry_new ();
- gtk_entry_set_max_length (GTK_ENTRY (mc->entry), MC_MAX_COMMAND_LENGTH);
+ gtk_entry_set_max_length (GTK_ENTRY (mc->entry), MC_MAX_COMMAND_LENGTH);
g_signal_connect (mc->entry, "key_press_event",
G_CALLBACK (command_key_event), mc);
-
+
g_signal_connect (mc->entry, "button_press_event",
G_CALLBACK (button_press_cb), mc);
if (!mc->preferences.show_default_theme)
{
gtk_widget_set_name (mc->entry, "minicommander-applet-entry");
- mc_command_update_entry_color (mc);
+ mc_command_update_entry_color (mc);
}
else
gtk_widget_set_name (mc->entry,
@@ -528,7 +519,7 @@ mc_create_command_entry (MCData *mc)
mc_command_update_entry_size (mc);
set_atk_name_description (mc->entry,
- _("Command line"),
+ _("Command line"),
_("Type a command here and Gnome will execute it for you"));
}
@@ -559,7 +550,7 @@ mc_command_update_entry_color (MCData *mc)
gtk_widget_modify_text (mc->entry, GTK_STATE_NORMAL, &fg);
gtk_widget_modify_text (mc->entry, GTK_STATE_PRELIGHT, &fg);
-
+
bg.red = mc->preferences.cmd_line_color_bg_r;
bg.green = mc->preferences.cmd_line_color_bg_g;
bg.blue = mc->preferences.cmd_line_color_bg_b;
@@ -572,7 +563,7 @@ void
mc_command_update_entry_size (MCData *mc)
{
int size_x = -1;
-
+
size_x = mc->preferences.normal_size_x - 17;
if ((mc->orient == PANEL_APPLET_ORIENT_LEFT) || (mc->orient == PANEL_APPLET_ORIENT_RIGHT)) {
size_x = MIN(size_x, mc->preferences.panel_size_x - 17);
@@ -592,17 +583,16 @@ history_auto_complete(GtkWidget *widget, GdkEventKey *event)
gchar* completed_command;
int i;
- g_snprintf(current_command, sizeof(current_command), "%s%s",
- gtk_entry_get_text(GTK_ENTRY(widget)), event->string);
- for(i = MC_HISTORY_LIST_LENGTH - 1; i >= 0; i--)
+ g_snprintf(current_command, sizeof(current_command), "%s%s",
+ gtk_entry_get_text(GTK_ENTRY(widget)), event->string);
+ for(i = MC_HISTORY_LIST_LENGTH - 1; i >= 0; i--)
{
if(!exists_history_entry(i))
break;
- completed_command = get_history_entry(i);
- if(!strncmp(completed_command, current_command, strlen(current_command)))
- return completed_command;
- }
-
+ completed_command = get_history_entry(i);
+ if(!strncmp(completed_command, current_command, strlen(current_command)))
+ return completed_command;
+ }
+
return NULL;
}
-
diff --git a/mini-commander/src/command_line.h b/mini-commander/src/command_line.h
index 7e2845e..195b242 100644
--- a/mini-commander/src/command_line.h
+++ b/mini-commander/src/command_line.h
@@ -22,7 +22,7 @@
#ifndef __COMMAND_LINE_H__
#define __COMMAND_LINE_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
@@ -37,5 +37,5 @@ void mc_command_update_entry_color (MCData *mc);
void mc_command_update_entry_size (MCData *mc);
G_END_DECLS
-
+
#endif /* __COMMAND_LINE_H__ */
diff --git a/mini-commander/src/exec.c b/mini-commander/src/exec.c
index 83176f7..ff0c1ec 100644
--- a/mini-commander/src/exec.c
+++ b/mini-commander/src/exec.c
@@ -23,8 +23,8 @@
#include <string.h>
#include <glib.h>
-#include <gdk/gdkspawn.h>
-#include <gtk/gtkentry.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
#include "exec.h"
@@ -72,7 +72,7 @@ mc_exec_command (MCData *mc,
g_free (str);
} else {
gtk_entry_set_text (GTK_ENTRY (mc->entry), (gchar *) "");
- append_history_entry (mc, cmd, FALSE);
+ append_history_entry (mc, cmd, FALSE);
}
g_strfreev (argv);
@@ -84,7 +84,7 @@ static void beep (void)
{
GConfClient *default_client;
gboolean audible_bell_set;
-
+
default_client = gconf_client_get_default ();
audible_bell_set = gconf_client_get_bool (default_client, KEY_AUDIBLE_BELL, NULL);
if (audible_bell_set) {
diff --git a/mini-commander/src/exec.h b/mini-commander/src/exec.h
index 998ba4f..01d46c1 100644
--- a/mini-commander/src/exec.h
+++ b/mini-commander/src/exec.h
@@ -21,7 +21,7 @@
#ifndef __EXEC_H__
#define __EXEC_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git a/mini-commander/src/macro.h b/mini-commander/src/macro.h
index d667ea9..7beb2fb 100644
--- a/mini-commander/src/macro.h
+++ b/mini-commander/src/macro.h
@@ -22,7 +22,7 @@
#ifndef __MACRO_H__
#define __MACRO_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git a/mini-commander/src/mc-default-macros.h b/mini-commander/src/mc-default-macros.h
index ae2102b..031b645 100644
--- a/mini-commander/src/mc-default-macros.h
+++ b/mini-commander/src/mc-default-macros.h
@@ -22,7 +22,7 @@
#ifndef __MC_DEFAULT_MACROS_H__
#define __MC_DEFAULT_MACROS_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
@@ -35,7 +35,7 @@ typedef struct {
* and the fallback defaults that are used if we are
* having GConf problems.
*
- * See mc-install-default-macros.c for how they get
+ * See mc-install-default-macros.c for how they get
* installed into the schemas.
*/
static const MCDefaultMacro mc_default_macros [] = {
diff --git a/mini-commander/src/mini-commander_applet.c b/mini-commander/src/mini-commander_applet.c
index b8c20e3..4999de5 100644
--- a/mini-commander/src/mini-commander_applet.c
+++ b/mini-commander/src/mini-commander_applet.c
@@ -27,15 +27,8 @@
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkvbox.h>
+
+#include <gtk/gtk.h>
#include <panel-applet.h>
#include <gconf/gconf-client.h>
@@ -50,7 +43,7 @@
#define COMMANDLINE_BROWSER_STOCK "commandline-browser"
#define COMMANDLINE_HISTORY_STOCK "commandline-history"
-
+
#define COMMANDLINE_DEFAULT_ICON_SIZE 6
static gboolean icons_initialized = FALSE;
@@ -121,9 +114,9 @@ void
set_atk_name_description (GtkWidget *widget,
const char *name,
const char *description)
-{
+{
AtkObject *aobj;
-
+
aobj = gtk_widget_get_accessible (widget);
if (GTK_IS_ACCESSIBLE (aobj) == FALSE)
return;
@@ -165,7 +158,7 @@ send_button_to_entry_event (GtkWidget *widget, GdkEventButton *event, MCData *mc
static gboolean
key_press_cb (GtkWidget *widget, GdkEventKey *event, MCData *mc)
{
- switch (event->keyval) {
+ switch (event->keyval) {
case GDK_b:
if (event->state == GDK_CONTROL_MASK) {
mc_show_file_browser (NULL, mc);
@@ -199,10 +192,10 @@ mc_applet_draw (MCData *mc)
if (mc->entry != NULL)
command_text = g_strdup (gtk_editable_get_chars (GTK_EDITABLE (mc->entry), 0, -1));
- mc->cmd_line_size_y = mc->preferences.normal_size_y - size_frames;
+ mc->cmd_line_size_y = mc->preferences.normal_size_y - size_frames;
if (mc->applet_box) {
- gtk_widget_destroy (mc->applet_box);
+ gtk_widget_destroy (mc->applet_box);
}
if ( ((mc->orient == PANEL_APPLET_ORIENT_LEFT) || (mc->orient == PANEL_APPLET_ORIENT_RIGHT)) && (prefs.panel_size_x < GNOME_Vertigo_PANEL_SMALL) )
@@ -233,7 +226,7 @@ mc_applet_draw (MCData *mc)
/* add file-browser button */
button = gtk_button_new ();
-
+
g_signal_connect (button, "clicked",
G_CALLBACK (mc_show_file_browser), mc);
g_signal_connect (button, "button_press_event",
@@ -244,14 +237,14 @@ mc_applet_draw (MCData *mc)
gtk_widget_set_tooltip_text (button, _("Browser"));
gtk_box_pack_start (GTK_BOX (hbox_buttons), button, TRUE, TRUE, 0);
-
+
set_atk_name_description (button,
_("Browser"),
_("Click this button to start the browser"));
/* add history button */
button = gtk_button_new ();
-
+
g_signal_connect (button, "clicked",
G_CALLBACK (mc_show_history), mc);
g_signal_connect (button, "button_press_event",
@@ -266,12 +259,12 @@ mc_applet_draw (MCData *mc)
set_atk_name_description (button,
_("History"),
_("Click this button for the list of previous commands"));
-
+
gtk_box_pack_start (GTK_BOX (mc->applet_box), mc->entry, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (mc->applet_box), hbox_buttons, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (mc->applet), mc->applet_box);
-
+
gtk_widget_show_all (mc->applet_box);
}
@@ -299,7 +292,7 @@ mc_destroyed (GtkWidget *widget,
if (mc->file_select)
gtk_widget_destroy (mc->file_select);
-
+
g_free (mc);
}
@@ -360,9 +353,9 @@ mini_commander_applet_fill (PanelApplet *applet)
}
g_set_application_name (_("Command Line"));
-
+
gtk_window_set_default_icon_name ("gnome-mini-commander");
-
+
mc = g_new0 (MCData, 1);
mc->applet = applet;
@@ -370,18 +363,18 @@ mini_commander_applet_fill (PanelApplet *applet)
panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
mc_load_preferences (mc);
command_line_init_stock_icons ();
-
+
g_signal_connect (mc->applet, "change_orient",
G_CALLBACK (mc_orient_changed), mc);
g_signal_connect (mc->applet, "size_allocate",
G_CALLBACK (mc_pixel_size_changed), mc);
-
+
mc->preferences.normal_size_y = panel_applet_get_size (applet);
mc->orient = panel_applet_get_orient (applet);
mc_applet_draw(mc);
gtk_widget_show (GTK_WIDGET (mc->applet));
-
- g_signal_connect (mc->applet, "destroy", G_CALLBACK (mc_destroyed), mc);
+
+ g_signal_connect (mc->applet, "destroy", G_CALLBACK (mc_destroyed), mc);
g_signal_connect (mc->applet, "button_press_event",
G_CALLBACK (send_button_to_entry_event), mc);
g_signal_connect (mc->applet, "key_press_event",
@@ -408,7 +401,7 @@ mini_commander_applet_fill (PanelApplet *applet)
set_atk_name_description (GTK_WIDGET (applet),
_("Mini-Commander applet"),
_("This applet adds a command line to the panel"));
-
+
return TRUE;
}
@@ -420,8 +413,8 @@ mini_commander_applet_factory (PanelApplet *applet,
gboolean retval = FALSE;
if (!strcmp (iid, "OAFIID:GNOME_MiniCommanderApplet"))
- retval = mini_commander_applet_fill(applet);
-
+ retval = mini_commander_applet_fill(applet);
+
return retval;
}
diff --git a/mini-commander/src/mini-commander_applet.h b/mini-commander/src/mini-commander_applet.h
index 44aa0af..b31aad8 100644
--- a/mini-commander/src/mini-commander_applet.h
+++ b/mini-commander/src/mini-commander_applet.h
@@ -24,11 +24,11 @@
#ifndef __MC_APPLET_H__
#define __MC_APPLET_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <panel-applet.h>
typedef struct _MCData MCData;
diff --git a/mini-commander/src/preferences.h b/mini-commander/src/preferences.h
index 1f8489b..1707307 100644
--- a/mini-commander/src/preferences.h
+++ b/mini-commander/src/preferences.h
@@ -24,7 +24,7 @@
#ifndef __PREFERENCES_H__
#define __PREFERENCES_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git a/multiload/global.h b/multiload/global.h
index 988ba10..5fb50c0 100644
--- a/multiload/global.h
+++ b/multiload/global.h
@@ -3,7 +3,7 @@
#include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <panel-applet.h>
G_BEGIN_DECLS
diff --git a/multiload/netspeed.h b/multiload/netspeed.h
index da3886f..5bc19cf 100644
--- a/multiload/netspeed.h
+++ b/multiload/netspeed.h
@@ -1,7 +1,7 @@
#ifndef H_MULTILOAD_NETSPEED_
#define H_MULTILOAD_NETSPEED_
-#include <glib/gtypes.h>
+#include <glib.h>
typedef struct _NetSpeed NetSpeed;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
