[ekiga] Got rid of src/gui/misc.h and src/gui/misc.cpp

[Julien Puydt <jpuydt src gnome org>]

commit 5169f08956937989d33e1a9f515f75dd8615b349
Author: Julien Puydt <jpuydt gnome org>
Date:   Tue Oct 20 20:13:08 2009 +0200

    Got rid of src/gui/misc.h and src/gui/misc.cpp
    
    There was a single function left, which was used at a single place...

 src/Makefile.am          |    2 -
 src/dbus-helper/dbus.cpp |    1 -
 src/ekiga.cpp            |    1 -
 src/gui/assistant.cpp    |    1 -
 src/gui/callbacks.cpp    |    1 -
 src/gui/conf.cpp         |    1 -
 src/gui/misc.cpp         |   72 ----------------------------------------------
 src/gui/misc.h           |   55 -----------------------------------
 src/gui/preferences.cpp  |   20 +++++++++----
 src/gui/statusicon.cpp   |    1 -
 10 files changed, 14 insertions(+), 141 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 891cc41..f6a5723 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,8 +71,6 @@ ekiga_SOURCES +=			\
 	gui/assistant.cpp		\
 	gui/main_window.h		\
 	gui/main_window.cpp		\
-	gui/misc.h			\
-	gui/misc.cpp			\
 	gui/preferences.h		\
 	gui/preferences.cpp		\
 	gui/statusicon.h		\
diff --git a/src/dbus-helper/dbus.cpp b/src/dbus-helper/dbus.cpp
index 46be4ae..2870da8 100644
--- a/src/dbus-helper/dbus.cpp
+++ b/src/dbus-helper/dbus.cpp
@@ -47,7 +47,6 @@
 #include "gmmarshallers.h"
 #include "gmconf.h"
 #include "callbacks.h"
-#include "misc.h"
 #include "accounts.h"
 
 #include "call-core.h"
diff --git a/src/ekiga.cpp b/src/ekiga.cpp
index 9369442..c90d5b4 100644
--- a/src/ekiga.cpp
+++ b/src/ekiga.cpp
@@ -46,7 +46,6 @@
 #include "statusicon.h"
 #include "accounts.h"
 #include "main_window.h"
-#include "misc.h"
 
 #ifdef HAVE_DBUS
 #include "dbus.h"
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index bef6c6d..5042dc6 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -44,7 +44,6 @@
 
 #include "ekiga.h"
 #include "gmconf.h"
-#include "misc.h"
 #include "toolbox/toolbox.h"
 #include "assistant.h"
 
diff --git a/src/gui/callbacks.cpp b/src/gui/callbacks.cpp
index 4d817ee..fdf60b0 100644
--- a/src/gui/callbacks.cpp
+++ b/src/gui/callbacks.cpp
@@ -40,7 +40,6 @@
 #include "config.h"
 
 #include "callbacks.h"
-#include "misc.h"
 
 #include "ekiga.h"
 
diff --git a/src/gui/conf.cpp b/src/gui/conf.cpp
index 316d284..37752fd 100644
--- a/src/gui/conf.cpp
+++ b/src/gui/conf.cpp
@@ -49,7 +49,6 @@
 #include "preferences.h"
 #include "assistant.h"
 #include "accounts.h"
-#include "misc.h"
 
 #include "gmdialog.h"
 #include "gmstockicons.h"
diff --git a/src/gui/preferences.cpp b/src/gui/preferences.cpp
index d57e953..bafcd84 100644
--- a/src/gui/preferences.cpp
+++ b/src/gui/preferences.cpp
@@ -43,7 +43,6 @@
 
 #include "accounts.h"
 #include "ekiga.h"
-#include "misc.h"
 #include "callbacks.h"
 
 #include <gmdialog.h>
@@ -409,20 +408,29 @@ static GtkWidget *
 gm_pw_add_update_button (G_GNUC_UNUSED GtkWidget *prefs_window,
                          GtkWidget *box,
                          const char *stock_id,
-                         const char *label,
+                         const char *label_,
                          GCallback func,
                          G_GNUC_UNUSED gchar *tooltip,
                          gfloat valign,
                          gpointer data)
 {
-  GtkWidget *alignment = NULL;
-  GtkWidget *image = NULL;
-  GtkWidget *button = NULL;
+  GtkWidget* alignment = NULL;
+  GtkWidget* image = NULL;
+  GtkWidget* button = NULL;
+  GtkWidget* hbox = NULL;
+  GtkWidget* label = NULL;
 
 
   /* Update Button */
   image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
-  button = gnomemeeting_button_new (label, image);
+  button = gtk_button_new ();
+  label = gtk_label_new_with_mnemonic (label_);
+  hbox = gtk_hbox_new (FALSE, 0);
+
+  gtk_box_pack_start(GTK_BOX (hbox), image, TRUE, TRUE, 0);  
+  gtk_box_pack_start(GTK_BOX (hbox), label, TRUE, TRUE, 0);
+
+  gtk_container_add (GTK_CONTAINER (button), hbox);
 
   alignment = gtk_alignment_new (1, valign, 0, 0);
   gtk_container_add (GTK_CONTAINER (alignment), button);
diff --git a/src/gui/statusicon.cpp b/src/gui/statusicon.cpp
index 00a5d03..0617766 100644
--- a/src/gui/statusicon.cpp
+++ b/src/gui/statusicon.cpp
@@ -44,7 +44,6 @@
 #include "gmmenuaddon.h"
 
 #include "callbacks.h" // FIXME SHOULD GET RID OF THIS
-#include "misc.h" // FIXME same here
 #include "ekiga.h"
 
 #include "gtk-frontend.h"